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

Frank Richter : setupapi: Make do_file_copyW send "target newer" notifications.
by Alexandre Julliard Aug. 28, 2006

Aug. 28, 2006

Module: wine Branch: master Commit: 8aecf251df44ba9b2a9ab47356a8a7482a594b1c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8aecf251df44ba9b2a9ab47… Author: Frank Richter <frank.richter(a)gmail.com> Date: Fri Aug 25 21:24:43 2006 +0200 setupapi: Make do_file_copyW send "target newer" notifications. --- dlls/setupapi/queue.c | 31 +++++++++++++++++++++++-------- 1 files changed, 23 insertions(+), 8 deletions(-) diff --git a/dlls/setupapi/queue.c b/dlls/setupapi/queue.c index f7d3c5e..7c89efd 100644 --- a/dlls/setupapi/queue.c +++ b/dlls/setupapi/queue.c @@ -944,7 +944,8 @@ static BOOL create_full_pathW(const WCHA return ret; } -static BOOL do_file_copyW( LPCWSTR source, LPCWSTR target, DWORD style) +static BOOL do_file_copyW( LPCWSTR source, LPCWSTR target, DWORD style, + PSP_FILE_CALLBACK_W handler, PVOID context ) { BOOL rc = FALSE; BOOL docopy = TRUE; @@ -1011,20 +1012,32 @@ static BOOL do_file_copyW( LPCWSTR sourc if (ret) { + FILEPATHS_W filepaths; + TRACE("Versions: Source %li.%li target %li.%li\n", SourceInfo->dwFileVersionMS, SourceInfo->dwFileVersionLS, TargetInfo->dwFileVersionMS, TargetInfo->dwFileVersionLS); + /* used in case of notification */ + filepaths.Target = target; + filepaths.Source = source; + filepaths.Win32Error = 0; + filepaths.Flags = 0; + if (TargetInfo->dwFileVersionMS > SourceInfo->dwFileVersionMS) { - FIXME("Notify that target version is greater..\n"); - docopy = FALSE; + if (handler) + docopy = handler (context, SPFILENOTIFY_TARGETNEWER, (UINT_PTR)&filepaths, 0); + else + docopy = FALSE; } else if ((TargetInfo->dwFileVersionMS == SourceInfo->dwFileVersionMS) && (TargetInfo->dwFileVersionLS > SourceInfo->dwFileVersionLS)) { - FIXME("Notify that target version is greater..\n"); - docopy = FALSE; + if (handler) + docopy = handler (context, SPFILENOTIFY_TARGETNEWER, (UINT_PTR)&filepaths, 0); + else + docopy = FALSE; } else if ((style & SP_COPY_NEWER_ONLY) && (TargetInfo->dwFileVersionMS == @@ -1032,8 +1045,10 @@ static BOOL do_file_copyW( LPCWSTR sourc &&(TargetInfo->dwFileVersionLS == SourceInfo->dwFileVersionLS)) { - FIXME("Notify that target version is greater..\n"); - docopy = FALSE; + if (handler) + docopy = handler (context, SPFILENOTIFY_TARGETNEWER, (UINT_PTR)&filepaths, 0); + else + docopy = FALSE; } } } @@ -1169,7 +1184,7 @@ BOOL WINAPI SetupCommitFileQueueW( HWND } } if (do_file_copyW( op_result == FILEOP_NEWPATH ? newpath : paths.Source, - paths.Target, op->style )) break; /* success */ + paths.Target, op->style, handler, context )) break; /* success */ /* try to extract it from the cabinet file */ if (op->src_tag) {

1 0

Frank Richter : kernel: Add tests for GetPrivateProfileSectionNames. Make behaviour the same as observed on Windows XP.
by Alexandre Julliard Aug. 28, 2006

Aug. 28, 2006

Module: wine Branch: master Commit: a89b9ca185fe3c2bb03e09016d99fb3032d25e36 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a89b9ca185fe3c2bb03e090… Author: Frank Richter <frank.richter(a)gmail.com> Date: Fri Aug 25 20:00:53 2006 +0200 kernel: Add tests for GetPrivateProfileSectionNames. Make behaviour the same as observed on Windows XP. --- dlls/kernel/profile.c | 8 ++++-- dlls/kernel/tests/profile.c | 53 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 3 deletions(-) diff --git a/dlls/kernel/profile.c b/dlls/kernel/profile.c index a0f1dca..dbd6590 100644 --- a/dlls/kernel/profile.c +++ b/dlls/kernel/profile.c @@ -906,7 +906,7 @@ static INT PROFILE_GetSectionNames( LPWS while ((section!=NULL)) { if (section->name[0]) { tmplen = strlenW(section->name)+1; - if (tmplen > buflen) { + if (tmplen >= buflen) { if (buflen > 0) { memcpy(buf, section->name, (buflen-1) * sizeof(WCHAR)); buf += buflen-1; @@ -1626,12 +1626,14 @@ DWORD WINAPI GetPrivateProfileSectionNam retW = GetPrivateProfileSectionNamesW(bufferW, size, filenameW.Buffer); if (retW && size) { - ret = WideCharToMultiByte(CP_ACP, 0, bufferW, retW, buffer, size, NULL, NULL); + ret = WideCharToMultiByte(CP_ACP, 0, bufferW, retW+1, buffer, size-1, NULL, NULL); if (!ret) { - ret = size; + ret = size-2; buffer[size-1] = 0; } + else + ret = ret-1; } RtlFreeUnicodeString(&filenameW); diff --git a/dlls/kernel/tests/profile.c b/dlls/kernel/tests/profile.c index 3ab1df9..4379ee2 100644 --- a/dlls/kernel/tests/profile.c +++ b/dlls/kernel/tests/profile.c @@ -135,8 +135,61 @@ static void test_profile_string(void) DeleteFileA( TESTFILE2); } +static void test_profile_sections(void) +{ + HANDLE h; + int ret; + DWORD count; + char buf[100]; + WCHAR bufW[100]; + static const char content[]="[section1]\r\n[section2]\r\n[section3]\r\n"; + static const char testfile3[]=".\\testwine3.ini"; + static const WCHAR testfile3W[]={ '.','\\','t','e','s','t','w','i','n','e','3','.','i','n','i',0 }; + DeleteFileA( testfile3 ); + h = CreateFileA( testfile3, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL, NULL); + ok( h != INVALID_HANDLE_VALUE, " cannot create %s\n", testfile3); + if( h == INVALID_HANDLE_VALUE) return; + WriteFile( h, content, sizeof(content), &count, NULL); + CloseHandle( h); + + /* Test with sufficiently large buffer */ + ret = GetPrivateProfileSectionNamesA( buf, 29, testfile3 ); + ok( ret == 27, "expected return size 27, got %d\n", ret ); + ok( buf[ret-1] == 0 && buf[ret] == 0, "returned buffer not terminated with double-null\n" ); + + /* Test with exactly fitting buffer */ + ret = GetPrivateProfileSectionNamesA( buf, 28, testfile3 ); + ok( ret == 26, "expected return size 26, got %d\n", ret ); + ok( buf[ret+1] == 0 && buf[ret] == 0, "returned buffer not terminated with double-null\n" ); + + /* Test with a buffer too small */ + ret = GetPrivateProfileSectionNamesA( buf, 27, testfile3 ); + ok( ret == 25, "expected return size 25, got %d\n", ret ); + ok( buf[ret+1] == 0 && buf[ret] == 0, "returned buffer not terminated with double-null\n" ); + + + /* Test with sufficiently large buffer */ + ret = GetPrivateProfileSectionNamesW( bufW, 29, testfile3W ); + ok( ret == 27, "expected return size 27, got %d\n", ret ); + ok( buf[ret-1] == 0 && buf[ret] == 0, "returned buffer not terminated with double-null\n" ); + + /* Test with exactly fitting buffer */ + ret = GetPrivateProfileSectionNamesW( bufW, 28, testfile3W ); + ok( ret == 26, "expected return size 26, got %d\n", ret ); + ok( buf[ret+1] == 0 && buf[ret] == 0, "returned buffer not terminated with double-null\n" ); + + /* Test with a buffer too small */ + ret = GetPrivateProfileSectionNamesW( bufW, 27, testfile3W ); + ok( ret == 25, "expected return size 25, got %d\n", ret ); + ok( buf[ret+1] == 0 && buf[ret] == 0, "returned buffer not terminated with double-null\n" ); + + DeleteFileA( testfile3 ); +} + START_TEST(profile) { test_profile_int(); test_profile_string(); + test_profile_sections(); }

1 0

Alexandre Julliard : kernel: Fixed off-by-one error in GetShortPathNameW.
by Alexandre Julliard Aug. 28, 2006

Aug. 28, 2006

Module: wine Branch: master Commit: 5c324c81882c174b48c89480029a6ccc147daec9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5c324c81882c174b48c8948… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Aug 27 20:15:58 2006 +0200 kernel: Fixed off-by-one error in GetShortPathNameW. --- dlls/kernel/path.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel/path.c b/dlls/kernel/path.c index c4d7677..ddd169c 100644 --- a/dlls/kernel/path.c +++ b/dlls/kernel/path.c @@ -481,7 +481,7 @@ DWORD WINAPI GetShortPathNameW( LPCWSTR tmplen = p - (longpath + lp); lstrcpynW(tmpshortpath + sp, longpath + lp, tmplen + 1); /* Check, if the current element is a valid dos name */ - if (tmplen <= 8+1+3+1) + if (tmplen <= 8+1+3) { BOOLEAN spaces; memcpy(ustr_buf, longpath + lp, tmplen * sizeof(WCHAR));

1 0

Alexandre Julliard : wmc: Get rid of xmalloc casts.
by Alexandre Julliard Aug. 28, 2006

Aug. 28, 2006

Module: wine Branch: master Commit: 1916cb1e198647c33165375c34de166163264331 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1916cb1e198647c33165375… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Aug 26 21:35:32 2006 +0200 wmc: Get rid of xmalloc casts. --- tools/wmc/mcy.y | 2 +- tools/wmc/utils.c | 6 +++--- tools/wmc/wmc.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/wmc/mcy.y b/tools/wmc/mcy.y index 61b7fd1..32458be 100644 --- a/tools/wmc/mcy.y +++ b/tools/wmc/mcy.y @@ -437,7 +437,7 @@ static void do_add_token(tok_e type, tok static lanmsg_t *new_lanmsg(lan_cp_t *lcp, WCHAR *msg) { - lanmsg_t *lmp = (lanmsg_t *)xmalloc(sizeof(lanmsg_t)); + lanmsg_t *lmp = xmalloc(sizeof(lanmsg_t)); lmp->lan = lcp->language; lmp->cp = lcp->codepage; lmp->msg = msg; diff --git a/tools/wmc/utils.c b/tools/wmc/utils.c index c91902d..6b2de4c 100644 --- a/tools/wmc/utils.c +++ b/tools/wmc/utils.c @@ -128,7 +128,7 @@ char *dup_basename(const char *name, con namelen = strlen(name); /* +4 for later extension and +1 for '\0' */ - base = (char *)xmalloc(namelen +4 +1); + base = xmalloc(namelen +4 +1); strcpy(base, name); if(!strcasecmp(name + namelen-extlen, ext)) { @@ -172,7 +172,7 @@ char *xstrdup(const char *str) char *s; assert(str != NULL); - s = (char *)xmalloc(strlen(str)+1); + s = xmalloc(strlen(str)+1); return strcpy(s, str); } @@ -198,7 +198,7 @@ WCHAR *xunistrdup(const WCHAR * str) WCHAR *s; assert(str != NULL); - s = (WCHAR *)xmalloc((unistrlen(str)+1) * sizeof(WCHAR)); + s = xmalloc((unistrlen(str)+1) * sizeof(WCHAR)); return unistrcpy(s, str); } diff --git a/tools/wmc/wmc.c b/tools/wmc/wmc.c index 9a19654..858606f 100644 --- a/tools/wmc/wmc.c +++ b/tools/wmc/wmc.c @@ -152,7 +152,7 @@ #endif cmdlen = 4; /* for "wmc " */ for(i = 1; i < argc; i++) cmdlen += strlen(argv[i]) + 1; - cmdline = (char *)xmalloc(cmdlen); + cmdline = xmalloc(cmdlen); strcpy(cmdline, "wmc "); for(i = 1; i < argc; i++) {

1 0

Alexandre Julliard : wrc: Get rid of xmalloc casts.
by Alexandre Julliard Aug. 28, 2006

Aug. 28, 2006

Module: wine Branch: master Commit: fce74f7411cfb598c8e6508d4cf59026284d0acc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fce74f7411cfb598c8e6508… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Aug 26 21:33:29 2006 +0200 wrc: Get rid of xmalloc casts. --- tools/wrc/genres.c | 8 ++++--- tools/wrc/newstruc.c | 54 +++++++++++++++++++++++++------------------------- tools/wrc/parser.l | 4 ++-- tools/wrc/parser.y | 12 ++++++----- tools/wrc/utils.c | 4 ++-- tools/wrc/wrc.c | 2 +- 6 files changed, 42 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=fce74f7411cfb598c8e…

1 0

Alexandre Julliard : wrc: xmalloc shouldn't initialize to zero, do that explicitly where needed.
by Alexandre Julliard Aug. 28, 2006

Aug. 28, 2006

Module: wine Branch: master Commit: fba0897ee78f6419d3851d2c0647f609510f093f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fba0897ee78f6419d3851d2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Aug 26 21:29:24 2006 +0200 wrc: xmalloc shouldn't initialize to zero, do that explicitly where needed. --- tools/wrc/genres.c | 1 + tools/wrc/newstruc.c | 3 +++ tools/wrc/newstruc.h | 4 +++- tools/wrc/parser.y | 3 +++ tools/wrc/utils.c | 7 +------ 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/tools/wrc/genres.c b/tools/wrc/genres.c index afce7d9..bb46d98 100644 --- a/tools/wrc/genres.c +++ b/tools/wrc/genres.c @@ -51,6 +51,7 @@ res_t *new_res(void) r = (res_t *)xmalloc(sizeof(res_t)); r->allocsize = RES_BLOCKSIZE; r->size = 0; + r->dataidx = 0; r->data = (char *)xmalloc(RES_BLOCKSIZE); return r; } diff --git a/tools/wrc/newstruc.c b/tools/wrc/newstruc.c index c729a59..6035608 100644 --- a/tools/wrc/newstruc.c +++ b/tools/wrc/newstruc.c @@ -76,6 +76,7 @@ __NEW_STRUCT_FUNC(ani_any) resource_t *new_resource(enum res_e t, void *res, int memopt, language_t *lan) { resource_t *r = (resource_t *)xmalloc(sizeof(resource_t)); + memset( r, 0, sizeof(*r) ); r->type = t; r->res.overlay = res; r->memopt = memopt; @@ -1145,6 +1146,7 @@ stringtable_t *new_stringtable(lvc_t *lv { stringtable_t *stt = (stringtable_t *)xmalloc(sizeof(stringtable_t)); + memset( stt, 0, sizeof(*stt) ); if(lvc) stt->lvc = *lvc; @@ -1154,6 +1156,7 @@ stringtable_t *new_stringtable(lvc_t *lv toolbar_t *new_toolbar(int button_width, int button_height, toolbar_item_t *items, int nitems) { toolbar_t *tb = (toolbar_t *)xmalloc(sizeof(toolbar_t)); + memset( tb, 0, sizeof(*tb) ); tb->button_width = button_width; tb->button_height = button_height; tb->nitems = nitems; diff --git a/tools/wrc/newstruc.h b/tools/wrc/newstruc.h index 299782c..2e46b14 100644 --- a/tools/wrc/newstruc.h +++ b/tools/wrc/newstruc.h @@ -26,7 +26,9 @@ #include "wrctypes.h" #define __NEW_STRUCT_FUNC(p) \ p##_t *new_##p(void)\ {\ - return (p##_t *)xmalloc(sizeof(p##_t));\ + p##_t * ret = xmalloc(sizeof(*ret)); \ + memset( ret, 0, sizeof(*ret) ); \ + return ret; \ } #define __NEW_STRUCT_PROTO(p) p##_t *new_##p(void) diff --git a/tools/wrc/parser.y b/tools/wrc/parser.y index 252606c..a903823 100644 --- a/tools/wrc/parser.y +++ b/tools/wrc/parser.y @@ -2286,6 +2286,7 @@ static event_t *add_string_event(string_ static itemex_opt_t *new_itemex_opt(int id, int type, int state, int helpid) { itemex_opt_t *opt = (itemex_opt_t *)xmalloc(sizeof(itemex_opt_t)); + memset( opt, 0, sizeof(*opt) ); opt->id = id; opt->type = type; opt->state = state; @@ -2602,6 +2603,7 @@ static resource_t *build_stt_resources(s { newstt = new_stringtable(&stt->lvc); newstt->entries = (stt_entry_t *)xmalloc(16 * sizeof(stt_entry_t)); + memset( newstt->entries, 0, 16 * sizeof(stt_entry_t) ); newstt->nentries = 16; newstt->idbase = stt->entries[i].id & ~0xf; for(j = 0; j < 16 && i < stt->nentries; j++) @@ -2823,6 +2825,7 @@ static resource_t *build_fontdirs(resour /* Copy space */ lanfnt = xmalloc(nfnt * sizeof(*lanfnt)); + memset( lanfnt, 0, nfnt * sizeof(*lanfnt)); /* Get all fonts covered by fontdirs */ for(i = 0; i < nfnd; i++) diff --git a/tools/wrc/utils.c b/tools/wrc/utils.c index f0e2932..d8ab8e9 100644 --- a/tools/wrc/utils.c +++ b/tools/wrc/utils.c @@ -168,12 +168,7 @@ void *xmalloc(size_t size) { error("Virtual memory exhausted.\n"); } - /* - * We set it to 0. - * This is *paramount* because we depend on it - * just about everywhere in the rest of the code. - */ - memset(res, 0, size); + memset(res, 0x55, size); return res; }

1 0

Alexandre Julliard : wmc: xmalloc shouldn't initialize to zero, do that explicitly where needed.
by Alexandre Julliard Aug. 28, 2006

Aug. 28, 2006

Module: wine Branch: master Commit: 1659f53c3a2c972879c95f1cf6868a812ea0b324 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1659f53c3a2c972879c95f1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Aug 26 21:29:13 2006 +0200 wmc: xmalloc shouldn't initialize to zero, do that explicitly where needed. --- tools/wmc/mcy.y | 10 +++++++--- tools/wmc/utils.c | 7 +------ 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/tools/wmc/mcy.y b/tools/wmc/mcy.y index db4945d..61b7fd1 100644 --- a/tools/wmc/mcy.y +++ b/tools/wmc/mcy.y @@ -389,7 +389,7 @@ lines : tLINE { $$ = $1; } /*---------------------------------------------------------------------- * Helper rules */ -token : tIDENT { $$ = xmalloc(sizeof(token_t)); $$->name = $1; } +token : tIDENT { $$ = xmalloc(sizeof(token_t)); memset($$,0,sizeof(*$$)); $$->name = $1; } | tTOKEN { $$ = $1; } ; @@ -451,7 +451,10 @@ static msg_t *add_lanmsg(msg_t *msg, lan { int i; if(!msg) + { msg = xmalloc(sizeof(msg_t)); + memset( msg, 0, sizeof(*msg) ); + } msg->msgs = xrealloc(msg->msgs, (msg->nmsgs+1) * sizeof(*(msg->msgs))); msg->msgs[msg->nmsgs] = lanmsg; msg->nmsgs++; @@ -489,7 +492,8 @@ static msg_t *complete_msg(msg_t *mp, in static void add_node(node_e type, void *p) { - node_t *ndp = (node_t *)xmalloc(sizeof(node_t)); + node_t *ndp = xmalloc(sizeof(node_t)); + memset( ndp, 0, sizeof(*ndp) ); ndp->type = type; ndp->u.all = p; @@ -601,7 +605,7 @@ static lan_blk_t *block_messages(node_t for(nl = 0; nl < msgtab[0]->nmsgs; nl++) /* This should be equal for all after check_languages() */ { lbp = xmalloc(sizeof(lan_blk_t)); - + memset( lbp, 0, sizeof(*lbp) ); if(!lblktail) { lblkhead = lblktail = lbp; diff --git a/tools/wmc/utils.c b/tools/wmc/utils.c index 6b7769e..c91902d 100644 --- a/tools/wmc/utils.c +++ b/tools/wmc/utils.c @@ -148,12 +148,7 @@ void *xmalloc(size_t size) { error("Virtual memory exhausted.\n"); } - /* - * We set it to 0. - * This is *paramount* because we depend on it - * just about everywhere in the rest of the code. - */ - memset(res, 0, size); + memset(res, 0x55, size); return res; }

1 0

Alexandre Julliard : widl: xmalloc shouldn't initialize to zero, do that explicitly where needed.
by Alexandre Julliard Aug. 28, 2006

Aug. 28, 2006

Module: wine Branch: master Commit: 883aef172d4efa7fe1bc3d37ad89ae2545ca58cf URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=883aef172d4efa7fe1bc3d3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Aug 26 21:39:44 2006 +0200 widl: xmalloc shouldn't initialize to zero, do that explicitly where needed. --- tools/widl/parser.y | 2 ++ tools/widl/typelib.c | 4 ++++ tools/widl/utils.c | 11 +++-------- tools/widl/widltypes.h | 2 +- tools/widl/write_msft.c | 1 + 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 2c1e029..ead02cb 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1144,6 +1144,7 @@ static type_t *make_type(unsigned char t t->sign = 0; t->defined = FALSE; t->written = FALSE; + t->user_types_registered = FALSE; t->typelib_idx = -1; INIT_LINK(t); return t; @@ -1203,6 +1204,7 @@ static var_t *make_var(char *name) v->name = name; v->ptr_level = 0; v->type = NULL; + v->args = NULL; v->tname = NULL; v->attrs = NULL; v->array = NULL; diff --git a/tools/widl/typelib.c b/tools/widl/typelib.c index 7a1b246..5218070 100644 --- a/tools/widl/typelib.c +++ b/tools/widl/typelib.c @@ -220,6 +220,8 @@ void start_typelib(char *name, attr_t *a typelib->name = xstrdup(name); typelib->filename = xstrdup(typelib_name); typelib->attrs = attrs; + typelib->entry = NULL; + typelib->importlibs = NULL; } void end_typelib(void) @@ -373,6 +375,7 @@ static void read_msft_importlib(importli importlib->importinfos[i].flags |= MSFT_IMPINFO_OFFSET_IS_GUID; msft_read_guid(fd, &segdir, base.posguid, &importlib->importinfos[i].guid); } + else memset( &importlib->importinfos[i].guid, 0, sizeof(importlib->importinfos[i].guid)); tlb_lseek(fd, segdir.pNametab.offset + base.NameOffset); tlb_read(fd, &nameintro, sizeof(nameintro)); @@ -431,6 +434,7 @@ void add_importlib(const char *name) chat("add_importlib: %s\n", name); importlib = xmalloc(sizeof(*importlib)); + memset( importlib, 0, sizeof(*importlib) ); importlib->name = xstrdup(name); read_importlib(importlib); diff --git a/tools/widl/utils.c b/tools/widl/utils.c index 9f82184..fea0540 100644 --- a/tools/widl/utils.c +++ b/tools/widl/utils.c @@ -145,7 +145,7 @@ char *dup_basename(const char *name, con namelen = strlen(name); /* +4 for later extension and +1 for '\0' */ - base = (char *)xmalloc(namelen +4 +1); + base = xmalloc(namelen +4 +1); strcpy(base, name); if(!strcasecmp(name + namelen-extlen, ext)) { @@ -164,12 +164,7 @@ void *xmalloc(size_t size) { error("Virtual memory exhausted.\n"); } - /* - * We set it to 0. - * This is *paramount* because we depend on it - * just about everywhere in the rest of the code. - */ - memset(res, 0, size); + memset(res, 0x55, size); return res; } @@ -192,6 +187,6 @@ char *xstrdup(const char *str) char *s; assert(str != NULL); - s = (char *)xmalloc(strlen(str)+1); + s = xmalloc(strlen(str)+1); return strcpy(s, str); } diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index cf0f246..eeaa627 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -49,7 +49,7 @@ #define DECL_LINK(type) \ type *l_next; \ type *l_prev -#define LINK(x,y) do { x->l_next = y; if (y) y->l_prev = x; } while (0) +#define LINK(x,y) do { x->l_next = y; x->l_prev = NULL; if (y) y->l_prev = x; } while (0) #define INIT_LINK(x) do { x->l_next = NULL; x->l_prev = NULL; } while (0) #define NEXT_LINK(x) ((x)->l_next) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index cac1f7f..2307493 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -1734,6 +1734,7 @@ static msft_typeinfo_t *create_msft_type chat("create_msft_typeinfo: name %s kind %d\n", name, kind); msft_typeinfo = xmalloc(sizeof(*msft_typeinfo)); + memset( msft_typeinfo, 0, sizeof(*msft_typeinfo) ); msft_typeinfo->typelib = typelib;

1 0

docs/en winedev-otherdebug.sgml
by Dimi Paun Aug. 28, 2006

Aug. 28, 2006

ChangeSet ID: 1156740104699485644073324 CVSROOT: /cvsroot/wine Module name: docs Changes by: dimi(a)sc8-pr-cvs9.sourceforge.net 2006/08/27 21:41:44 Modified files: en : winedev-otherdebug.sgml Log message: Mike McCormack <mike(a)codeweavers.com> Update regression testing procedure to use Git. Old revision New revision Changes Path 1.4 1.5 +34 -88 docs/en/winedev-otherdebug.sgml Index: docs/en/winedev-otherdebug.sgml diff -u -p docs/en/winedev-otherdebug.sgml:1.4 docs/en/winedev-otherdebug.sgml:1.5 --- docs/en/winedev-otherdebug.sgml 28 Aug 2006 4:41:44 -0000 +++ /dev/null 28 Aug 2006 4:41:44 -0000 @@ -361,7 +361,7 @@ int main (void) </para> </sect1> <sect1> - <title>How to do regression testing using CVS</title> + <title>How to do regression testing using Git</title> <para> A problem that can happen sometimes is 'it used to work @@ -371,117 +371,63 @@ int main (void) </para> <orderedlist> - <listitem> - <para> - Get the <quote>full CVS</quote> archive from winehq. This - archive is the CVS tree but with the tags controlling the - versioning system. It's a big file (> 40 meg) with a name - like full-cvs-<last update date> (it's more than 100mb - when uncompressed, you can't very well do this with - small, old computers or slow Internet connections). - </para> - </listitem> - <listitem> + <listitem> <para> - untar it into a repository directory: - <screen> -cd /home/gerard -tar -zxf full-cvs-2003-08-18.tar.gz -mv wine repository - </screen> + Clone the <quote>Git</quote> repository from winehq. + It's more than 90Mb, so you it may take some time with + a slow Internet connection. </para> </listitem> <listitem> <para> - extract a new destination directory. This directory must - not be in a subdirectory of the repository else - <command>cvs</command> will think it's part of the - repository and deny you an extraction in the repository: + If you found that something broke between wine-20041019 and + wine-20050930 (these are [WWW] release tags). To start regression + testing we run: <screen> -cd /home/gerard -mv wine wine_current (-> this protects your current wine sandbox, if any) -export CVSROOT=/home/gerard/repository -cvs -d $CVSROOT checkout wine +git bisect start +git bisect good wine-20041019 +git bisect bad wine-20050930 </screen> </para> <para> - Note that it's not possible to do a checkout at a given - date; you always do the checkout for the last date where - the full-cvs-xxx snapshot was generated. - </para> - <para> - Note also that it is possible to do all this with a direct - CVS connection, of course. The full CVS file method is less - painful for the WineHQ CVS server and probably a bit faster - if you don't have a very good net connection. + If you have exact date/time instead of a release you will need + to use sha1 IDs from <filename>git log</filename>. </para> </listitem> <listitem> <para> - you will have now in the <filename>~/wine</filename> - directory an image of the CVS tree, on the client side. - Now update this image to the date you want: + Having told Git when things were working and when they broke, + it will automatically "position" your source tree to the middle. + So all you need to do is build the source: <screen> -cd /home/gerard/wine -cvs update -PAd -D "2004-08-23 CDT" +./configure && make clean && make depend && make +./wine 'c:\test.exe' </screen> - </para> - <para> - The date format is <literal>YYYY-MM-DD HH:MM:SS</literal>. - Using the CDT date format ensure that you will be able to - extract patches in a way that will be compatible with the - wine-cvs archive - <ulink url="http://www.winehq.org/hypermail/wine-cvs"> - http://www.winehq.org/hypermail/wine-cvs</ulink> - </para> - <para> - Many messages will inform you that more recent files have - been deleted to set back the client cvs tree to the date - you asked, for example: + If the version of Wine that Git picked still has the bug, run: + <screen> +git bisect bad + </screen> + and if it does not, run: <screen> -cvs update: tsx11/ts_xf86dga2.c is no longer in the repository +git bisect good </screen> + When you run this command, Git will checkout a new version of Wine + for you to rebuild, so repeat this step again. When the regression + has been isolated, git will inform you. </para> <para> - <command>cvs update</command> is not limited to upgrade to - a <emphasis>newer</emphasis> version as I have believed for - far too long :-( + To find out what's left to test, try: + <screen> +git bisect visualize. + </screen> </para> </listitem> <listitem> <para> - Now proceed as for a normal update: - </para> - <screen> -./configure -make depend && make - </screen> - <para> - If any non-programmer reads this, the fastest method to - get at the point where the problem occurred is to use a - binary search, that is, if the problem occurred in 1999, - start at mid-year, then is the problem is already here, - back to 1st April, if not, to 1st October, and so on. - </para> - <para> - If you have lot of hard disk free space (a full compile - currently takes 400 Mb), copy the oldest known working - version before updating it, it will save time if you need - to go back. (it's better to <command>make - distclean</command> before going back in time, so you - have to make everything if you don't backup the older - version) - </para> - <para> - When you have found the day where the problem happened, - continue the search using the wine-cvs archive (sorted by - date) and a more precise cvs update including hour, - minute, second: + When you have found the bad patch and want to go back to the current HEAD run: <screen> -cvs update -PAd -D "2004-08-23 15:17:25 CDT" +git bisect reset </screen> - This will allow you to find easily the exact patch that - did it. </para> </listitem> <listitem> @@ -557,7 +503,7 @@ return cfd; what has been tested already by running gcov on the file. To do this, do the following: <screen> -cvs checkout wine +git clone git://source.winehq.org/git/wine.git wine mkdir build cd build ../wine/configure

1 0

docs/en winedev-opengl.sgml winedev-testing.sg ...
by Dimi Paun Aug. 28, 2006

Aug. 28, 2006

ChangeSet ID: 1156736499151778276850568 CVSROOT: /cvsroot/wine Module name: docs Changes by: dimi(a)sc8-pr-cvs9.sourceforge.net 2006/08/27 20:41:39 Modified files: en : winedev-opengl.sgml winedev-testing.sgml wineusr-getting.sgml wineusr-glossary.sgml wineusr-introduction.sgml Log message: Mike McCormack <mike(a)codeweavers.com> Change a few more references from CVS to Git. Old revision New revision Changes Path 1.2 1.3 +2 -2 docs/en/winedev-opengl.sgml 1.3 1.4 +2 -1 docs/en/winedev-testing.sgml 1.2 1.3 +8 -8 docs/en/wineusr-getting.sgml 1.1.1.1 1.2 +10 -8 docs/en/wineusr-glossary.sgml 1.2 1.3 +2 -2 docs/en/wineusr-introduction.sgml Index: docs/en/winedev-opengl.sgml diff -u -p docs/en/winedev-opengl.sgml:1.2 docs/en/winedev-opengl.sgml:1.3 --- docs/en/winedev-opengl.sgml 28 Aug 2006 3:41:39 -0000 +++ /dev/null 28 Aug 2006 3:41:39 -0000 @@ -159,7 +159,7 @@ <para> The thunks are the Wine code that does the calling convention translation and they are auto-generated by a Perl - script. In Wine's CVS tree, these thunks are already + script. In Wine's Git tree, these thunks are already generated for you. Now, if you want to do it yourself, there is how it all works.... </para> @@ -192,7 +192,7 @@ fixes the list of functions that the Windows application can link directly to without having to query them from the OpenGL driver. Windows is based, for now, on OpenGL - 1.1, but the thunks that are in the CVS tree are + 1.1, but the thunks that are in the Git tree are generated for OpenGL 1.2. </para> <para> Index: docs/en/winedev-testing.sgml diff -u -p docs/en/winedev-testing.sgml:1.3 docs/en/winedev-testing.sgml:1.4 --- docs/en/winedev-testing.sgml 28 Aug 2006 3:41:39 -0000 +++ /dev/null 28 Aug 2006 3:41:39 -0000 @@ -367,7 +367,8 @@ thread.c: 86 tests executed, 5 marked as Make a directory <filename>wine</> underneath your work directory, and copy the file <filename>wine/test.h</> from the Wine source tree there. (You can download this file from the latest revision at - <ulink url="http://cvs.winehq.org/cvsweb/wine/include/wine/test.h">http://cvs.winehq.org/cvsweb/wine/include/wine/test.h</>). + <ulink url="http://source.winehq.org/git/?p=wine.git;a=blob_plain;f=include/wine/test.h"> + http://source.winehq.org/git/?p=wine.git;a=blob_plain;f=include/wine/test.h</>). </para></listitem> <listitem><para> Copy some existing test from the Wine source tree, or Index: docs/en/wineusr-getting.sgml diff -u -p docs/en/wineusr-getting.sgml:1.2 docs/en/wineusr-getting.sgml:1.3 --- docs/en/wineusr-getting.sgml 28 Aug 2006 3:41:39 -0000 +++ /dev/null 28 Aug 2006 3:41:39 -0000 @@ -57,23 +57,23 @@ </para> </sect2> - <sect2 id="installation-methods-cvs"> - <title>Installation from a cvs snapshot</title> + <sect2 id="installation-methods-git"> + <title>Installation from a Git tree</title> <para> If you wish to try out the bleeding edge of Wine development, or would even like to help develop Wine yourself, you can download the - very latest source code from our CVS server. Instructions for - downloading from the Wine cvs repository are available at <ulink - url="http://www.winehq.org/site/cvs">http://www.winehq.org/site/cvs + very latest source code from our Git repository. Instructions for + downloading from the Wine Git repository are available at <ulink + url="http://www.winehq.org/site/git">http://www.winehq.org/site/git </ulink>. </para> <para> Please take note that the usual warnings for using a developmental - version still apply. The source code on the CVS server is largely + version still apply. The source code on the Git repository is largely untested and may not even compile properly. It is, however, the best way to test out how Wine will work in the next version, and if you're modifying source code it's best to get the latest copy. The - CVS repository is also useful for application maintainers interested + Git repository is also useful for application maintainers interested in testing if an application will still work right for the next release, or if a recent patch actually improves things. If you're interested in helping us to get an application working in Wine, see @@ -130,7 +130,7 @@ Before installing Wine from source, make sure you uninstall any Wine binary packages you may have on your system. Installing from source requires use of the terminal window as well as a full copy of the - Wine source code. Once having downloaded the source from CVS or + Wine source code. Once having downloaded the source from Git or extracted it from an archive, navigate to it using the terminal and then follow the remaining steps. </para> Index: docs/en/wineusr-glossary.sgml diff -u -p docs/en/wineusr-glossary.sgml:1.1.1.1 docs/en/wineusr-glossary.sgml:1.2 --- docs/en/wineusr-glossary.sgml 28 Aug 2006 3:41:39 -0000 +++ /dev/null 28 Aug 2006 3:41:39 -0000 @@ -27,14 +27,6 @@ EXAMPLE: </glossdef> </glossentry> <glossentry> - <glossterm>CVS</glossterm> - <glossdef> - <para> - Concurrent Versions System, a software package to manage software development done by several people. See the CVS chapter in the Wine Developers Guide for detailed usage information. - </para> - </glossdef> -</glossentry> -<glossentry> <glossterm>Distribution</glossterm> <glossdef> <para> @@ -102,6 +94,16 @@ EXAMPLE: </glossdef> </glossentry> <glossentry> + <glossterm>Git</glossterm> + <glossdef> + <para> + Git is a fast directory content manager, originally written for use with + large repositories, such as the Linux Kernel source. + See the Git chapter in the Wine Developers Guide for detailed usage information. + </para> + </glossdef> +</glossentry> +<glossentry> <glossterm>Package</glossterm> <glossdef> <para> Index: docs/en/wineusr-introduction.sgml diff -u -p docs/en/wineusr-introduction.sgml:1.2 docs/en/wineusr-introduction.sgml:1.3 --- docs/en/wineusr-introduction.sgml 28 Aug 2006 3:41:39 -0000 +++ /dev/null 28 Aug 2006 3:41:39 -0000 @@ -210,8 +210,8 @@ (roughly once a month), and can be downloaded over the internet in both prepackaged binary form and ready to compile source code form. Alternatively, you can install a development - version of Wine by using the latest available source code on - the CVS server. See the next chapter, <link + version of Wine by using the latest available source code from + the Git repository. See the next chapter, <link linkend="getting-wine">Getting Wine</link>, for further details. </para> </sect2>

1 0