Ros-diffs October 2005

ros-diffs@reactos.org

26 participants
737 discussions

[gvg] 18789: Fix build problems introduced by r18788
by gvg＠svn.reactos.com 27 Oct '05

27 Oct '05

Fix build problems introduced by r18788 Modified: trunk/reactos/tools/wpp/lex.yy.c Modified: trunk/reactos/tools/wpp/ppl.l Modified: trunk/reactos/tools/wrc/parser.tab.c Modified: trunk/reactos/tools/wrc/parser.tab.h Modified: trunk/reactos/tools/wrc/parser.y _____ Modified: trunk/reactos/tools/wpp/lex.yy.c --- trunk/reactos/tools/wpp/lex.yy.c 2005-10-27 17:40:32 UTC (rev 18788) +++ trunk/reactos/tools/wpp/lex.yy.c 2005-10-27 18:06:50 UTC (rev 18789) @@ -16877,7 +16877,7 @@ /* Undo the effect of the quotation */ fname[n-1] = '\0'; - if((ppin = pp_open_include(fname+1, type ? pp_status.input : NULL, &newpath)) == NULL) + if((ppin = pp_open_include(fname+1, type ? pp_status.input : NULL, &newpath, type)) == NULL) pperror("Unable to open include file %s", fname+1); fname[n-1] = *fname; /* Redo the quotes */ _____ Modified: trunk/reactos/tools/wpp/ppl.l --- trunk/reactos/tools/wpp/ppl.l 2005-10-27 17:40:32 UTC (rev 18788) +++ trunk/reactos/tools/wpp/ppl.l 2005-10-27 18:06:50 UTC (rev 18789) @@ -1448,7 +1448,7 @@ /* Undo the effect of the quotation */ fname[n-1] = '\0'; - if((ppin = pp_open_include(fname+1, type ? pp_status.input : NULL, &newpath)) == NULL) + if((ppin = pp_open_include(fname+1, type ? pp_status.input : NULL, &newpath, type)) == NULL) pperror("Unable to open include file %s", fname+1); fname[n-1] = *fname; /* Redo the quotes */ _____ Modified: trunk/reactos/tools/wrc/parser.tab.c --- trunk/reactos/tools/wrc/parser.tab.c 2005-10-27 17:40:32 UTC (rev 18788) +++ trunk/reactos/tools/wrc/parser.tab.c 2005-10-27 18:06:50 UTC (rev 18789) @@ -226,7 +226,7 @@ /* Copy the first part of user declarations. */ -#line 1 "./parser.y" +#line 1 "parser.y" /* * Copyright 1994 Martin von Loewis @@ -482,7 +482,7 @@ #endif #if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED) -#line 241 "./parser.y" +#line 241 "parser.y" typedef union YYSTYPE { string_t *str; int num; @@ -1982,7 +1982,7 @@ switch (yyn) { case 2: -#line 364 "./parser.y" +#line 364 "parser.y" { resource_t *rsc; /* First add stringtables to the resource-list */ @@ -2012,16 +2012,16 @@ yyvsp[0].res = rsc; /* Final statement before were done */ resource_top = get_resource_head(yyvsp[0].res); - } + ;} break; case 3: -#line 398 "./parser.y" - { yyval.res = NULL; want_id = 1; } +#line 398 "parser.y" + { yyval.res = NULL; want_id = 1; ;} break; case 4: -#line 399 "./parser.y" +#line 399 "parser.y" { if(yyvsp[0].res) { @@ -2066,11 +2066,11 @@ if(!dont_want_id) /* See comments in language parsing below */ want_id = 1; dont_want_id = 0; - } + ;} break; case 6: -#line 475 "./parser.y" +#line 475 "parser.y" { yyval.res = yyvsp[0].res; if(yyval.res) @@ -2082,11 +2082,11 @@ yyval.res->name->name.i_name = yyvsp[-2].num; chat("Got %s (%d)", get_typename(yyvsp[0].res), yyval.res->name->name.i_name); } - } + ;} break; case 7: -#line 487 "./parser.y" +#line 487 "parser.y" { yyval.res = yyvsp[0].res; if(yyval.res) @@ -2096,11 +2096,11 @@ yyval.res->name->name.s_name = yyvsp[-2].str; chat("Got %s (%s)", get_typename(yyvsp[0].res), yyval.res->name->name.s_name->str.cstr); } - } + ;} break; case 8: -#line 497 "./parser.y" +#line 497 "parser.y" { /* Don't do anything, stringtables are converted to * resource_t structures when we are finished parsing and @@ -2108,16 +2108,16 @@ */ yyval.res = NULL; chat("Got STRINGTABLE"); - } + ;} break; case 9: -#line 505 "./parser.y" - {want_nl = 1; } +#line 505 "parser.y" + {want_nl = 1; ;} break; case 10: -#line 505 "./parser.y" +#line 505 "parser.y" { /* We *NEED* the newline to delimit the expression. * Otherwise, we would not be able to set the next @@ -2155,60 +2155,60 @@ currentlanguage = new_language(yyvsp[-2].num, yyvsp[0].num); yyval.res = NULL; chat("Got LANGUAGE %d,%d (0x%04x)", yyvsp[-2].num, yyvsp[0].num, (yyvsp[0].num<<10) + yyvsp[-2].num); - } + ;} break; case 11: -#line 549 "./parser.y" - { yychar = rsrcid_to_token(yychar); } +#line 549 "parser.y" + { yychar = rsrcid_to_token(yychar); ;} break; case 12: -#line 555 "./parser.y" +#line 555 "parser.y" { if(yyvsp[0].num > 65535 || yyvsp[0].num < -32768) yyerror("Resource's ID out of range (%d)", yyvsp[0].num); yyval.nid = new_name_id(); yyval.nid->type = name_ord; yyval.nid->name.i_name = yyvsp[0].num; - } + ;} break; case 13: -#line 562 "./parser.y" +#line 562 "parser.y" { yyval.nid = new_name_id(); yyval.nid->type = name_str; yyval.nid->name.s_name = yyvsp[0].str; - } + ;} break; case 14: -#line 572 "./parser.y" - { yyval.nid = yyvsp[0].nid; } +#line 572 "parser.y" + { yyval.nid = yyvsp[0].nid; ;} break; case 15: -#line 573 "./parser.y" +#line 573 "parser.y" { yyval.nid = new_name_id(); yyval.nid->type = name_str; yyval.nid->name.s_name = yyvsp[0].str; - } + ;} break; case 16: -#line 582 "./parser.y" - { yyval.res = new_resource(res_acc, yyvsp[0].acc, yyvsp[0].acc->memopt, yyvsp[0].acc->lvc.language); } +#line 582 "parser.y" + { yyval.res = new_resource(res_acc, yyvsp[0].acc, yyvsp[0].acc->memopt, yyvsp[0].acc->lvc.language); ;} break; case 17: -#line 583 "./parser.y" - { yyval.res = new_resource(res_bmp, yyvsp[0].bmp, yyvsp[0].bmp->memopt, yyvsp[0].bmp->data->lvc.language); } +#line 583 "parser.y" + { yyval.res = new_resource(res_bmp, yyvsp[0].bmp, yyvsp[0].bmp->memopt, yyvsp[0].bmp->data->lvc.language); ;} break; case 18: -#line 584 "./parser.y" +#line 584 "parser.y" { resource_t *rsc; if(yyvsp[0].ani->type == res_anicur) @@ -2232,41 +2232,41 @@ else internal_error(__FILE__, __LINE__, "Invalid top-level type %d in cursor resource", yyvsp[0].ani->type); free(yyvsp[0].ani); - } + ;} break; case 19: -#line 608 "./parser.y" - { yyval.res = new_resource(res_dlg, yyvsp[0].dlg, yyvsp[0].dlg->memopt, yyvsp[0].dlg->lvc.language); } +#line 608 "parser.y" + { yyval.res = new_resource(res_dlg, yyvsp[0].dlg, yyvsp[0].dlg->memopt, yyvsp[0].dlg->lvc.language); ;} break; case 20: -#line 609 "./parser.y" +#line 609 "parser.y" { if(win32) yyval.res = new_resource(res_dlgex, yyvsp[0].dlgex, yyvsp[0].dlgex->memopt, yyvsp[0].dlgex->lvc.language); else yyval.res = NULL; - } + ;} break; case 21: -#line 615 "./parser.y" - { yyval.res = new_resource(res_dlginit, yyvsp[0].dginit, yyvsp[0].dginit->memopt, yyvsp[0].dginit->data->lvc.language); } +#line 615 "parser.y" + { yyval.res = new_resource(res_dlginit, yyvsp[0].dginit, yyvsp[0].dginit->memopt, yyvsp[0].dginit->data->lvc.language); ;} break; case 22: -#line 616 "./parser.y" - { yyval.res = new_resource(res_fnt, yyvsp[0].fnt, yyvsp[0].fnt->memopt, yyvsp[0].fnt->data->lvc.language); } +#line 616 "parser.y" + { yyval.res = new_resource(res_fnt, yyvsp[0].fnt, yyvsp[0].fnt->memopt, yyvsp[0].fnt->data->lvc.language); ;} break; case 23: -#line 617 "./parser.y" - { yyval.res = new_resource(res_fntdir, yyvsp[0].fnd, yyvsp[0].fnd->memopt, yyvsp[0].fnd->data->lvc.language); } +#line 617 "parser.y" + { yyval.res = new_resource(res_fntdir, yyvsp[0].fnd, yyvsp[0].fnd->memopt, yyvsp[0].fnd->data->lvc.language); ;} break; case 24: -#line 618 "./parser.y" +#line 618 "parser.y" { resource_t *rsc; if(yyvsp[0].ani->type == res_aniico) @@ -2290,76 +2290,76 @@ else internal_error(__FILE__, __LINE__, "Invalid top-level type %d in icon resource", yyvsp[0].ani->type); free(yyvsp[0].ani); - } + ;} break; case 25: -#line 642 "./parser.y" - { yyval.res = new_resource(res_men, yyvsp[0].men, yyvsp[0].men->memopt, yyvsp[0].men->lvc.language); } +#line 642 "parser.y" + { yyval.res = new_resource(res_men, yyvsp[0].men, yyvsp[0].men->memopt, yyvsp[0].men->lvc.language); ;} break; case 26: -#line 643 "./parser.y" +#line 643 "parser.y" { if(win32) yyval.res = new_resource(res_menex, yyvsp[0].menex, yyvsp[0].menex->memopt, yyvsp[0].menex->lvc.language); else yyval.res = NULL; - } + ;} break; case 27: -#line 649 "./parser.y" - { yyval.res = new_resource(res_msg, yyvsp[0].msg, WRC_MO_MOVEABLE | WRC_MO_DISCARDABLE, yyvsp[0].msg->data->lvc.language); } +#line 649 "parser.y" + { yyval.res = new_resource(res_msg, yyvsp[0].msg, WRC_MO_MOVEABLE | WRC_MO_DISCARDABLE, yyvsp[0].msg->data->lvc.language); ;} break; case 28: -#line 650 "./parser.y" - { yyval.res = new_resource(res_html, yyvsp[0].html, yyvsp[0].html->memopt, yyvsp[0].html->data->lvc.language); } +#line 650 "parser.y" + { yyval.res = new_resource(res_html, yyvsp[0].html, yyvsp[0].html->memopt, yyvsp[0].html->data->lvc.language); ;} break; case 29: -#line 651 "./parser.y" - { yyval.res = new_resource(res_rdt, yyvsp[0].rdt, yyvsp[0].rdt->memopt, yyvsp[0].rdt->data->lvc.language); } +#line 651 "parser.y" + { yyval.res = new_resource(res_rdt, yyvsp[0].rdt, yyvsp[0].rdt->memopt, yyvsp[0].rdt->data->lvc.language); ;} break; case 30: -#line 652 "./parser.y" - { yyval.res = new_resource(res_toolbar, yyvsp[0].tlbar, yyvsp[0].tlbar->memopt, yyvsp[0].tlbar->lvc.language); } +#line 652 "parser.y" + { yyval.res = new_resource(res_toolbar, yyvsp[0].tlbar, yyvsp[0].tlbar->memopt, yyvsp[0].tlbar->lvc.language); ;} break; case 31: -#line 653 "./parser.y" - { yyval.res = new_resource(res_usr, yyvsp[0].usr, yyvsp[0].usr->memopt, yyvsp[0].usr->data->lvc.language); } +#line 653 "parser.y" + { yyval.res = new_resource(res_usr, yyvsp[0].usr, yyvsp[0].usr->memopt, yyvsp[0].usr->data->lvc.language); ;} break; case 32: -#line 654 "./parser.y" - { yyval.res = new_resource(res_ver, yyvsp[0].veri, WRC_MO_MOVEABLE | WRC_MO_DISCARDABLE, yyvsp[0].veri->lvc.language); } +#line 654 "parser.y" + { yyval.res = new_resource(res_ver, yyvsp[0].veri, WRC_MO_MOVEABLE | WRC_MO_DISCARDABLE, yyvsp[0].veri->lvc.language); ;} break; case 33: -#line 658 "./parser.y" - { yyval.str = make_filename(yyvsp[0].str); } +#line 658 "parser.y" + { yyval.str = make_filename(yyvsp[0].str); ;} break; case 34: -#line 659 "./parser.y" - { yyval.str = make_filename(yyvsp[0].str); } +#line 659 "parser.y" + { yyval.str = make_filename(yyvsp[0].str); ;} break; case 35: -#line 660 "./parser.y" - { yyval.str = make_filename(yyvsp[0].str); } +#line 660 "parser.y" + { yyval.str = make_filename(yyvsp[0].str); ;} break; case 36: -#line 664 "./parser.y" - { yyval.bmp = new_bitmap(yyvsp[0].raw, yyvsp[-1].iptr); } +#line 664 "parser.y" + { yyval.bmp = new_bitmap(yyvsp[0].raw, yyvsp[-1].iptr); ;} break; case 37: -#line 668 "./parser.y" +#line 668 "parser.y" { yyval.ani = new_ani_any(); if(yyvsp[0].raw->size > 4 && !memcmp(yyvsp[0].raw->data, riff, sizeof(riff))) @@ -2372,11 +2372,11 @@ yyval.ani->type = res_curg; yyval.ani->u.curg = new_cursor_group(yyvsp[0].raw, yyvsp[-1].iptr); } - } + ;} break; case 38: -#line 684 "./parser.y" +#line 684 "parser.y" { yyval.ani = new_ani_any(); if(yyvsp[0].raw->size > 4 && !memcmp(yyvsp[0].raw->data, riff, sizeof(riff))) @@ -2389,45 +2389,45 @@ yyval.ani->type = res_icog; yyval.ani->u.icog = new_icon_group(yyvsp[0].raw, yyvsp[-1].iptr); } - } + ;} break; case 39: -#line 706 "./parser.y" - { yyval.fnt = new_font(yyvsp[0].raw, yyvsp[-1].iptr); } +#line 706 "parser.y" + { yyval.fnt = new_font(yyvsp[0].raw, yyvsp[-1].iptr); ;} break; case 40: -#line 716 "./parser.y" - { yyval.fnd = new_fontdir(yyvsp[0].raw, yyvsp[-1].iptr); } +#line 716 "parser.y" + { yyval.fnd = new_fontdir(yyvsp[0].raw, yyvsp[-1].iptr); ;} break; case 41: -#line 724 "./parser.y" +#line 724 "parser.y" { if(!win32) yywarning("MESSAGETABLE not supported in 16-bit mode"); yyval.msg = new_messagetable(yyvsp[0].raw, yyvsp[-1].iptr); - } + ;} break; case 42: -#line 732 "./parser.y" - { yyval.html = new_html(yyvsp[0].raw, yyvsp[-1].iptr); } +#line 732 "parser.y" + { yyval.html = new_html(yyvsp[0].raw, yyvsp[-1].iptr); ;} break; case 43: -#line 736 "./parser.y" - { yyval.rdt = new_rcdata(yyvsp[0].raw, yyvsp[-1].iptr); } +#line 736 "parser.y" + { yyval.rdt = new_rcdata(yyvsp[0].raw, yyvsp[-1].iptr); ;} break; case 44: -#line 740 "./parser.y" - { yyval.dginit = new_dlginit(yyvsp[0].raw, yyvsp[-1].iptr); } +#line 740 "parser.y" + { yyval.dginit = new_dlginit(yyvsp[0].raw, yyvsp[-1].iptr); ;} break; case 45: -#line 744 "./parser.y" +#line 744 "parser.y" { #ifdef WORDS_BIGENDIAN if(pedantic && byteorder != WRC_BO_LITTLE) @@ -2436,29 +2436,29 @@ #endif yywarning("Byteordering is not little-endian and type cannot be interpreted"); yyval.usr = new_user(yyvsp[-2].nid, yyvsp[0].raw, yyvsp[-1].iptr); - } + ;} break; case 46: -#line 755 "./parser.y" +#line 755 "parser.y" { yyval.nid = new_name_id(); yyval.nid->type = name_ord; yyval.nid->name.i_name = yyvsp[0].num; - } + ;} break; case 47: -#line 760 "./parser.y" +#line 760 "parser.y" { yyval.nid = new_name_id(); yyval.nid->type = name_str; yyval.nid->name.s_name = yyvsp[0].str; - } + ;} break; case 48: -#line 769 "./parser.y" +#line 769 "parser.y" { yyval.acc = new_accelerator(); if(yyvsp[-4].iptr) @@ -2480,76 +2480,76 @@ } if(!yyval.acc->lvc.language) yyval.acc->lvc.language = dup_language(currentlanguage); - } + ;} break; case 49: -#line 793 "./parser.y" - { yyval.event=NULL; } +#line 793 "parser.y" + { yyval.event=NULL; ;} break; case 50: -#line 794 "./parser.y" - { yyval.event=add_string_event(yyvsp[-3].str, yyvsp[-1].num, yyvsp[0].num, yyvsp[-4].event); } +#line 794 "parser.y" + { yyval.event=add_string_event(yyvsp[-3].str, yyvsp[-1].num, yyvsp[0].num, yyvsp[-4].event); ;} break; case 51: -#line 795 "./parser.y" - { yyval.event=add_event(yyvsp[-3].num, yyvsp[-1].num, yyvsp[0].num, yyvsp[-4].event); } +#line 795 "parser.y" + { yyval.event=add_event(yyvsp[-3].num, yyvsp[-1].num, yyvsp[0].num, yyvsp[-4].event); ;} break; case 52: -#line 804 "./parser.y" - { yyval.num = 0; } +#line 804 "parser.y" + { yyval.num = 0; ;} break; case 53: -#line 805 "./parser.y" - { yyval.num = yyvsp[0].num; } +#line 805 "parser.y" + { yyval.num = yyvsp[0].num; ;} break; case 54: -#line 808 "./parser.y" - { yyval.num = yyvsp[0].num; } +#line 808 "parser.y" + { yyval.num = yyvsp[0].num; ;} break; case 55: -#line 809 "./parser.y" - { yyval.num = yyvsp[-2].num | yyvsp[0].num; } +#line 809 "parser.y" + { yyval.num = yyvsp[-2].num | yyvsp[0].num; ;} break; case 56: -#line 812 "./parser.y" - { yyval.num = WRC_AF_NOINVERT; } +#line 812 "parser.y" + { yyval.num = WRC_AF_NOINVERT; ;} break; case 57: -#line 813 "./parser.y" - { yyval.num = WRC_AF_SHIFT; } +#line 813 "parser.y" + { yyval.num = WRC_AF_SHIFT; ;} break; case 58: -#line 814 "./parser.y" - { yyval.num = WRC_AF_CONTROL; } +#line 814 "parser.y" + { yyval.num = WRC_AF_CONTROL; ;} break; case 59: -#line 815 "./parser.y" - { yyval.num = WRC_AF_ALT; } +#line 815 "parser.y" + { yyval.num = WRC_AF_ALT; ;} break; case 60: -#line 816 "./parser.y" - { yyval.num = WRC_AF_ASCII; } +#line 816 "parser.y" + { yyval.num = WRC_AF_ASCII; ;} break; case 61: -#line 817 "./parser.y" - { yyval.num = WRC_AF_VIRTKEY; } +#line 817 "parser.y" + { yyval.num = WRC_AF_VIRTKEY; ;} break; case 62: -#line 823 "./parser.y" +#line 823 "parser.y" { if(yyvsp[-11].iptr) { @@ -2580,162 +2580,162 @@ if(!yyval.dlg->lvc.language) yyval.dlg->lvc.language = dup_language(currentlanguage); - } + ;} break; case 63: -#line 857 "./parser.y" - { yyval.dlg=new_dialog(); } +#line 857 "parser.y" + { yyval.dlg=new_dialog(); ;} break; case 64: -#line 858 "./parser.y" - { yyval.dlg=dialog_style(yyvsp[0].style,yyvsp[-2].dlg); } +#line 858 "parser.y" + { yyval.dlg=dialog_style(yyvsp[0].style,yyvsp[-2].dlg); ;} break; case 65: -#line 859 "./parser.y" - { yyval.dlg=dialog_exstyle(yyvsp[0].style,yyvsp[-2].dlg); } +#line 859 "parser.y" + { yyval.dlg=dialog_exstyle(yyvsp[0].style,yyvsp[-2].dlg); ;} break; case 66: -#line 860 "./parser.y" - { yyval.dlg=dialog_caption(yyvsp[0].str,yyvsp[-2].dlg); } +#line 860 "parser.y" + { yyval.dlg=dialog_caption(yyvsp[0].str,yyvsp[-2].dlg); ;} break; case 67: -#line 861 "./parser.y" - { yyval.dlg=dialog_font(yyvsp[0].fntid,yyvsp[-1].dlg); } +#line 861 "parser.y" + { yyval.dlg=dialog_font(yyvsp[0].fntid,yyvsp[-1].dlg); ;} break; case 68: -#line 862 "./parser.y" - { yyval.dlg=dialog_class(yyvsp[0].nid,yyvsp[-2].dlg); } +#line 862 "parser.y" + { yyval.dlg=dialog_class(yyvsp[0].nid,yyvsp[-2].dlg); ;} break; case 69: -#line 863 "./parser.y" - { yyval.dlg=dialog_menu(yyvsp[0].nid,yyvsp[-2].dlg); } +#line 863 "parser.y" + { yyval.dlg=dialog_menu(yyvsp[0].nid,yyvsp[-2].dlg); ;} break; case 70: -#line 864 "./parser.y" - { yyval.dlg=dialog_language(yyvsp[0].lan,yyvsp[-1].dlg); } +#line 864 "parser.y" + { yyval.dlg=dialog_language(yyvsp[0].lan,yyvsp[-1].dlg); ;} break; case 71: -#line 865 "./parser.y" - { yyval.dlg=dialog_characteristics(yyvsp[0].chars,yyvsp[-1].dlg); } +#line 865 "parser.y" + { yyval.dlg=dialog_characteristics(yyvsp[0].chars,yyvsp[-1].dlg); ;} break; case 72: -#line 866 "./parser.y" - { yyval.dlg=dialog_version(yyvsp[0].ver,yyvsp[-1].dlg); } +#line 866 "parser.y" + { yyval.dlg=dialog_version(yyvsp[0].ver,yyvsp[-1].dlg); ;} break; case 73: -#line 869 "./parser.y" - { yyval.ctl = NULL; } +#line 869 "parser.y" + { yyval.ctl = NULL; ;} break; case 74: -#line 870 "./parser.y" - { yyval.ctl=ins_ctrl(-1, 0, yyvsp[0].ctl, yyvsp[-2].ctl); } +#line 870 "parser.y" + { yyval.ctl=ins_ctrl(-1, 0, yyvsp[0].ctl, yyvsp[-2].ctl); ;} break; case 75: -#line 871 "./parser.y" - { yyval.ctl=ins_ctrl(CT_EDIT, 0, yyvsp[0].ctl, yyvsp[-2].ctl); } +#line 871 "parser.y" + { yyval.ctl=ins_ctrl(CT_EDIT, 0, yyvsp[0].ctl, yyvsp[-2].ctl); ;} break; case 76: -#line 872 "./parser.y" - { yyval.ctl=ins_ctrl(CT_LISTBOX, 0, yyvsp[0].ctl, yyvsp[-2].ctl); } +#line 872 "parser.y" + { yyval.ctl=ins_ctrl(CT_LISTBOX, 0, yyvsp[0].ctl, yyvsp[-2].ctl); ;} break; case 77: -#line 873 "./parser.y" - { yyval.ctl=ins_ctrl(CT_COMBOBOX, 0, yyvsp[0].ctl, yyvsp[-2].ctl); } +#line 873 "parser.y" + { yyval.ctl=ins_ctrl(CT_COMBOBOX, 0, yyvsp[0].ctl, yyvsp[-2].ctl); ;} break; case 78: -#line 874 "./parser.y" - { yyval.ctl=ins_ctrl(CT_SCROLLBAR, 0, yyvsp[0].ctl, yyvsp[-2].ctl); } +#line 874 "parser.y" + { yyval.ctl=ins_ctrl(CT_SCROLLBAR, 0, yyvsp[0].ctl, yyvsp[-2].ctl); ;} break; case 79: -#line 875 "./parser.y" - { yyval.ctl=ins_ctrl(CT_BUTTON, BS_CHECKBOX, yyvsp[0].ctl, yyvsp[-2].ctl); } +#line 875 "parser.y" + { yyval.ctl=ins_ctrl(CT_BUTTON, BS_CHECKBOX, yyvsp[0].ctl, yyvsp[-2].ctl); ;} break; case 80: -#line 876 "./parser.y" - { yyval.ctl=ins_ctrl(CT_BUTTON, BS_DEFPUSHBUTTON, yyvsp[0].ctl, yyvsp[-2].ctl); } +#line 876 "parser.y" + { yyval.ctl=ins_ctrl(CT_BUTTON, BS_DEFPUSHBUTTON, yyvsp[0].ctl, yyvsp[-2].ctl); ;} break; case 81: -#line 877 "./parser.y" - { yyval.ctl=ins_ctrl(CT_BUTTON, BS_GROUPBOX, yyvsp[0].ctl, yyvsp[-2].ctl);} +#line 877 "parser.y" + { yyval.ctl=ins_ctrl(CT_BUTTON, BS_GROUPBOX, yyvsp[0].ctl, yyvsp[-2].ctl);;} break; case 82: -#line 878 "./parser.y" - { yyval.ctl=ins_ctrl(CT_BUTTON, BS_PUSHBUTTON, yyvsp[0].ctl, yyvsp[-2].ctl); } +#line 878 "parser.y" + { yyval.ctl=ins_ctrl(CT_BUTTON, BS_PUSHBUTTON, yyvsp[0].ctl, yyvsp[-2].ctl); ;} break; case 83: -#line 880 "./parser.y" - { yyval.ctl=ins_ctrl(CT_BUTTON, BS_RADIOBUTTON, yyvsp[0].ctl, yyvsp[-2].ctl); } +#line 880 "parser.y" + { yyval.ctl=ins_ctrl(CT_BUTTON, BS_RADIOBUTTON, yyvsp[0].ctl, yyvsp[-2].ctl); ;} break; case 84: -#line 881 "./parser.y" - { yyval.ctl=ins_ctrl(CT_BUTTON, BS_AUTO3STATE, yyvsp[0].ctl, yyvsp[-2].ctl); } +#line 881 "parser.y" + { yyval.ctl=ins_ctrl(CT_BUTTON, BS_AUTO3STATE, yyvsp[0].ctl, yyvsp[-2].ctl); ;} break; case 85: -#line 882 "./parser.y" - { yyval.ctl=ins_ctrl(CT_BUTTON, BS_3STATE, yyvsp[0].ctl, yyvsp[-2].ctl); } +#line 882 "parser.y" + { yyval.ctl=ins_ctrl(CT_BUTTON, BS_3STATE, yyvsp[0].ctl, yyvsp[-2].ctl); ;} break; case 86: -#line 883 "./parser.y" - { yyval.ctl=ins_ctrl(CT_BUTTON, BS_AUTOCHECKBOX, yyvsp[0].ctl, yyvsp[-2].ctl); } +#line 883 "parser.y" + { yyval.ctl=ins_ctrl(CT_BUTTON, BS_AUTOCHECKBOX, yyvsp[0].ctl, yyvsp[-2].ctl); ;} break; case 87: -#line 884 "./parser.y" - { yyval.ctl=ins_ctrl(CT_BUTTON, BS_AUTORADIOBUTTON, yyvsp[0].ctl, yyvsp[-2].ctl); } +#line 884 "parser.y" + { yyval.ctl=ins_ctrl(CT_BUTTON, BS_AUTORADIOBUTTON, yyvsp[0].ctl, yyvsp[-2].ctl); ;} break; case 88: -#line 885 "./parser.y" - { yyval.ctl=ins_ctrl(CT_STATIC, SS_LEFT, yyvsp[0].ctl, yyvsp[-2].ctl); } +#line 885 "parser.y" + { yyval.ctl=ins_ctrl(CT_STATIC, SS_LEFT, yyvsp[0].ctl, yyvsp[-2].ctl); ;} break; case 89: -#line 886 "./parser.y" - { yyval.ctl=ins_ctrl(CT_STATIC, SS_CENTER, yyvsp[0].ctl, yyvsp[-2].ctl); } +#line 886 "parser.y" + { yyval.ctl=ins_ctrl(CT_STATIC, SS_CENTER, yyvsp[0].ctl, yyvsp[-2].ctl); ;} break; case 90: -#line 887 "./parser.y" - { yyval.ctl=ins_ctrl(CT_STATIC, SS_RIGHT, yyvsp[0].ctl, yyvsp[-2].ctl); } +#line 887 "parser.y" + { yyval.ctl=ins_ctrl(CT_STATIC, SS_RIGHT, yyvsp[0].ctl, yyvsp[-2].ctl); ;} break; case 91: -#line 889 "./parser.y" +#line 889 "parser.y" { yyvsp[0].ctl->title = yyvsp[-7].nid; yyvsp[0].ctl->id = yyvsp[-5].num; yyvsp[0].ctl->x = yyvsp[-3].num; yyvsp[0].ctl->y = yyvsp[-1].num; yyval.ctl = ins_ctrl(CT_STATIC, SS_ICON, yyvsp[0].ctl, yyvsp[-9].ctl); - } + ;} break; case 92: -#line 899 "./parser.y" +#line 899 "parser.y" { yyval.ctl=new_control(); yyval.ctl->title = new_name_id(); @@ -2757,11 +2757,11 @@ } free(yyvsp[0].styles); } - } + ;} break; case 93: -#line 924 "./parser.y" +#line 924 "parser.y" { yyval.ctl = new_control(); yyval.ctl->id = yyvsp[-9].num; @@ -2780,36 +2780,36 @@ } free(yyvsp[0].styles); } - } + ;} break; case 94: -#line 946 "./parser.y" - { yyval.ctl = new_control(); } +#line 946 "parser.y" + { yyval.ctl = new_control(); ;} break; case 95: -#line 948 "./parser.y" +#line 948 "parser.y" { yyval.ctl = new_control(); yyval.ctl->width = yyvsp[-2].num; yyval.ctl->height = yyvsp[0].num; - } + ;} break; case 96: -#line 953 "./parser.y" +#line 953 "parser.y" { yyval.ctl = new_control(); yyval.ctl->width = yyvsp[-4].num; yyval.ctl->height = yyvsp[-2].num; yyval.ctl->style = yyvsp[0].style; yyval.ctl->gotstyle = TRUE; - } + ;} break; case 97: -#line 960 "./parser.y" +#line 960 "parser.y" { yyval.ctl = new_control(); yyval.ctl->width = yyvsp[-6].num; @@ -2818,11 +2818,11 @@ yyval.ctl->gotstyle = TRUE; yyval.ctl->exstyle = yyvsp[0].style; yyval.ctl->gotexstyle = TRUE; - } + ;} break; case 98: -#line 971 "./parser.y" +#line 971 "parser.y" { yyval.ctl=new_control(); yyval.ctl->title = yyvsp[-16].nid; @@ -2836,11 +2836,11 @@ yyval.ctl->height = yyvsp[-2].num; yyval.ctl->exstyle = yyvsp[0].style; yyval.ctl->gotexstyle = TRUE; - } + ;} break; case 99: -#line 985 "./parser.y" +#line 985 "parser.y" { yyval.ctl=new_control(); yyval.ctl->title = yyvsp[-14].nid; @@ -2852,69 +2852,69 @@ yyval.ctl->y = yyvsp[-4].num; yyval.ctl->width = yyvsp[-2].num; yyval.ctl->height = yyvsp[0].num; - } + ;} break; case 100: -#line 1000 "./parser.y" - { yyval.fntid = new_font_id(yyvsp[-2].num, yyvsp[0].str, 0, 0); } +#line 1000 "parser.y" + { yyval.fntid = new_font_id(yyvsp[-2].num, yyvsp[0].str, 0, 0); ;} break; case 101: -#line 1005 "./parser.y" - { yyval.styles = NULL; } +#line 1005 "parser.y" + { yyval.styles = NULL; ;} break; case 102: -#line 1006 "./parser.y" - { yyval.styles = new_style_pair(yyvsp[0].style, 0); } +#line 1006 "parser.y" + { yyval.styles = new_style_pair(yyvsp[0].style, 0); ;} break; case 103: -#line 1007 "./parser.y" - { yyval.styles = new_style_pair(yyvsp[-2].style, yyvsp[0].style); } +#line 1007 "parser.y" + { yyval.styles = new_style_pair(yyvsp[-2].style, yyvsp[0].style); ;} break; case 104: -#line 1011 "./parser.y" - { yyval.style = new_style(yyvsp[-2].style->or_mask | yyvsp[0].style->or_mask, yyvsp[-2].style->and_mask | yyvsp[0].style->and_mask); free(yyvsp[-2].style); free(yyvsp[0].style);} +#line 1011 "parser.y" + { yyval.style = new_style(yyvsp[-2].style->or_mask | yyvsp[0].style->or_mask, yyvsp[-2].style->and_mask | yyvsp[0].style->and_mask); free(yyvsp[-2].style); free(yyvsp[0].style);;} break; case 105: -#line 1012 "./parser.y" - { yyval.style = yyvsp[-1].style; } +#line 1012 "parser.y" + { yyval.style = yyvsp[-1].style; ;} break; case 106: -#line 1013 "./parser.y" - { yyval.style = new_style(yyvsp[0].num, 0); } +#line 1013 "parser.y" + { yyval.style = new_style(yyvsp[0].num, 0); ;} break; case 107: -#line 1014 "./parser.y" - { yyval.style = new_style(0, yyvsp[0].num); } +#line 1014 "parser.y" + { yyval.style = new_style(0, yyvsp[0].num); ;} break; case 108: -#line 1018 "./parser.y" +#line 1018 "parser.y" { yyval.nid = new_name_id(); yyval.nid->type = name_ord; yyval.nid->name.i_name = yyvsp[0].num; - } + ;} break; case 109: -#line 1023 "./parser.y" +#line 1023 "parser.y" { yyval.nid = new_name_id(); yyval.nid->type = name_str; yyval.nid->name.s_name = yyvsp[0].str; - } + ;} break; case 110: -#line 1032 "./parser.y" +#line 1032 "parser.y" { if(!win32) yywarning("DIALOGEX not supported in 16-bit mode"); @@ -2954,167 +2954,167 @@ if(!yyval.dlgex->lvc.language) yyval.dlgex->lvc.language = dup_language(currentlanguage); - } + ;} break; [truncated at 1000 lines; 1359 more skipped]

1 0

[gvg] 18788: Sync to Wine-0_9:
by gvg＠svn.reactos.com 27 Oct '05

27 Oct '05

Sync to Wine-0_9: Alexandre Julliard <julliard(a)winehq.org> - Default search path for an include file should be based on the path of the parent source file, not the current directory. Modified: trunk/reactos/include/wine/wpp.h Modified: trunk/reactos/tools/widl/lex.yy.c Modified: trunk/reactos/tools/widl/parser.l Modified: trunk/reactos/tools/wpp/lex.yy.c Modified: trunk/reactos/tools/wpp/ppl.l Modified: trunk/reactos/tools/wpp/preproc.c Modified: trunk/reactos/tools/wpp/wpp_private.h _____ Modified: trunk/reactos/include/wine/wpp.h --- trunk/reactos/include/wine/wpp.h 2005-10-27 14:17:43 UTC (rev 18787) +++ trunk/reactos/include/wine/wpp.h 2005-10-27 17:40:32 UTC (rev 18788) @@ -29,7 +29,7 @@ extern void wpp_set_debug( int lex_debug, int parser_debug, int msg_debug ); extern void wpp_set_pedantic( int on ); extern void wpp_add_include_path( const char *path ); -extern char *wpp_find_include( const char *name, int search ); +char *wpp_find_include( const char *name, const char *parent_name, int type ); extern int wpp_parse( const char *input, FILE *output ); extern int wpp_parse_temp( const char *input, const char *output_base, char **output_name ); _____ Modified: trunk/reactos/tools/widl/lex.yy.c --- trunk/reactos/tools/widl/lex.yy.c 2005-10-27 14:17:43 UTC (rev 18787) +++ trunk/reactos/tools/widl/lex.yy.c 2005-10-27 17:40:32 UTC (rev 18788) @@ -1,4 +1,3 @@ -#line 2 "lex.yy.c" /* A lexical scanner generated by flex */ /* Scanner skeleton version: @@ -10,6 +9,7 @@ #define YY_FLEX_MINOR_VERSION 5 #include <stdio.h> +#include <unistd.h> /* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */ @@ -23,7 +23,6 @@ #ifdef __cplusplus #include <stdlib.h> -#include <unistd.h> /* Use prototypes in function declarations. */ #define YY_USE_PROTOS @@ -3186,7 +3185,7 @@ * The flexer starts here ************************************************************************ ** */ -#line 3190 "lex.yy.c" +#line 3189 "lex.yy.c" /* Macros after this point can all be overridden by user definitions in * section 1. @@ -3337,12 +3336,12 @@ YY_DECL { register yy_state_type yy_current_state; - register char *yy_cp, *yy_bp; + register char *yy_cp = NULL, *yy_bp = NULL; register int yy_act; #line 108 "parser.l" -#line 3346 "lex.yy.c" +#line 3345 "lex.yy.c" if ( yy_init ) { @@ -3559,7 +3558,7 @@ #line 164 "parser.l" ECHO; YY_BREAK -#line 3563 "lex.yy.c" +#line 3562 "lex.yy.c" case YY_END_OF_BUFFER: { @@ -3935,6 +3934,7 @@ #endif /* ifndef YY_NO_UNPUT */ +#ifndef YY_NO_INPUT #ifdef __cplusplus static int yyinput() #else @@ -4007,8 +4007,8 @@ return c; } +#endif /* YY_NO_INPUT */ - #ifdef YY_USE_PROTOS void yyrestart( FILE *input_file ) #else @@ -4118,11 +4118,6 @@ } -#ifndef YY_ALWAYS_INTERACTIVE -#ifndef YY_NEVER_INTERACTIVE -extern int isatty YY_PROTO(( int )); -#endif -#endif #ifdef YY_USE_PROTOS void yy_init_buffer( YY_BUFFER_STATE b, FILE *file ) @@ -4696,7 +4691,7 @@ import->next = first_import; first_import = import; - if (!(path = wpp_find_include( fname, 1 ))) + if (!(path = wpp_find_include( fname, input_name, 1 ))) yyerror("Unable to open include file %s", fname); import_stack[ptr].temp_name = temp_name; _____ Modified: trunk/reactos/tools/widl/parser.l --- trunk/reactos/tools/widl/parser.l 2005-10-27 14:17:43 UTC (rev 18787) +++ trunk/reactos/tools/widl/parser.l 2005-10-27 17:40:32 UTC (rev 18788) @@ -416,7 +416,7 @@ import->next = first_import; first_import = import; - if (!(path = wpp_find_include( fname, 1 ))) + if (!(path = wpp_find_include( fname, input_name, 1 ))) yyerror("Unable to open include file %s", fname); import_stack[ptr].temp_name = temp_name; _____ Modified: trunk/reactos/tools/wpp/lex.yy.c --- trunk/reactos/tools/wpp/lex.yy.c 2005-10-27 14:17:43 UTC (rev 18787) +++ trunk/reactos/tools/wpp/lex.yy.c 2005-10-27 17:40:32 UTC (rev 18788) @@ -28,8 +28,9 @@ #define YY_FLEX_MINOR_VERSION 5 #include <stdio.h> -#include <errno.h> +#include <unistd.h> + /* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */ #ifdef c_plusplus #ifndef __cplusplus @@ -41,9 +42,6 @@ #ifdef __cplusplus #include <stdlib.h> -#ifndef _WIN32 -#include <unistd.h> -#endif /* Use prototypes in function declarations. */ #define YY_USE_PROTOS @@ -83,7 +81,6 @@ #define YY_PROTO(proto) () #endif - /* Returned upon end-of-file. */ #define YY_NULL 0 @@ -14031,7 +14028,7 @@ * The scanner starts here ************************************************************************ ** */ -#line 14035 "lex.yy.c" +#line 14032 "lex.yy.c" /* Macros after this point can all be overridden by user definitions in * section 1. @@ -14131,20 +14128,9 @@ YY_FATAL_ERROR( "input in flex scanner failed" ); \ result = n; \ } \ - else \ - { \ - errno=0; \ - while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \ - { \ - if( errno != EINTR) \ - { \ - YY_FATAL_ERROR( "input in flex scanner failed" ); \ - break; \ - } \ - errno=0; \ - clearerr(yyin); \ - } \ - } + else if ( ((result = fread( buf, 1, max_size, yyin )) == 0) \ + && ferror( yyin ) ) \ + YY_FATAL_ERROR( "input in flex scanner failed" ); #endif /* No semi-colon after return; correct usage is to write "yyterminate();" - @@ -14193,7 +14179,7 @@ YY_DECL { register yy_state_type yy_current_state; - register char *yy_cp, *yy_bp; + register char *yy_cp = NULL, *yy_bp = NULL; register int yy_act; #line 299 "ppl.l" @@ -14210,7 +14196,7 @@ /* * Detect the leading # of a preprocessor directive. */ -#line 14214 "lex.yy.c" +#line 14200 "lex.yy.c" if ( yy_init ) { @@ -15286,7 +15272,7 @@ #line 724 "ppl.l" ECHO; YY_BREAK -#line 15290 "lex.yy.c" +#line 15276 "lex.yy.c" case YY_END_OF_BUFFER: { @@ -15662,6 +15648,7 @@ #endif /* ifndef YY_NO_UNPUT */ +#ifndef YY_NO_INPUT #ifdef __cplusplus static int yyinput() #else @@ -15734,8 +15721,8 @@ return c; } +#endif /* YY_NO_INPUT */ - #ifdef YY_USE_PROTOS void yyrestart( FILE *input_file ) #else @@ -15845,15 +15832,6 @@ } -#ifndef _WIN32 -#include <unistd.h> -#else -#ifndef YY_ALWAYS_INTERACTIVE -#ifndef YY_NEVER_INTERACTIVE -extern int isatty YY_PROTO(( int )); -#endif -#endif -#endif #ifdef YY_USE_PROTOS void yy_init_buffer( YY_BUFFER_STATE b, FILE *file ) @@ -16899,7 +16877,7 @@ /* Undo the effect of the quotation */ fname[n-1] = '\0'; - if((ppin = pp_open_include(fname+1, type, &newpath)) == NULL) + if((ppin = pp_open_include(fname+1, type ? pp_status.input : NULL, &newpath)) == NULL) pperror("Unable to open include file %s", fname+1); fname[n-1] = *fname; /* Redo the quotes */ _____ Modified: trunk/reactos/tools/wpp/ppl.l --- trunk/reactos/tools/wpp/ppl.l 2005-10-27 14:17:43 UTC (rev 18787) +++ trunk/reactos/tools/wpp/ppl.l 2005-10-27 17:40:32 UTC (rev 18788) @@ -1448,7 +1448,7 @@ /* Undo the effect of the quotation */ fname[n-1] = '\0'; - if((ppin = pp_open_include(fname+1, type, &newpath)) == NULL) + if((ppin = pp_open_include(fname+1, type ? pp_status.input : NULL, &newpath)) == NULL) pperror("Unable to open include file %s", fname+1); fname[n-1] = *fname; /* Redo the quotes */ _____ Modified: trunk/reactos/tools/wpp/preproc.c --- trunk/reactos/tools/wpp/preproc.c 2005-10-27 14:17:43 UTC (rev 18787) +++ trunk/reactos/tools/wpp/preproc.c 2005-10-27 17:40:32 UTC (rev 18788) @@ -354,10 +354,11 @@ free(cpy); } -char *wpp_find_include(const char *name, int type) +char *wpp_find_include(const char *name, const char *parent_name, int type) { char *cpy; char *cptr; + char *path; const char *ccptr; int i, fd; @@ -379,15 +380,24 @@ } *cptr = '\0'; - if(type == LOCAL_INCLUDE) + if(type == LOCAL_INCLUDE && parent_name) { - /* Search current dir and then -I path */ - fd = open( cpy, O_RDONLY ); + /* Search directory of parent include and then -I path */ + const char *p; + + if ((p = strrchr( parent_name, '/' ))) p++; + else p = parent_name; + path = pp_xmalloc( (p - parent_name) + strlen(cpy) + 1 ); + memcpy( path, parent_name, p - parent_name ); + strcpy( path + (p - parent_name), cpy ); + fd = open( path, O_RDONLY ); if (fd != -1) { close( fd ); - return cpy; + free( cpy ); + return path; } + free( path ); } /* Skip all directories till the current include file for #include_next. */ @@ -416,7 +426,6 @@ /* Search -I path */ for(; i < nincludepath; i++) { - char *path; path = pp_xmalloc(strlen(includepath[i]) + strlen(cpy) + 2); strcpy(path, includepath[i]); strcat(path, "/"); @@ -434,12 +443,12 @@ return NULL; } -FILE *pp_open_include(const char *name, int type, char **newpath) +FILE *pp_open_include(const char *name, const char *parent_name, char **newpath, int type) { char *path; FILE *fp; - if (!(path = wpp_find_include( name, type ))) return NULL; + if (!(path = wpp_find_include( name, parent_name, type ))) return NULL; fp = fopen(path, "rt"); if (fp) _____ Modified: trunk/reactos/tools/wpp/wpp_private.h --- trunk/reactos/tools/wpp/wpp_private.h 2005-10-27 14:17:43 UTC (rev 18787) +++ trunk/reactos/tools/wpp/wpp_private.h 2005-10-27 17:40:32 UTC (rev 18788) @@ -204,7 +204,7 @@ pp_entry_t *pp_add_define(char *def, char *text); pp_entry_t *pp_add_macro(char *ident, marg_t *args[], int nargs, mtext_t *exp); void pp_del_define(const char *name); -FILE *pp_open_include(const char *name, int search, char **newpath); +FILE *pp_open_include(const char *name, const char *parent_name, char **newpath, int type); void pp_push_if(pp_if_state_t s); void pp_next_if_state(int); pp_if_state_t pp_pop_if(void);

1 0

[gvg] 18787: Wine-0_9 vendor drop
by gvg＠svn.reactos.com 27 Oct '05

27 Oct '05

Wine-0_9 vendor drop Modified: vendor/wine/dlls/comctl32/current/listview.c Modified: vendor/wine/dlls/comctl32/current/rebar.c Modified: vendor/wine/dlls/comctl32/current/status.c Modified: vendor/wine/dlls/comctl32/current/tab.c Modified: vendor/wine/dlls/comctl32/current/theming.c Modified: vendor/wine/dlls/comctl32/current/toolbar.c Modified: vendor/wine/dlls/commdlg/current/cdlg_Cs.rc Modified: vendor/wine/dlls/commdlg/current/filedlg.c Modified: vendor/wine/dlls/commdlg/current/printdlg.c Modified: vendor/wine/dlls/dsound/current/buffer.c Modified: vendor/wine/dlls/dsound/current/capture.c Modified: vendor/wine/dlls/dsound/current/dsound.c Modified: vendor/wine/dlls/dsound/current/dsound_main.c Modified: vendor/wine/dlls/dsound/current/dsound_private.h Modified: vendor/wine/dlls/dsound/current/duplex.c Modified: vendor/wine/dlls/dsound/current/mixer.c Modified: vendor/wine/dlls/dsound/current/primary.c Modified: vendor/wine/dlls/dsound/current/propset.c Modified: vendor/wine/dlls/dsound/current/sound3d.c Modified: vendor/wine/dlls/ole32/current/compobj.c Modified: vendor/wine/dlls/oleaut32/current/tmarshal.c Deleted: vendor/wine/dlls/oleaut32/current/tmarshal.h Modified: vendor/wine/dlls/oleaut32/current/typelib.c Modified: vendor/wine/dlls/oleaut32/current/usrmarshal.c Modified: vendor/wine/dlls/riched20/current/editor.c Modified: vendor/wine/dlls/riched20/current/list.c Modified: vendor/wine/dlls/riched20/current/reader.c Modified: vendor/wine/dlls/riched20/current/run.c Modified: vendor/wine/dlls/riched20/current/style.c Modified: vendor/wine/dlls/riched20/current/writer.c Modified: vendor/wine/dlls/shdocvw/current/shdocvw_main.c Modified: vendor/wine/dlls/shell32/current/brsfolder.c Modified: vendor/wine/dlls/shell32/current/enumidlist.c Modified: vendor/wine/dlls/shell32/current/shell.c Modified: vendor/wine/dlls/shell32/current/shell32.spec Modified: vendor/wine/dlls/shell32/current/shell32_main.h Modified: vendor/wine/dlls/shell32/current/shelllink.c Modified: vendor/wine/dlls/shell32/current/shellpath.c Modified: vendor/wine/dlls/shell32/current/shfldr_desktop.c Modified: vendor/wine/dlls/shell32/current/shlexec.c Modified: vendor/wine/libs/wpp/current/ppl.l Modified: vendor/wine/libs/wpp/current/preproc.c Modified: vendor/wine/libs/wpp/current/wpp_private.h Modified: vendor/wine/tools/winebuild/current/Makefile.in Modified: vendor/wine/tools/winebuild/current/import.c Modified: vendor/wine/tools/winebuild/current/utils.c Modified: vendor/wine/tools/winebuild/current/winebuild.man.in Modified: vendor/wine/tools/wrc/current/Makefile.in Modified: vendor/wine/tools/wrc/current/parser.y Modified: vendor/wine/tools/wrc/current/wrc.c Modified: vendor/wine/tools/wrc/current/wrc.h Deleted: vendor/wine/tools/wrc/current/wrc.man Added: vendor/wine/tools/wrc/current/wrc.man.in _____ Modified: vendor/wine/dlls/comctl32/current/listview.c --- vendor/wine/dlls/comctl32/current/listview.c 2005-10-27 14:18:09 UTC (rev 18786) +++ vendor/wine/dlls/comctl32/current/listview.c 2005-10-27 14:17:43 UTC (rev 18787) @@ -768,10 +768,12 @@ return result; } -static inline LRESULT notify(LISTVIEW_INFO *infoPtr, INT code) +static inline BOOL notify(LISTVIEW_INFO *infoPtr, INT code) { NMHDR nmh; - return notify_hdr(infoPtr, code, &nmh); + HWND hwnd = infoPtr->hwndSelf; + notify_hdr(infoPtr, code, &nmh); + return IsWindow(hwnd); } static inline void notify_itemactivate(LISTVIEW_INFO *infoPtr, LVHITTESTINFO *htInfo) @@ -812,11 +814,12 @@ return notify_hdr(infoPtr, code, (LPNMHDR)plvnm); } -static LRESULT notify_click(LISTVIEW_INFO *infoPtr, INT code, LVHITTESTINFO *lvht) +static BOOL notify_click(LISTVIEW_INFO *infoPtr, INT code, LVHITTESTINFO *lvht) { NMLISTVIEW nmlv; LVITEMW item; - + HWND hwnd = infoPtr->hwndSelf; + TRACE("code=%d, lvht=%s\n", code, debuglvhittestinfo(lvht)); ZeroMemory(&nmlv, sizeof(nmlv)); nmlv.iItem = lvht->iItem; @@ -826,14 +829,16 @@ item.iItem = lvht->iItem; item.iSubItem = 0; if (LISTVIEW_GetItemT(infoPtr, &item, TRUE)) nmlv.lParam = item.lParam; - return notify_listview(infoPtr, code, &nmlv); + notify_listview(infoPtr, code, &nmlv); + return IsWindow(hwnd); } -static void notify_deleteitem(LISTVIEW_INFO *infoPtr, INT nItem) +static BOOL notify_deleteitem(LISTVIEW_INFO *infoPtr, INT nItem) { NMLISTVIEW nmlv; LVITEMW item; - + HWND hwnd = infoPtr->hwndSelf; + ZeroMemory(&nmlv, sizeof (NMLISTVIEW)); nmlv.iItem = nItem; item.mask = LVIF_PARAM; @@ -841,6 +846,7 @@ item.iSubItem = 0; if (LISTVIEW_GetItemT(infoPtr, &item, TRUE)) nmlv.lParam = item.lParam; notify_listview(infoPtr, LVN_DELETEITEM, &nmlv); + return IsWindow(hwnd); } static int get_ansi_notification(INT unicodeNotificationCode) @@ -3012,12 +3018,13 @@ * [I] nItem : item index * * RETURN: - * None + * Whether the window is still valid. */ -static void LISTVIEW_AddGroupSelection(LISTVIEW_INFO *infoPtr, INT nItem) +static BOOL LISTVIEW_AddGroupSelection(LISTVIEW_INFO *infoPtr, INT nItem) { INT nFirst = min(infoPtr->nSelectionMark, nItem); INT nLast = max(infoPtr->nSelectionMark, nItem); + HWND hwndSelf = infoPtr->hwndSelf; NMLVODSTATECHANGE nmlv; LVITEMW item; BOOL bOldChange; @@ -3046,7 +3053,10 @@ nmlv.uOldState = item.state; notify_hdr(infoPtr, LVN_ODSTATECHANGED, (LPNMHDR)&nmlv); + if (!IsWindow(hwndSelf)) + return FALSE; infoPtr->bDoChangeNotify = bOldChange; + return TRUE; } @@ -3277,7 +3287,9 @@ notify_listview(infoPtr, LVN_BEGINDRAG, &nmlv); return 0; - } + } + else + infoPtr->bLButtonDown = FALSE; /* see if we are supposed to be tracking mouse hovering */ if(infoPtr->dwLvExStyle & LVS_EX_TRACKSELECT) { @@ -3398,9 +3410,15 @@ /* send LVN_ITEMCHANGING notification, if the item is not being inserted */ /* and we are _NOT_ virtual (LVS_OWERNDATA), and change notifications */ /* are enabled */ - if(lpItem && !isNew && infoPtr->bDoChangeNotify && - notify_listview(infoPtr, LVN_ITEMCHANGING, &nmlv)) + if(lpItem && !isNew && infoPtr->bDoChangeNotify) + { + HWND hwndSelf = infoPtr->hwndSelf; + + if (notify_listview(infoPtr, LVN_ITEMCHANGING, &nmlv)) return FALSE; + if (!IsWindow(hwndSelf)) + return FALSE; + } /* copy information */ if (lpLVItem->mask & LVIF_TEXT) @@ -3544,6 +3562,7 @@ static BOOL LISTVIEW_SetItemT(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, BOOL isW) { UINT uView = infoPtr->dwStyle & LVS_TYPEMASK; + HWND hwndSelf = infoPtr->hwndSelf; LPWSTR pszText = NULL; BOOL bResult, bChanged = FALSE; @@ -3566,6 +3585,8 @@ bResult = set_sub_item(infoPtr, lpLVItem, TRUE, &bChanged); else bResult = set_main_item(infoPtr, lpLVItem, FALSE, TRUE, &bChanged); + if (!IsWindow(hwndSelf)) + return FALSE; /* redraw item, if necessary */ if (bChanged && !infoPtr->bIsDrawing) @@ -4514,7 +4535,7 @@ LISTVIEW_SetItemState(infoPtr, nItem, &item); /* send LVN_DELETEITEM notification. */ - notify_deleteitem(infoPtr, nItem); + if (!notify_deleteitem(infoPtr, nItem)) return FALSE; /* we need to do this here, because we'll be deleting stuff */ if (uView == LVS_SMALLICON || uView == LVS_ICON) @@ -4566,6 +4587,7 @@ */ static BOOL LISTVIEW_EndEditLabelT(LISTVIEW_INFO *infoPtr, LPWSTR pszText, BOOL isW) { + HWND hwndSelf = infoPtr->hwndSelf; NMLVDISPINFOW dispInfo; TRACE("(pszText=%s, isW=%d)\n", debugtext_t(pszText, isW), isW); @@ -4583,6 +4605,8 @@ /* Do we need to update the Item Text */ if (!notify_dispinfoT(infoPtr, LVN_ENDLABELEDITW, &dispInfo, isW)) return FALSE; + if (!IsWindow(hwndSelf)) + return FALSE; if (!pszText) return TRUE; if (!(infoPtr->dwStyle & LVS_OWNERDATA)) @@ -4623,6 +4647,7 @@ WCHAR szDispText[DISP_TEXT_SIZE] = { 0 }; NMLVDISPINFOW dispInfo; RECT rect; + HWND hwndSelf = infoPtr->hwndSelf; TRACE("(nItem=%d, isW=%d)\n", nItem, isW); @@ -4660,6 +4685,8 @@ if (notify_dispinfoT(infoPtr, LVN_BEGINLABELEDITW, &dispInfo, isW)) { + if (!IsWindow(hwndSelf)) + return 0; SendMessageW(infoPtr->hwndEdit, WM_CLOSE, 0, 0); infoPtr->hwndEdit = 0; return 0; @@ -6189,6 +6216,7 @@ ITEM_INFO *lpItem; BOOL is_sorted, has_changed; LVITEMW item; + HWND hwndSelf = infoPtr->hwndSelf; TRACE("(lpLVItem=%s, isW=%d)\n", debuglvitem_t(lpLVItem, isW), isW); @@ -6262,6 +6290,8 @@ nmlv.iItem = nItem; nmlv.lParam = lpItem->lParam; notify_listview(infoPtr, LVN_INSERTITEM, &nmlv); + if (!IsWindow(hwndSelf)) + return -1; /* align items (set position of each item) */ if ((uView == LVS_SMALLICON || uView == LVS_ICON)) @@ -7965,6 +7995,7 @@ static LRESULT LISTVIEW_KeyDown(LISTVIEW_INFO *infoPtr, INT nVirtualKey, LONG lKeyData) { UINT uView = infoPtr->dwStyle & LVS_TYPEMASK; + HWND hwndSelf = infoPtr->hwndSelf; INT nItem = -1; NMLVKEYDOWN nmKeyDown; @@ -7974,14 +8005,16 @@ nmKeyDown.wVKey = nVirtualKey; nmKeyDown.flags = 0; notify_hdr(infoPtr, LVN_KEYDOWN, &nmKeyDown.hdr); + if (!IsWindow(hwndSelf)) + return 0; switch (nVirtualKey) { case VK_RETURN: if ((infoPtr->nItemCount > 0) && (infoPtr->nFocusedItem != -1)) { - notify(infoPtr, NM_RETURN); - notify(infoPtr, LVN_ITEMACTIVATE); + if (!notify(infoPtr, NM_RETURN)) return 0; + if (!notify(infoPtr, LVN_ITEMACTIVATE)) return 0; } break; @@ -8013,7 +8046,13 @@ case VK_PRIOR: if (uView == LVS_REPORT) - nItem = infoPtr->nFocusedItem - LISTVIEW_GetCountPerColumn(infoPtr); + { + INT topidx = LISTVIEW_GetTopIndex(infoPtr); + if (infoPtr->nFocusedItem == topidx) + nItem = topidx - LISTVIEW_GetCountPerColumn(infoPtr) + 1; + else + nItem = topidx; + } else nItem = infoPtr->nFocusedItem - LISTVIEW_GetCountPerColumn(infoPtr) * LISTVIEW_GetCountPerRow(infoPtr); @@ -8022,7 +8061,14 @@ case VK_NEXT: if (uView == LVS_REPORT) - nItem = infoPtr->nFocusedItem + LISTVIEW_GetCountPerColumn(infoPtr); + { + INT topidx = LISTVIEW_GetTopIndex(infoPtr); + INT cnt = LISTVIEW_GetCountPerColumn(infoPtr); + if (infoPtr->nFocusedItem == topidx + cnt - 1) + nItem = infoPtr->nFocusedItem + cnt - 1; + else + nItem = topidx + cnt - 1; + } else nItem = infoPtr->nFocusedItem + LISTVIEW_GetCountPerColumn(infoPtr) * LISTVIEW_GetCountPerRow(infoPtr); @@ -8054,7 +8100,7 @@ if (!infoPtr->bFocus) return 0; /* send NM_KILLFOCUS notification */ - notify(infoPtr, NM_KILLFOCUS); + if (!notify(infoPtr, NM_KILLFOCUS)) return 0; /* if we have a focus rectagle, get rid of it */ LISTVIEW_ShowFocusRect(infoPtr, FALSE); @@ -8087,14 +8133,14 @@ TRACE("(key=%hu, X=%hu, Y=%hu)\n", wKey, x, y); /* send NM_RELEASEDCAPTURE notification */ - notify(infoPtr, NM_RELEASEDCAPTURE); + if (!notify(infoPtr, NM_RELEASEDCAPTURE)) return 0; htInfo.pt.x = x; htInfo.pt.y = y; /* send NM_DBLCLK notification */ LISTVIEW_HitTest(infoPtr, &htInfo, TRUE, FALSE); - notify_click(infoPtr, NM_DBLCLK, &htInfo); + if (!notify_click(infoPtr, NM_DBLCLK, &htInfo)) return 0; /* To send the LVN_ITEMACTIVATE, it must be on an Item */ if(htInfo.iItem != -1) notify_itemactivate(infoPtr,&htInfo); @@ -8124,7 +8170,7 @@ TRACE("(key=%hu, X=%hu, Y=%hu)\n", wKey, x, y); /* send NM_RELEASEDCAPTURE notification */ - notify(infoPtr, NM_RELEASEDCAPTURE); + if (!notify(infoPtr, NM_RELEASEDCAPTURE)) return 0; if (!infoPtr->bFocus) SetFocus(infoPtr->hwndSelf); @@ -8167,7 +8213,7 @@ { if (bGroupSelect) { - LISTVIEW_AddGroupSelection(infoPtr, nItem); + if (!LISTVIEW_AddGroupSelection(infoPtr, nItem)) return 0; LISTVIEW_SetItemFocus(infoPtr, nItem); infoPtr->nSelectionMark = nItem; } @@ -8242,7 +8288,7 @@ /* send NM_CLICK notification */ LISTVIEW_HitTest(infoPtr, &lvHitTestInfo, TRUE, FALSE); - notify_click(infoPtr, NM_CLICK, &lvHitTestInfo); + if (!notify_click(infoPtr, NM_CLICK, &lvHitTestInfo)) return 0; /* set left button flag */ infoPtr->bLButtonDown = FALSE; @@ -8317,6 +8363,7 @@ static LRESULT LISTVIEW_HeaderNotification(LISTVIEW_INFO *infoPtr, const NMHEADERW *lpnmh) { UINT uView = infoPtr->dwStyle & LVS_TYPEMASK; + HWND hwndSelf = infoPtr->hwndSelf; TRACE("(lpnmh=%p)\n", lpnmh); @@ -8330,6 +8377,8 @@ case HDN_ITEMCHANGEDW: case HDN_ITEMCHANGEDA: notify_forward_header(infoPtr, lpnmh); + if (!IsWindow(hwndSelf)) + break; /* Fall through */ case HDN_TRACKW: case HDN_TRACKA: @@ -8560,7 +8609,7 @@ TRACE("(key=%hu,X=%hu,Y=%hu)\n", wKey, x, y); /* send NM_RELEASEDCAPTURE notification */ - notify(infoPtr, NM_RELEASEDCAPTURE); + if (!notify(infoPtr, NM_RELEASEDCAPTURE)) return 0; /* send NM_RDBLCLK notification */ lvHitTestInfo.pt.x = x; @@ -8591,7 +8640,7 @@ TRACE("(key=%hu,X=%hu,Y=%hu)\n", wKey, x, y); /* send NM_RELEASEDCAPTURE notification */ - notify(infoPtr, NM_RELEASEDCAPTURE); + if (!notify(infoPtr, NM_RELEASEDCAPTURE)) return 0; /* make sure the listview control window has the focus */ if (!infoPtr->bFocus) SetFocus(infoPtr->hwndSelf); @@ -8647,7 +8696,7 @@ lvHitTestInfo.pt.x = x; lvHitTestInfo.pt.y = y; LISTVIEW_HitTest(infoPtr, &lvHitTestInfo, TRUE, FALSE); - notify_click(infoPtr, NM_RCLICK, &lvHitTestInfo); + if (!notify_click(infoPtr, NM_RCLICK, &lvHitTestInfo)) return 0; /* Change to screen coordinate for WM_CONTEXTMENU */ pt = lvHitTestInfo.pt; @@ -8710,7 +8759,7 @@ if (infoPtr->bFocus) return 0; /* send NM_SETFOCUS notification */ - notify(infoPtr, NM_SETFOCUS); + if (!notify(infoPtr, NM_SETFOCUS)) return 0; /* set window focus flag */ infoPtr->bFocus = TRUE; _____ Modified: vendor/wine/dlls/comctl32/current/rebar.c --- vendor/wine/dlls/comctl32/current/rebar.c 2005-10-27 14:18:09 UTC (rev 18786) +++ vendor/wine/dlls/comctl32/current/rebar.c 2005-10-27 14:17:43 UTC (rev 18787) @@ -1277,7 +1277,7 @@ static VOID REBAR_MoveChildWindows (REBAR_INFO *infoPtr, UINT start, UINT endplus) { - const static WCHAR strComboBox[] = { 'C','o','m','b','o','B','o','x',0 }; + static const WCHAR strComboBox[] = { 'C','o','m','b','o','B','o','x',0 }; REBAR_BAND *lpBand; WCHAR szClassName[40]; UINT i; _____ Modified: vendor/wine/dlls/comctl32/current/status.c --- vendor/wine/dlls/comctl32/current/status.c 2005-10-27 14:18:09 UTC (rev 18786) +++ vendor/wine/dlls/comctl32/current/status.c 2005-10-27 14:17:43 UTC (rev 18787) @@ -96,7 +96,7 @@ #define VERT_BORDER 2 #define HORZ_GAP 2 -const static WCHAR themeClass[] = { 'S','t','a','t','u','s',0 }; +static const WCHAR themeClass[] = { 'S','t','a','t','u','s',0 }; /* prototype */ static void _____ Modified: vendor/wine/dlls/comctl32/current/tab.c --- vendor/wine/dlls/comctl32/current/tab.c 2005-10-27 14:18:09 UTC (rev 18786) +++ vendor/wine/dlls/comctl32/current/tab.c 2005-10-27 14:17:43 UTC (rev 18787) @@ -1275,7 +1275,10 @@ infoPtr->uNumRows = curItemRowCount; /* Arrange all tabs evenly if style says so */ - if (!(lStyle & TCS_RAGGEDRIGHT) && ((lStyle & TCS_MULTILINE) || (lStyle & TCS_VERTICAL)) && (infoPtr->uNumItem > 0)) + if (!(lStyle & TCS_RAGGEDRIGHT) && + ((lStyle & TCS_MULTILINE) || (lStyle & TCS_VERTICAL)) && + (infoPtr->uNumItem > 0) && + (infoPtr->uNumRows > 1)) { INT tabPerRow,remTab,iRow; UINT iItm; @@ -2022,7 +2025,7 @@ if ((theme = GetWindowTheme (infoPtr->hwnd)) && ((lStyle & (TCS_VERTICAL | TCS_BOTTOM)) == 0)) { - const static int partIds[8] = { + static const int partIds[8] = { /* Normal item */ TABP_TABITEM, TABP_TABITEMLEFTEDGE, _____ Modified: vendor/wine/dlls/comctl32/current/theming.c --- vendor/wine/dlls/comctl32/current/theming.c 2005-10-27 14:18:09 UTC (rev 18786) +++ vendor/wine/dlls/comctl32/current/theming.c 2005-10-27 14:17:43 UTC (rev 18787) @@ -26,6 +26,7 @@ #include "wingdi.h" #include "winuser.h" #include "comctl32.h" +#include "uxtheme.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(theming); @@ -91,7 +92,7 @@ MAKE_SUBCLASS_PROC(3) MAKE_SUBCLASS_PROC(4) -const static WNDPROC subclassProcs[NUM_SUBCLASSES] = { +static const WNDPROC subclassProcs[NUM_SUBCLASSES] = { subclass_proc0, subclass_proc1, subclass_proc2, @@ -113,6 +114,8 @@ static const WCHAR refDataPropName[] = { 'C','C','3','2','T','h','e','m','i','n','g','D','a','t','a',0 }; + if (!IsThemeActive()) return; + atSubclassProp = GlobalAddAtomW (subclassPropName); atRefDataProp = GlobalAddAtomW (refDataPropName); @@ -154,6 +157,9 @@ void THEMING_Uninitialize (void) { int i; + + if (!atSubclassProp) return; /* not initialized */ + for (i = 0; i < NUM_SUBCLASSES; i++) { UnregisterClassW (subclasses[i].className, NULL); _____ Modified: vendor/wine/dlls/comctl32/current/toolbar.c --- vendor/wine/dlls/comctl32/current/toolbar.c 2005-10-27 14:18:09 UTC (rev 18786) +++ vendor/wine/dlls/comctl32/current/toolbar.c 2005-10-27 14:17:43 UTC (rev 18787) @@ -1854,7 +1854,7 @@ nRunIndex = nIndex - 1; while (nRunIndex >= 0) { btnPtr = &infoPtr->buttons[nRunIndex]; - if ((btnPtr->fsStyle & BTNS_CHECKGROUP) == BTNS_CHECKGROUP) { + if ((btnPtr->fsStyle & BTNS_GROUP) == BTNS_GROUP) { if (btnPtr->fsState & TBSTATE_CHECKED) return nRunIndex; } @@ -1867,7 +1867,7 @@ nRunIndex = nIndex + 1; while (nRunIndex < infoPtr->nNumButtons) { btnPtr = &infoPtr->buttons[nRunIndex]; - if ((btnPtr->fsStyle & BTNS_CHECKGROUP) == BTNS_CHECKGROUP) { + if ((btnPtr->fsStyle & BTNS_GROUP) == BTNS_GROUP) { if (btnPtr->fsState & TBSTATE_CHECKED) return nRunIndex; } _____ Modified: vendor/wine/dlls/commdlg/current/cdlg_Cs.rc --- vendor/wine/dlls/commdlg/current/cdlg_Cs.rc 2005-10-27 14:18:09 UTC (rev 18786) +++ vendor/wine/dlls/commdlg/current/cdlg_Cs.rc 2005-10-27 14:17:43 UTC (rev 18787) @@ -115,15 +115,35 @@ } -CHOOSE_FONT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134 +CHOOSE_FONT DIALOG LOADONCALL MOVEABLE DISCARDABLE 13, 54, 264, 147 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "PÝsmo" FONT 8, "MS Shell Dlg" { - LTEXT "PÝsmo:", 1088, 6, 6, 40, 9 - LTEXT "", 1089, 60, 6, 150, 9 - DEFPUSHBUTTON "Ok", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "Storno", 2, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP + LTEXT "PÝ&smo:", stc1 ,6,3,40,9 + COMBOBOX cmb1, 6,13,94,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | + CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE + LTEXT "St&yl:",stc2 ,108,3,44,9 + COMBOBOX cmb2,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | + WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE + LTEXT "&Velikost:",stc3,179,3,30,9 + COMBOBOX cmb3,179,13,32,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | + WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE | CBS_SORT + DEFPUSHBUTTON "OK",IDOK,218,6,40,14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "Storno",IDCANCEL,218,23,40,14,WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Pou×Ýt", psh3,218,40,40,14,WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Nßpovýda" , pshHelp,218,57,40,14,WS_GROUP | WS_TABSTOP + GROUPBOX "Efekty",grp1,6,72,84,34,WS_GROUP + CHECKBOX "P°eÜ&krtnutÝ", chx1, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "&Podtr×enÝ", chx2, 10,94,50,10, BS_AUTOCHECKBOX + LTEXT "&Barva:", stc4 ,6,110,30,9 + COMBOBOX cmb4,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | + CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP + GROUPBOX "Ukßzka",grp2,98,72,120,36,WS_GROUP + CTEXT "P°ÝliÜ ×luØouÞk² k¨? ·pýl ´ßbelskÚ k¾dy",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE + LTEXT "Skr&ipt:",stc7 ,98,114,40,9 + COMBOBOX cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | + CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP } _____ Modified: vendor/wine/dlls/commdlg/current/filedlg.c --- vendor/wine/dlls/commdlg/current/filedlg.c 2005-10-27 14:18:09 UTC (rev 18786) +++ vendor/wine/dlls/commdlg/current/filedlg.c 2005-10-27 14:17:43 UTC (rev 18787) @@ -2500,7 +2500,7 @@ */ static inline BOOL FILEDLG95_unixfs_is_rooted_at_desktop(void) { HKEY hKey; - const static WCHAR wszRootedAtDesktop[] = { 'S','o','f','t','w','a','r','e','\\', + static const WCHAR wszRootedAtDesktop[] = { 'S','o','f','t','w','a','r','e','\\', 'M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\ ', 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', 'E','x','p','l','o','r','e','r','\\','D','e','s','k','t','o','p','\\', _____ Modified: vendor/wine/dlls/commdlg/current/printdlg.c --- vendor/wine/dlls/commdlg/current/printdlg.c 2005-10-27 14:18:09 UTC (rev 18786) +++ vendor/wine/dlls/commdlg/current/printdlg.c 2005-10-27 14:17:43 UTC (rev 18787) @@ -1270,10 +1270,10 @@ static LRESULT PRINTDLG_WMInitDialogW(HWND hDlg, WPARAM wParam, PRINT_PTRW* PrintStructures) { - const static WCHAR PD32_COLLATE[] = { 'P', 'D', '3', '2', '_', 'C', 'O', 'L', 'L', 'A', 'T', 'E', 0 }; - const static WCHAR PD32_NOCOLLATE[] = { 'P', 'D', '3', '2', '_', 'N', 'O', 'C', 'O', 'L', 'L', 'A', 'T', 'E', 0 }; - const static WCHAR PD32_PORTRAIT[] = { 'P', 'D', '3', '2', '_', 'P', 'O', 'R', 'T', 'R', 'A', 'I', 'T', 0 }; - const static WCHAR PD32_LANDSCAPE[] = { 'P', 'D', '3', '2', '_', 'L', 'A', 'N', 'D', 'S', 'C', 'A', 'P', 'E', 0 }; + static const WCHAR PD32_COLLATE[] = { 'P', 'D', '3', '2', '_', 'C', 'O', 'L', 'L', 'A', 'T', 'E', 0 }; + static const WCHAR PD32_NOCOLLATE[] = { 'P', 'D', '3', '2', '_', 'N', 'O', 'C', 'O', 'L', 'L', 'A', 'T', 'E', 0 }; + static const WCHAR PD32_PORTRAIT[] = { 'P', 'D', '3', '2', '_', 'P', 'O', 'R', 'T', 'R', 'A', 'I', 'T', 0 }; + static const WCHAR PD32_LANDSCAPE[] = { 'P', 'D', '3', '2', '_', 'L', 'A', 'N', 'D', 'S', 'C', 'A', 'P', 'E', 0 }; LPPRINTDLGW lppd = PrintStructures->lpPrintDlg; DEVNAMES *pdn; DEVMODEW *pdm; @@ -2366,9 +2366,9 @@ } static void _c_size2strW(PageSetupDataW *pda,DWORD size,LPWSTR strout) { - const static WCHAR UNDEF[] = { '<', 'u', 'n', 'd', 'e', 'f', '>', 0 }; - const static WCHAR mm_fmt[] = { '%', '.', '2', 'f', 'm', 'm', 0 }; - const static WCHAR in_fmt[] = { '%', '.', '2', 'f', 'i', 'n', 0 }; + static const WCHAR UNDEF[] = { '<', 'u', 'n', 'd', 'e', 'f', '>', 0 }; + static const WCHAR mm_fmt[] = { '%', '.', '2', 'f', 'm', 'm', 0 }; + static const WCHAR in_fmt[] = { '%', '.', '2', 'f', 'i', 'n', 0 }; lstrcpyW(strout, UNDEF); if (pda->dlga->Flags & PSD_INHUNDREDTHSOFMILLIMETERS) { wsprintfW(strout,mm_fmt,(size*1.0)/100.0); @@ -3182,7 +3182,7 @@ static INT_PTR CALLBACK PageDlgProcW(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { - const static WCHAR __WINE_PAGESETUPDLGDATA[] = + static const WCHAR __WINE_PAGESETUPDLGDATA[] = { '_', '_', 'W', 'I', 'N', 'E', '_', 'P', 'A', 'G', 'E', 'S', 'E', 'T', 'U', 'P', 'D', 'L', 'G', 'D', 'A', 'T', 'A', 0 }; PageSetupDataW *pda; _____ Modified: vendor/wine/dlls/dsound/current/buffer.c --- vendor/wine/dlls/dsound/current/buffer.c 2005-10-27 14:18:09 UTC (rev 18786) +++ vendor/wine/dlls/dsound/current/buffer.c 2005-10-27 14:17:43 UTC (rev 18787) @@ -25,6 +25,7 @@ #define NONAMELESSUNION #include "windef.h" #include "winbase.h" +#include "winuser.h" #include "mmsystem.h" #include "winreg.h" #include "winternl.h" @@ -897,11 +898,11 @@ if ( IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirectSoundBuffer) || IsEqualGUID(riid, &IID_IDirectSoundBuffer8) ) { - if (!This->dsb) - SecondaryBufferImpl_Create(This, &(This->dsb)); - if (This->dsb) { - IDirectSoundBuffer8_AddRef((LPDIRECTSOUNDBUFFER8)This->dsb); - *ppobj = This->dsb; + if (!This->secondary) + SecondaryBufferImpl_Create(This, &(This->secondary)); + if (This->secondary) { + IDirectSoundBuffer8_AddRef((LPDIRECTSOUNDBUFFER8)This->secondary); + *ppobj = This->secondary; return S_OK; } WARN("IID_IDirectSoundBuffer\n"); @@ -1011,7 +1012,7 @@ TRACE("Created buffer at %p\n", dsb); dsb->ref = 0; - dsb->dsb = 0; + dsb->secondary = 0; dsb->dsound = ds; dsb->lpVtbl = &dsbvt; dsb->iks = NULL; @@ -1199,10 +1200,10 @@ pdsb->notify = NULL; } - if (pdsb->dsb) { + if (pdsb->secondary) { WARN("dsb not NULL\n"); - SecondaryBufferImpl_Destroy(pdsb->dsb); - pdsb->dsb = NULL; + SecondaryBufferImpl_Destroy(pdsb->secondary); + pdsb->secondary = NULL; } while (IDirectSoundBuffer8_Release((LPDIRECTSOUNDBUFFER8)pdsb) > 0); @@ -1225,7 +1226,7 @@ static ULONG WINAPI SecondaryBufferImpl_AddRef(LPDIRECTSOUNDBUFFER8 iface) { - IDirectSoundBufferImpl *This = (IDirectSoundBufferImpl *)iface; + SecondaryBufferImpl *This = (SecondaryBufferImpl *)iface; ULONG ref = InterlockedIncrement(&(This->ref)); TRACE("(%p) ref was %ld\n", This, ref - 1); return ref; @@ -1233,12 +1234,12 @@ static ULONG WINAPI SecondaryBufferImpl_Release(LPDIRECTSOUNDBUFFER8 iface) { - IDirectSoundBufferImpl *This = (IDirectSoundBufferImpl *)iface; + SecondaryBufferImpl *This = (SecondaryBufferImpl *)iface; ULONG ref = InterlockedDecrement(&(This->ref)); TRACE("(%p) ref was %ld\n", This, ref + 1); if (!ref) { - This->dsb->dsb = NULL; + This->dsb->secondary = NULL; IDirectSoundBuffer_Release((LPDIRECTSOUNDBUFFER8)This->dsb); HeapFree(GetProcessHeap(), 0, This); TRACE("(%p) released\n", This); _____ Modified: vendor/wine/dlls/dsound/current/capture.c --- vendor/wine/dlls/dsound/current/capture.c 2005-10-27 14:18:09 UTC (rev 18786) +++ vendor/wine/dlls/dsound/current/capture.c 2005-10-27 14:17:43 UTC (rev 18787) @@ -31,6 +31,7 @@ #define NONAMELESSUNION #include "windef.h" #include "winbase.h" +#include "winuser.h" #include "mmsystem.h" #include "mmddk.h" #include "winreg.h" _____ Modified: vendor/wine/dlls/dsound/current/dsound.c --- vendor/wine/dlls/dsound/current/dsound.c 2005-10-27 14:18:09 UTC (rev 18786) +++ vendor/wine/dlls/dsound/current/dsound.c 2005-10-27 14:17:43 UTC (rev 18787) @@ -27,6 +27,7 @@ #define NONAMELESSUNION #include "windef.h" #include "winbase.h" +#include "winuser.h" #include "winreg.h" #include "mmsystem.h" #include "winternl.h" @@ -45,6 +46,7 @@ static ULONG WINAPI IDirectSound8_IDirectSound8_AddRef(LPDIRECTSOUND8 iface); static HRESULT DirectSoundDevice_Create(DirectSoundDevice ** ppDevice); +static ULONG DirectSoundDevice_AddRef(DirectSoundDevice * device); static ULONG DirectSoundDevice_Release(DirectSoundDevice * device); static const char * dumpCooperativeLevel(DWORD level) @@ -246,9 +248,13 @@ TRACE("(%p) ref was %ld\n", This, ref + 1); if (!ref) { - if (This->device) - DirectSoundDevice_Release(This->device); - + if (This->device) { + if (DirectSoundDevice_Release(This->device) != 0) { + /* device not released so make sure primary reference to This removed */ + if (This->device->primary) + This->device->primary->dsound = NULL; + } + } HeapFree(GetProcessHeap(),0,This); TRACE("(%p) released\n", This); } @@ -324,6 +330,7 @@ WARN("Primary Buffer already created\n"); IDirectSoundBuffer_AddRef((LPDIRECTSOUNDBUFFER8)(This->device->primary)) ; *ppdsb = (LPDIRECTSOUNDBUFFER)(This->device->primary); + This->device->primary->dsound = This; } else { This->device->dsbd = *dsbd; hres = PrimaryBufferImpl_Create(This, (PrimaryBufferImpl**)&(This->device->primary), &(This->device->dsbd)); @@ -359,7 +366,7 @@ if (dsb) { hres = SecondaryBufferImpl_Create(dsb, (SecondaryBufferImpl**)ppdsb); if (*ppdsb) { - dsb->dsb = (SecondaryBufferImpl*)*ppdsb; + dsb->secondary = (SecondaryBufferImpl*)*ppdsb; IDirectSoundBuffer_AddRef((LPDIRECTSOUNDBUFFER)*ppdsb); } else WARN("SecondaryBufferImpl_Create failed\n"); @@ -528,7 +535,7 @@ dsb->dsound = This; dsb->ds3db = NULL; dsb->iks = NULL; /* FIXME? */ - dsb->dsb = NULL; + dsb->secondary = NULL; /* variable sized struct so calculate size based on format */ size = sizeof(WAVEFORMATEX) + pdsb->pwfx->cbSize; @@ -560,7 +567,7 @@ } else { hres = SecondaryBufferImpl_Create(dsb, (SecondaryBufferImpl**)ppdsb); if (*ppdsb) { - dsb->dsb = (SecondaryBufferImpl*)*ppdsb; + dsb->secondary = (SecondaryBufferImpl*)*ppdsb; IDirectSoundBuffer_AddRef((LPDIRECTSOUNDBUFFER8)*ppdsb); } else WARN("SecondaryBufferImpl_Create failed\n"); @@ -691,7 +698,7 @@ if (DSOUND_renderer[wod]) { if (IsEqualGUID(&devGUID, &DSOUND_renderer[wod]->guid)) { device = DSOUND_renderer[wod]; - device->ref++; + DirectSoundDevice_AddRef(device); This->device = device; return DS_OK; } else { @@ -940,14 +947,20 @@ return DS_OK; } +static ULONG DirectSoundDevice_AddRef(DirectSoundDevice * device) +{ + ULONG ref = InterlockedIncrement(&(device->ref)); + TRACE("(%p) ref was %ld\n", device, ref - 1); + return ref; +} + static ULONG DirectSoundDevice_Release(DirectSoundDevice * device) { - int i; HRESULT hr; - TRACE("(%p) ref was %lu\n", device, device->ref); - - device->ref--; - if (device->ref == 0) { + ULONG ref = InterlockedDecrement(&(device->ref)); + TRACE("(%p) ref was %lu\n", device, ref + 1); + if (!ref) { + int i; timeKillEvent(device->timerID); timeEndPeriod(DS_TIME_RES); /* wait for timer to expire */ @@ -994,7 +1007,7 @@ HeapFree(GetProcessHeap(),0,device); TRACE("(%p) released\n", device); } - return device->ref; + return ref; } HRESULT WINAPI IDirectSoundImpl_Create( _____ Modified: vendor/wine/dlls/dsound/current/dsound_main.c --- vendor/wine/dlls/dsound/current/dsound_main.c 2005-10-27 14:18:09 UTC (rev 18786) +++ vendor/wine/dlls/dsound/current/dsound_main.c 2005-10-27 14:17:43 UTC (rev 18787) @@ -43,6 +43,7 @@ #define NONAMELESSUNION #include "windef.h" #include "winbase.h" +#include "winuser.h" #include "winnls.h" #include "winreg.h" #include "mmsystem.h" _____ Modified: vendor/wine/dlls/dsound/current/dsound_private.h --- vendor/wine/dlls/dsound/current/dsound_private.h 2005-10-27 14:18:09 UTC (rev 18786) +++ vendor/wine/dlls/dsound/current/dsound_private.h 2005-10-27 14:17:43 UTC (rev 18787) @@ -199,7 +199,7 @@ const IDirectSoundBuffer8Vtbl *lpVtbl; LONG ref; /* IDirectSoundBufferImpl fields */ - SecondaryBufferImpl* dsb; + SecondaryBufferImpl* secondary; IDirectSoundImpl* dsound; CRITICAL_SECTION lock; PIDSDRIVERBUFFER hwbuf; _____ Modified: vendor/wine/dlls/dsound/current/duplex.c --- vendor/wine/dlls/dsound/current/duplex.c 2005-10-27 14:18:09 UTC (rev 18786) +++ vendor/wine/dlls/dsound/current/duplex.c 2005-10-27 14:17:43 UTC (rev 18787) @@ -30,6 +30,7 @@ #define NONAMELESSUNION #include "windef.h" #include "winbase.h" +#include "winuser.h" #include "mmsystem.h" #include "mmddk.h" #include "winreg.h" _____ Modified: vendor/wine/dlls/dsound/current/mixer.c --- vendor/wine/dlls/dsound/current/mixer.c 2005-10-27 14:18:09 UTC (rev 18786) +++ vendor/wine/dlls/dsound/current/mixer.c 2005-10-27 14:17:43 UTC (rev 18787) @@ -27,6 +27,7 @@ #define NONAMELESSUNION #include "windef.h" #include "winbase.h" +#include "winuser.h" #include "mmsystem.h" #include "winreg.h" #include "winternl.h" _____ Modified: vendor/wine/dlls/dsound/current/primary.c --- vendor/wine/dlls/dsound/current/primary.c 2005-10-27 14:18:09 UTC (rev 18786) +++ vendor/wine/dlls/dsound/current/primary.c 2005-10-27 14:17:43 UTC (rev 18787) @@ -25,6 +25,7 @@ #define NONAMELESSUNION #include "windef.h" #include "winbase.h" +#include "winuser.h" #include "mmsystem.h" #include "winreg.h" #include "winternl.h" _____ Modified: vendor/wine/dlls/dsound/current/propset.c --- vendor/wine/dlls/dsound/current/propset.c 2005-10-27 14:18:09 UTC (rev 18786) +++ vendor/wine/dlls/dsound/current/propset.c 2005-10-27 14:17:43 UTC (rev 18787) @@ -23,6 +23,7 @@ #include "windef.h" #include "winbase.h" +#include "winuser.h" #include "mmsystem.h" #include "winreg.h" #include "winternl.h" _____ Modified: vendor/wine/dlls/dsound/current/sound3d.c --- vendor/wine/dlls/dsound/current/sound3d.c 2005-10-27 14:18:09 UTC (rev 18786) +++ vendor/wine/dlls/dsound/current/sound3d.c 2005-10-27 14:17:43 UTC (rev 18787) @@ -44,6 +44,7 @@ #define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" +#include "winuser.h" #include "mmsystem.h" #include "winreg.h" #include "winternl.h" _____ Modified: vendor/wine/dlls/ole32/current/compobj.c --- vendor/wine/dlls/ole32/current/compobj.c 2005-10-27 14:18:09 UTC (rev 18786) +++ vendor/wine/dlls/ole32/current/compobj.c 2005-10-27 14:17:43 UTC (rev 18787) @@ -2622,6 +2622,12 @@ TRACE("received message whilst waiting for RPC: 0x%04x\n", msg.message); TranslateMessage(&msg); DispatchMessageW(&msg); + if (msg.message == WM_QUIT) + { + TRACE("resending WM_QUIT to outer message loop\n"); + PostQuitMessage(msg.wParam); + goto done; + } } } else if ((res >= WAIT_OBJECT_0) && (res < WAIT_OBJECT_0 + cHandles)) @@ -2642,6 +2648,7 @@ break; } } +done: TRACE("-- 0x%08lx\n", hr); return hr; } _____ Modified: vendor/wine/dlls/oleaut32/current/tmarshal.c --- vendor/wine/dlls/oleaut32/current/tmarshal.c 2005-10-27 14:18:09 UTC (rev 18786) +++ vendor/wine/dlls/oleaut32/current/tmarshal.c 2005-10-27 14:17:43 UTC (rev 18787) @@ -344,7 +344,9 @@ #include "poppack.h" #else /* __i386__ */ -# error You need to implement stubless proxies for your architecture +# warning You need to implement stubless proxies for your architecture +typedef struct _TMAsmProxy { +} TMAsmProxy; #endif typedef struct _TMProxyImpl { @@ -1939,6 +1941,7 @@ for (j=0;j<fdesc->cParams;j++) nrofargs += _argsize(fdesc->lprgelemdescParam[j].tdesc.vt); +#ifdef __i386__ if (fdesc->callconv != CC_STDCALL) { ERR("calling convention is not stdcall????\n"); return E_FAIL; @@ -1963,6 +1966,10 @@ xasm->bytestopop= (nrofargs+2)*4; /* pop args, This, iMethod */ proxy->lpvtbl[i] = xasm; break; +#else + FIXME("not implemented on non i386\n"); + return E_FAIL; +#endif } } } _____ Deleted: vendor/wine/dlls/oleaut32/current/tmarshal.h --- vendor/wine/dlls/oleaut32/current/tmarshal.h 2005-10-27 14:18:09 UTC (rev 18786) +++ vendor/wine/dlls/oleaut32/current/tmarshal.h 2005-10-27 14:17:43 UTC (rev 18787) @@ -1,24 +0,0 @@ -/* - * Copyright 2002 Marcus Meissner - * - * 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 - */ - -#ifndef TMARSHAL_H -#define TMARSHAL_H -HRESULT WINAPI -TypeLibFac_DllGetClassObject(REFCLSID rclsid, REFIID iid,LPVOID *ppv); - -#endif _____ Modified: vendor/wine/dlls/oleaut32/current/typelib.c --- vendor/wine/dlls/oleaut32/current/typelib.c 2005-10-27 14:18:09 UTC (rev 18786) +++ vendor/wine/dlls/oleaut32/current/typelib.c 2005-10-27 14:17:43 UTC (rev 18787) @@ -4338,7 +4338,8 @@ HREFTYPE *pRefType) { ITypeInfoImpl *This = (ITypeInfoImpl *)iface; - int(i); + int i; + HRESULT hr = S_OK; TLBImplType *pImpl = This->impltypelist; TRACE("(%p) index %d\n", This, index); @@ -4358,8 +4359,7 @@ } else { - if (!pImpl) return TYPE_E_ELEMENTNOTFOUND; - *pRefType = pImpl->hRef; + hr = TYPE_E_ELEMENTNOTFOUND; } } else @@ -4370,15 +4370,21 @@ pImpl = pImpl->next; } - if (!pImpl) return TYPE_E_ELEMENTNOTFOUND; + if (pImpl) + *pRefType = pImpl->hRef; + else + hr = TYPE_E_ELEMENTNOTFOUND; + } - *pRefType = pImpl->hRef; - - TRACE("-- 0x%08lx\n", pImpl->hRef ); + if(TRACE_ON(ole)) + { + if(SUCCEEDED(hr)) + TRACE("SUCCESS -- hRef = 0x%08lx\n", *pRefType ); + else + TRACE("FAILURE -- hresult = 0x%08lx\n", hr); } - return S_OK; - + return hr; } /* ITypeInfo::GetImplTypeFlags [truncated at 1000 lines; 1759 more skipped]

1 0

[fireball] 18786: Translation by Mikhail Zvyozdochkin, proofread by me.
by fireball＠svn.reactos.com 27 Oct '05

27 Oct '05

Translation by Mikhail Zvyozdochkin, proofread by me. Modified: trunk/reactos/lib/shlwapi/shlwapi.rc Added: trunk/reactos/lib/shlwapi/shlwapi_Ru.rc _____ Modified: trunk/reactos/lib/shlwapi/shlwapi.rc --- trunk/reactos/lib/shlwapi/shlwapi.rc 2005-10-27 14:10:58 UTC (rev 18785) +++ trunk/reactos/lib/shlwapi/shlwapi.rc 2005-10-27 14:18:09 UTC (rev 18786) @@ -34,4 +34,5 @@ #include "shlwapi_Ja.rc" #include "shlwapi_Pl.rc" #include "shlwapi_Pt.rc" +#include "shlwapi_Ru.rc" #include "shlwapi_Sv.rc" _____ Added: trunk/reactos/lib/shlwapi/shlwapi_Ru.rc --- trunk/reactos/lib/shlwapi/shlwapi_Ru.rc 2005-10-27 14:10:58 UTC (rev 18785) +++ trunk/reactos/lib/shlwapi/shlwapi_Ru.rc 2005-10-27 14:18:09 UTC (rev 18786) @@ -0,0 +1,35 @@ +/* + * Russian resources for shlwapi + * + * Copyright 2005 Mikhail Y. Zvyozdochkin + * + * 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 + */ + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +IDD_ERR_DIALOG DIALOG MOVEABLE DISCARDABLE 0, 0, 220, 60 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "?°ÞßÛÓ!" +FONT 8, "MS Shell Dlg" +{ + LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 + LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 + CHECKBOX "&?¯Ù³°Õ ÝÕ ´¯ÛÓþ¹ÔÓ?³ ²?¯ ±¯¯ß¨ÕÝÞÕ", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&OK" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&??ýÕÝÓ" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&?Ó" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&?Õ?" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP +} Property changes on: trunk/reactos/lib/shlwapi/shlwapi_Ru.rc ___________________________________________________________________ Name: svn:eol-style + native

1 0

[gvg] 18785: Update status
by gvg＠svn.reactos.com 27 Oct '05

27 Oct '05

Update status Modified: trunk/reactos/media/doc/README.WINE _____ Modified: trunk/reactos/media/doc/README.WINE --- trunk/reactos/media/doc/README.WINE 2005-10-27 14:10:06 UTC (rev 18784) +++ trunk/reactos/media/doc/README.WINE 2005-10-27 14:10:58 UTC (rev 18785) @@ -26,49 +26,49 @@ work to import a new dll. The following build tools are shared with Wine. -reactos/tools/unicode # Synced to Wine-20050830 -reactos/tools/wpp # Synced to Wine-20050830 +reactos/tools/unicode # Synced to Wine-20050930 +reactos/tools/wpp # Synced to Wine-20050930 reactos/tools/bin2res # Resource to binary converter -reactos/tools/winebuild # Synced to Wine-20050830 +reactos/tools/winebuild # Synced to Wine-20050930 reactos/tools/wmc # Wine Message Compiler -reactos/tools/wrc # Synced to Wine-20050830 +reactos/tools/wrc # Synced to Wine-20050930 reactos/tools/widl # Forked at Wine-20050628 The following libraries are shared with Wine. -reactos/lib/cabinet # Synced to Wine-20050830 -reactos/lib/comctl32 # Synced to Wine-20050830 -reactos/lib/comdlg32 # Synced to Wine-20050830 +reactos/lib/cabinet # Synced to Wine-20050930 +reactos/lib/comctl32 # Synced to Wine-20050930 +reactos/lib/comdlg32 # Synced to Wine-20050930 reactos/lib/dbghelp # -reactos/lib/dinput # Forked at Wine-20050310 -reactos/lib/dinput8 # Synced to Wine-20050830 -reactos/lib/icmp # Synced to Wine-20050830 +reactos/lib/dinput # Forked at Wine-20050930 +reactos/lib/dinput8 # Synced to Wine-20050930 +reactos/lib/icmp # Synced to Wine-20050930 reactos/lib/iphlpapi # Out of sync reactos/lib/imagehlp # Patches for BindImage need review and submission to winehq. reactos/lib/msvcrt20 # Out of sync -reactos/lib/mpr # Synced to Wine-20050830 +reactos/lib/mpr # Synced to Wine-20050930 reactos/lib/msacm # Out of sync -reactos/lib/msimg32 # Synced to Wine-20050830 -reactos/lib/msi # Synced to Wine-20050830 +reactos/lib/msimg32 # Synced to Wine-20050930 +reactos/lib/msi # Synced to Wine-20050930 reactos/lib/msvideo # Out of sync reactos/lib/netapi32 # Out of sync -reactos/lib/objsel # Synced to Wine-20050830 +reactos/lib/objsel # Synced to Wine-20050930 reactos/lib/odbc32 # In sync. Depends on port of Linux ODBC. reactos/lib/ole32 # Synced to Wine-20050830 -reactos/lib/oleaut32 # Synced to Wine-20050830 -reactos/lib/oledlg # Synced to Wine-20050830 -reactos/lib/olepro32 # Synced to Wine-20050830 -reactos/lib/riched20 # Synced to Wine-20050830 -reactos/lib/richedit # Synced to Wine-20050830 -reactos/lib/rpcrt4 # Synced to Wine-20050830 +reactos/lib/oleaut32 # Synced to Wine-20050930 +reactos/lib/oledlg # Synced to Wine-20050930 +reactos/lib/olepro32 # Synced to Wine-20050930 +reactos/lib/riched20 # Synced to Wine-20050930 +reactos/lib/richedit # Synced to Wine-20050930 +reactos/lib/rpcrt4 # Synced to Wine-20050930 reactos/lib/setupapi # Forked at Wine-20050524 -reactos/lib/shell32 # Synced to Wine-20050830 -reactos/lib/shdocvw # Synced to Wine-20050830 -reactos/lib/shfolder # Synced to Wine-20050830 -reactos/lib/shlwapi # Synced to Wine-20050830 +reactos/lib/shell32 # Synced to Wine-20050930 +reactos/lib/shdocvw # Synced to Wine-20050930 +reactos/lib/shfolder # Synced to Wine-20050930 +reactos/lib/shlwapi # Synced to Wine-20050930 reactos/lib/twain # Out of sync -reactos/lib/urlmon # Synced to Wine-20050830 -reactos/lib/uxtheme # Synced to Wine-20050830 +reactos/lib/urlmon # Synced to Wine-20050930 +reactos/lib/uxtheme # Synced to Wine-20050930 reactos/lib/version # Out of sync reactos/lib/wininet # Out of sync reactos/lib/winmm # Forked at Wine-20050628 @@ -78,7 +78,7 @@ ReactOS shares the following programs with Winehq. reactos/subsys/system/regedit # Out of sync reactos/subsys/system/expand # Out of sync -reactos/subsys/system/msiexec # Synced to Wine-20050830 +reactos/subsys/system/msiexec # Synced to Wine-20050930 In addition the following libs, dlls and source files are mostly based on code ported from Winehq CVS. If you are looking to update something in these files

1 0

[gvg] 18784: Finish Wine-20050930 sync
by gvg＠svn.reactos.com 27 Oct '05

27 Oct '05

Finish Wine-20050930 sync Deleted: vendor/wine/dlls/cabinet/Wine-20050830/ Added: vendor/wine/dlls/cabinet/Wine-20050930/ Deleted: vendor/wine/dlls/comctl32/Wine-20050830/ Added: vendor/wine/dlls/comctl32/Wine-20050930/ Deleted: vendor/wine/dlls/commdlg/Wine-20050830/ Added: vendor/wine/dlls/commdlg/Wine-20050930/ Added: vendor/wine/dlls/dinput/Wine-20050930/ Deleted: vendor/wine/dlls/dinput8/Wine-20050830/ Added: vendor/wine/dlls/dinput8/Wine-20050930/ Deleted: vendor/wine/dlls/dsound/Wine-20050830/ Added: vendor/wine/dlls/dsound/Wine-20050930/ Deleted: vendor/wine/dlls/icmp/Wine-20050830/ Added: vendor/wine/dlls/icmp/Wine-20050930/ Deleted: vendor/wine/dlls/midimap/Wine-20050830/ Added: vendor/wine/dlls/midimap/Wine-20050930/ Deleted: vendor/wine/dlls/mpr/Wine-20050830/ Added: vendor/wine/dlls/mpr/Wine-20050930/ Deleted: vendor/wine/dlls/msi/Wine-20050830/ Added: vendor/wine/dlls/msi/Wine-20050930/ Deleted: vendor/wine/dlls/msimg32/Wine-20050830/ Added: vendor/wine/dlls/msimg32/Wine-20050930/ Deleted: vendor/wine/dlls/objsel/Wine-20050830/ Added: vendor/wine/dlls/objsel/Wine-20050930/ Added: vendor/wine/dlls/ole32/Wine-20050930/ Deleted: vendor/wine/dlls/oleaut32/Wine-20050830/ Added: vendor/wine/dlls/oleaut32/Wine-20050930/ Deleted: vendor/wine/dlls/oledlg/Wine-20050830/ Added: vendor/wine/dlls/oledlg/Wine-20050930/ Deleted: vendor/wine/dlls/olepro32/Wine-20050830/ Added: vendor/wine/dlls/olepro32/Wine-20050930/ Deleted: vendor/wine/dlls/riched20/Wine-20050830/ Added: vendor/wine/dlls/riched20/Wine-20050930/ Deleted: vendor/wine/dlls/richedit/Wine-20050830/ Added: vendor/wine/dlls/richedit/Wine-20050930/ Deleted: vendor/wine/dlls/rpcrt4/Wine-20050830/ Added: vendor/wine/dlls/rpcrt4/Wine-20050930/ Deleted: vendor/wine/dlls/shdocvw/Wine-20050830/ Added: vendor/wine/dlls/shdocvw/Wine-20050930/ Deleted: vendor/wine/dlls/shell32/Wine-20050830/ Added: vendor/wine/dlls/shell32/Wine-20050930/ Added: vendor/wine/dlls/shfolder/Wine-20050930/ Deleted: vendor/wine/dlls/shlwapi/Wine-20050830/ Added: vendor/wine/dlls/shlwapi/Wine-20050930/ Deleted: vendor/wine/dlls/urlmon/Wine-20050830/ Added: vendor/wine/dlls/urlmon/Wine-20050930/ Deleted: vendor/wine/dlls/uxtheme/Wine-20050830/ Added: vendor/wine/dlls/uxtheme/Wine-20050930/ Deleted: vendor/wine/libs/unicode/Wine-20050830/ Added: vendor/wine/libs/unicode/Wine-20050930/ Deleted: vendor/wine/libs/wpp/Wine-20050830/ Added: vendor/wine/libs/wpp/Wine-20050930/ Deleted: vendor/wine/programs/msiexec/Wine-20050830/ Added: vendor/wine/programs/msiexec/Wine-20050930/ Deleted: vendor/wine/tools/winebuild/Wine-20050830/ Added: vendor/wine/tools/winebuild/Wine-20050930/ Deleted: vendor/wine/tools/wrc/Wine-20050830/ Added: vendor/wine/tools/wrc/Wine-20050930/ _____ Copied: vendor/wine/dlls/cabinet/Wine-20050930 (from rev 18783, vendor/wine/dlls/cabinet/current) _____ Copied: vendor/wine/dlls/comctl32/Wine-20050930 (from rev 18783, vendor/wine/dlls/comctl32/current) _____ Copied: vendor/wine/dlls/commdlg/Wine-20050930 (from rev 18783, vendor/wine/dlls/commdlg/current) _____ Copied: vendor/wine/dlls/dinput/Wine-20050930 (from rev 18783, vendor/wine/dlls/dinput/current) _____ Copied: vendor/wine/dlls/dinput8/Wine-20050930 (from rev 18783, vendor/wine/dlls/dinput8/current) _____ Copied: vendor/wine/dlls/dsound/Wine-20050930 (from rev 18783, vendor/wine/dlls/dsound/current) _____ Copied: vendor/wine/dlls/icmp/Wine-20050930 (from rev 18783, vendor/wine/dlls/icmp/current) _____ Copied: vendor/wine/dlls/midimap/Wine-20050930 (from rev 18783, vendor/wine/dlls/midimap/current) _____ Copied: vendor/wine/dlls/mpr/Wine-20050930 (from rev 18783, vendor/wine/dlls/mpr/current) _____ Copied: vendor/wine/dlls/msi/Wine-20050930 (from rev 18783, vendor/wine/dlls/msi/current) _____ Copied: vendor/wine/dlls/msimg32/Wine-20050930 (from rev 18783, vendor/wine/dlls/msimg32/current) _____ Copied: vendor/wine/dlls/objsel/Wine-20050930 (from rev 18783, vendor/wine/dlls/objsel/current) _____ Copied: vendor/wine/dlls/ole32/Wine-20050930 (from rev 18783, vendor/wine/dlls/ole32/current) _____ Copied: vendor/wine/dlls/oleaut32/Wine-20050930 (from rev 18783, vendor/wine/dlls/oleaut32/current) _____ Copied: vendor/wine/dlls/oledlg/Wine-20050930 (from rev 18783, vendor/wine/dlls/oledlg/current) _____ Copied: vendor/wine/dlls/olepro32/Wine-20050930 (from rev 18783, vendor/wine/dlls/olepro32/current) _____ Copied: vendor/wine/dlls/riched20/Wine-20050930 (from rev 18783, vendor/wine/dlls/riched20/current) _____ Copied: vendor/wine/dlls/richedit/Wine-20050930 (from rev 18783, vendor/wine/dlls/richedit/current) _____ Copied: vendor/wine/dlls/rpcrt4/Wine-20050930 (from rev 18783, vendor/wine/dlls/rpcrt4/current) _____ Copied: vendor/wine/dlls/shdocvw/Wine-20050930 (from rev 18783, vendor/wine/dlls/shdocvw/current) _____ Copied: vendor/wine/dlls/shell32/Wine-20050930 (from rev 18783, vendor/wine/dlls/shell32/current) _____ Copied: vendor/wine/dlls/shfolder/Wine-20050930 (from rev 18783, vendor/wine/dlls/shfolder/current) _____ Copied: vendor/wine/dlls/shlwapi/Wine-20050930 (from rev 18783, vendor/wine/dlls/shlwapi/current) _____ Copied: vendor/wine/dlls/urlmon/Wine-20050930 (from rev 18783, vendor/wine/dlls/urlmon/current) _____ Copied: vendor/wine/dlls/uxtheme/Wine-20050930 (from rev 18783, vendor/wine/dlls/uxtheme/current) _____ Copied: vendor/wine/libs/unicode/Wine-20050930 (from rev 18783, vendor/wine/libs/unicode/current) _____ Copied: vendor/wine/libs/wpp/Wine-20050930 (from rev 18783, vendor/wine/libs/wpp/current) _____ Copied: vendor/wine/programs/msiexec/Wine-20050930 (from rev 18783, vendor/wine/programs/msiexec/current) _____ Copied: vendor/wine/tools/winebuild/Wine-20050930 (from rev 18783, vendor/wine/tools/winebuild/current) _____ Copied: vendor/wine/tools/wrc/Wine-20050930 (from rev 18783, vendor/wine/tools/wrc/current)

1 0

[fireball] 18783: Translation by Mikhail Zvyozdochkin, proofread and fixed in some places by me.
by fireball＠svn.reactos.com 27 Oct '05

27 Oct '05

Translation by Mikhail Zvyozdochkin, proofread and fixed in some places by me. Added: trunk/reactos/lib/shellext/slayer/Ru.rc Modified: trunk/reactos/lib/shellext/slayer/slayer.rc _____ Added: trunk/reactos/lib/shellext/slayer/Ru.rc --- trunk/reactos/lib/shellext/slayer/Ru.rc 2005-10-26 23:26:44 UTC (rev 18782) +++ trunk/reactos/lib/shellext/slayer/Ru.rc 2005-10-27 13:38:56 UTC (rev 18783) @@ -0,0 +1,45 @@ +/* + * Russian resources for Slayer + * + * Copyright 2005 Mikhail Y. Zvyozdochkin + * + */ + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +IDD_SLAYERSHEET DIALOGEX 0, 0, 224, 226 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Ð¯ÔýÕ±?Þý¯±?³" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "¤Þ Ô¯þÝÞÛÝ¯ÔÕÝÞÞ ´¯ßÙÕý Ô¹ßÕÞ?Õ, ÛÓÛ¾? ¯´ÕÓ÷Þ¯ÝÝ¾? ±Þ±?Õý¾ õ¯ÙµÝÓ ÞýÞ?Þ¯ÔÓ?³ ReactOS õÙ ²?¯Ú ´¯ÒÓýý¹", -1, 7,7,210,31 + GROUPBOX "ðÕµÞý ±¯ÔýÕ±?Þý¯±?Þ", IDC_COMPATGROUP, 7,41,210,49 + CHECKBOX "ÃÓ´¾±ÛÓ?³ Ô ÕµÞýÕ ±¯ÔýÕ±?Þý¯±?Þ õÙ :", IDC_CHKRUNCOMPATIBILITY, 18,57,188,10, BS_AUTOCHECKBOX | WS_TABSTOP + COMBOBOX IDC_COMPATIBILITYMODE, 18,70,188,85, CBS_HASSTRINGS | CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED + GROUPBOX "?Ó±?¯ÚÛÞ ²ÛÓÝÓ", -1, 7,99,210,61, BS_GROUPBOX | WS_DISABLED + CHECKBOX "256 ÷ÔÕ?¯Ô", IDC_CHKRUNIN256COLORS, 18,114,188,10, BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED + CHECKBOX "ðÓþÕ°ÕÝÞÕ 640x480", IDC_CHKRUNIN640480RES, 18,129,188,10, BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED + CHECKBOX "ÃÓ´Õ¨Ó?³ ÔÞþ¾ÓÙ³Ý¹Õ ?Õý¹", IDC_CHKDISABLEVISUALTHEMES, 18,144,188,10, BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED + PUSHBUTTON "&ðÕµÞý¹ ±¯ÔýÕ±?Þý¯±?Þ...", IDC_EDITCOMPATIBILITYMODES, 117,167,100,15 + /* CONTROL "Learn more about <A>program compatibility</A>.", IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP | WS_VISIBLE, 7,207,210,10, WS_EX_NOPARENTNOTIFY */ +END + +IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 230, 139 +STYLE DS_SETFONT | DS_FIXEDSYS | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "¤ÓÔÛÓ ÕµÞý¯Ô ±¯ÔýÕ±?Þý¯±?Þ" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LISTBOX IDC_COMPATIBILITYMODE, 9,6,148,108, LBS_NOTIFY | LBS_WANTKEYBOARDINPUT | WS_BORDER + PUSHBUTTON "&?¯ßÓÔÞ?³...", IDC_ADD, 162,6,60,14, WS_DISABLED + PUSHBUTTON "&?þýÕÝÞ?³...", IDC_EDIT, 162,24,60,14, WS_DISABLED + PUSHBUTTON "&ËõÓÙÞ?³", IDC_DELETE, 162,42,60,14, WS_DISABLED + PUSHBUTTON "&OK", IDOK, 95,116,60,14 + PUSHBUTTON "&??ýÕÝÓ", IDCANCEL, 162,116,60,14 +END + +STRINGTABLE +BEGIN + IDS_SLAYER "Slayer" + IDS_DESCRIPTION "Application Compatibility Layer Shell Extension" +END + Property changes on: trunk/reactos/lib/shellext/slayer/Ru.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/shellext/slayer/slayer.rc --- trunk/reactos/lib/shellext/slayer/slayer.rc 2005-10-26 23:26:44 UTC (rev 18782) +++ trunk/reactos/lib/shellext/slayer/slayer.rc 2005-10-27 13:38:56 UTC (rev 18783) @@ -19,6 +19,7 @@ #include "De.rc" #include "Nl.rc" #include "Pl.rc" +#include "Ru.rc" #include "Sv.rc"

1 0

[gvg] 18782: Change Tcpip and Afd drivers from auto-start to system-start, since we don't
by gvg＠svn.reactos.com 26 Oct '05

26 Oct '05

Change Tcpip and Afd drivers from auto-start to system-start, since we don't auto-start device drivers yet Modified: trunk/reactos/bootdata/hivesys.inf _____ Modified: trunk/reactos/bootdata/hivesys.inf --- trunk/reactos/bootdata/hivesys.inf 2005-10-26 23:19:37 UTC (rev 18781) +++ trunk/reactos/bootdata/hivesys.inf 2005-10-26 23:26:44 UTC (rev 18782) @@ -365,7 +365,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Afd","ErrorControl",0x00010001,0 x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\Afd","Group",0x00000000,"TDI" HKLM,"SYSTEM\CurrentControlSet\Services\Afd","ImagePath",0x00020000,"sys tem32\drivers\afd.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\Afd","Start",0x00010001,0x00000 002 +HKLM,"SYSTEM\CurrentControlSet\Services\Afd","Start",0x00010001,0x00000 001 HKLM,"SYSTEM\CurrentControlSet\Services\Afd","Type",0x00010001,0x0000000 1 ; Atapi miniport driver @@ -615,7 +615,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip","ErrorControl",0x00010001 ,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip","Group",0x00000000,"PNP_T DI" HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip","ImagePath",0x00020000,"s ystem32\drivers\tcpip.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip","Start",0x00010001,0x000 00002 +HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip","Start",0x00010001,0x000 00001 HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip","Type",0x00010001,0x00000 001 ; NOTE: These settings should be added by the network setup ; These bindings are of the windows 2000 type, and will probably need to be

1 0

[gvg] 18781: Fix lurking bug exposed by r18687
by gvg＠svn.reactos.com 26 Oct '05

26 Oct '05

Fix lurking bug exposed by r18687 Modified: trunk/reactos/services/dhcp/options.c _____ Modified: trunk/reactos/services/dhcp/options.c --- trunk/reactos/services/dhcp/options.c 2005-10-26 20:42:19 UTC (rev 18780) +++ trunk/reactos/services/dhcp/options.c 2005-10-26 23:19:37 UTC (rev 18781) @@ -595,6 +595,7 @@ foo.s_addr = htonl(getULong(dp)); strncpy(op, inet_ntoa(foo), opleft - 1); op[opleft - 1] = ANSI_NULL; + opcount = strlen(op); if (opcount >= opleft) goto toobig; opleft -= opcount;

1 0

[hpoussin] 18780: Allow very long path names for .inf files by using a dynamic buffer
by hpoussin＠svn.reactos.com 26 Oct '05

26 Oct '05

Allow very long path names for .inf files by using a dynamic buffer Check return code of GetFullPathNameW Modified: trunk/reactos/lib/setupapi/devinst.c _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-10-26 20:14:15 UTC (rev 18779) +++ trunk/reactos/lib/setupapi/devinst.c 2005-10-26 20:42:19 UTC (rev 18780) @@ -4204,6 +4204,7 @@ WCHAR ManufacturerSection[LINE_LEN + 1]; LPWSTR HardwareIDs = NULL; LPWSTR CompatibleIDs = NULL; + LPWSTR FullInfFileName = NULL; FILETIME DriverDate; DWORDLONG DriverVersion = 0; DWORD RequiredSize; @@ -4325,18 +4326,31 @@ if (Result) { LPCWSTR filename; - WCHAR FullInfFileName[MAX_PATH]; LPWSTR pFullFilename; if (*InstallParams.DriverPath) { - GetFullPathNameW(InstallParams.DriverPath, MAX_PATH, FullInfFileName, &pFullFilename); + DWORD len; + len = GetFullPathNameW(InstallParams.DriverPath, 0, NULL, NULL); + if (len == 0) + goto done; + FullInfFileName = HeapAlloc(GetProcessHeap(), 0, len + MAX_PATH); + if (!FullInfFileName) + goto done; + len = GetFullPathNameW(InstallParams.DriverPath, len, FullInfFileName, NULL); + if (len == 0) + goto done; if (*FullInfFileName && FullInfFileName[wcslen(FullInfFileName) - 1] != '\\') wcscat(FullInfFileName, L"\\"); pFullFilename = &FullInfFileName[wcslen(FullInfFileName)]; } else + { + FullInfFileName = HeapAlloc(GetProcessHeap(), 0, MAX_PATH); + if (!FullInfFileName) + goto done; pFullFilename = &FullInfFileName[0]; + } for (filename = (LPCWSTR)Buffer; *filename; filename += wcslen(filename) + 1) { @@ -4565,6 +4579,7 @@ HeapFree(GetProcessHeap(), 0, ManufacturerName); HeapFree(GetProcessHeap(), 0, HardwareIDs); HeapFree(GetProcessHeap(), 0, CompatibleIDs); + HeapFree(GetProcessHeap(), 0, FullInfFileName); if (currentInfFileDetails) DereferenceInfFile(currentInfFileDetails); HeapFree(GetProcessHeap(), 0, Buffer);

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
74
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2005