Ros-diffs January 2009

ros-diffs@reactos.org

30 participants
755 discussions

[dreimer] 38842: Sync Apps to wine HEAD (1 of 2)
by dreimer＠svn.reactos.org 17 Jan '09

17 Jan '09

Author: dreimer Date: Sat Jan 17 13:59:22 2009 New Revision: 38842 URL: http://svn.reactos.org/svn/reactos?rev=38842&view=rev Log: Sync Apps to wine HEAD (1 of 2) Modified: trunk/rosapps/applications/winfile/winefile.c Modified: trunk/rosapps/applications/winfile/winefile.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/winef… ============================================================================== --- trunk/rosapps/applications/winfile/winefile.c [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/winefile.c [iso-8859-1] Sat Jan 17 13:59:22 2009 @@ -3781,8 +3781,15 @@ scan_entry(child, &child->root.entry, 0, child->hwnd); #ifdef _SHELL_FOLDERS + if (child->root.entry.etype == ET_SHELL) - entry = read_tree(&child->root, NULL, get_path_pidl(path,child->hwnd), drv, child->sortOrder, child->hwnd); + { + LPITEMIDLIST local_pidl = get_path_pidl(path,child->hwnd); + if (local_pidl) + entry = read_tree(&child->root, NULL, local_pidl , drv, child->sortOrder, child->hwnd); + else + entry = NULL; + } else #endif entry = read_tree(&child->root, path, NULL, drv, child->sortOrder, child->hwnd);

1 0

[cwittich] 38841: sync mapi32 with wine 1.1.13
by cwittich＠svn.reactos.org 17 Jan '09

17 Jan '09

Author: cwittich Date: Sat Jan 17 13:59:02 2009 New Revision: 38841 URL: http://svn.reactos.org/svn/reactos?rev=38841&view=rev Log: sync mapi32 with wine 1.1.13 Modified: trunk/reactos/dll/win32/mapi32/imalloc.c trunk/reactos/dll/win32/mapi32/mapi32_main.c trunk/reactos/dll/win32/mapi32/sendmail.c Modified: trunk/reactos/dll/win32/mapi32/imalloc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/imalloc.c… ============================================================================== --- trunk/reactos/dll/win32/mapi32/imalloc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/imalloc.c [iso-8859-1] Sat Jan 17 13:59:02 2009 @@ -78,7 +78,7 @@ if (IsEqualIID(refiid, &IID_IUnknown) || IsEqualIID(refiid, &IID_IMalloc)) { - *ppvObj = (LPMALLOC) &MAPI_IMalloc; + *ppvObj = &MAPI_IMalloc; TRACE("Returning IMalloc (%p)\n", *ppvObj); return S_OK; } Modified: trunk/reactos/dll/win32/mapi32/mapi32_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/mapi32_ma… ============================================================================== --- trunk/reactos/dll/win32/mapi32/mapi32_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/mapi32_main.c [iso-8859-1] Sat Jan 17 13:59:02 2009 @@ -89,7 +89,7 @@ ULONG WINAPI MAPILogon(ULONG_PTR uiparam, LPSTR profile, LPSTR password, FLAGS flags, ULONG reserved, LPLHANDLE session) { - FIXME("(0x%08lx %s %p 0x%08lx 0x%08x %p) Stub\n", uiparam, + FIXME("(0x%08lx %s %p 0x%08x 0x%08x %p) Stub\n", uiparam, debugstr_a(profile), password, flags, reserved, session); if (session) *session = 1; @@ -99,7 +99,7 @@ ULONG WINAPI MAPILogoff(LHANDLE session, ULONG_PTR uiparam, FLAGS flags, ULONG reserved ) { - FIXME("(0x%08lx 0x%08lx 0x%08lx 0x%08x) Stub\n", session, + FIXME("(0x%08lx 0x%08lx 0x%08x 0x%08x) Stub\n", session, uiparam, flags, reserved); return SUCCESS_SUCCESS; } Modified: trunk/reactos/dll/win32/mapi32/sendmail.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/sendmail.… ============================================================================== --- trunk/reactos/dll/win32/mapi32/sendmail.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/sendmail.c [iso-8859-1] Sat Jan 17 13:59:02 2009 @@ -71,7 +71,7 @@ HRESULT res; DWORD size; - TRACE( "(0x%08lx 0x%08lx %p 0x%08lx 0x%08x)\n", session, uiparam, + TRACE( "(0x%08x 0x%08lx %p 0x%08x 0x%08x)\n", session, uiparam, message, flags, reserved ); if (!message) return MAPI_E_FAILURE;

1 0

[cfinck] 38840: Convert all line-endings to LF first in StringOut before passing the strings to printf and OutputDebugStringA. Both functions treat the string as text and convert the line-endings themselves to CRLF. If you already give them a CRLF line-ending, it'll be converted to CRCRLF.. By unifying the line-endings in StringOut, it is also possible now to pass both LF and CRLF to the function. This should fix the empty lines in the BuildBot log. Thanks to Christoph for the help!
by cfinck＠svn.reactos.org 17 Jan '09

17 Jan '09

Author: cfinck Date: Sat Jan 17 13:58:18 2009 New Revision: 38840 URL: http://svn.reactos.org/svn/reactos?rev=38840&view=rev Log: Convert all line-endings to LF first in StringOut before passing the strings to printf and OutputDebugStringA. Both functions treat the string as text and convert the line-endings themselves to CRLF. If you already give them a CRLF line-ending, it'll be converted to CRCRLF.. By unifying the line-endings in StringOut, it is also possible now to pass both LF and CRLF to the function. This should fix the empty lines in the BuildBot log. Thanks to Christoph for the help! Modified: trunk/rostests/rosautotest/tools.c Modified: trunk/rostests/rosautotest/tools.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/tools.c?rev=3… ============================================================================== --- trunk/rostests/rosautotest/tools.c [iso-8859-1] (original) +++ trunk/rostests/rosautotest/tools.c [iso-8859-1] Sat Jan 17 13:58:18 2009 @@ -38,13 +38,15 @@ *Output++ = HexCharacters[((UCHAR)*Input >> 4) % 16]; *Output++ = HexCharacters[(UCHAR)*Input % 16]; } - } while(*++Input); + } + while(*++Input); *Output = 0; } /** * Outputs a string through the standard output and the debug output. + * The string may have LF or CRLF line endings. * * @param String * The string to output @@ -52,6 +54,41 @@ VOID StringOut(PCHAR String) { - printf(String); - OutputDebugStringA(String); + PCHAR NewString; + PCHAR pNewString; + size_t Length; + + /* The piped output of the tests may use CRLF line endings, so convert them to LF. + As both printf and OutputDebugStringA operate in text mode, the line-endings will be properly converted again later. */ + Length = strlen(String); + NewString = HeapAlloc(hProcessHeap, 0, Length + 1); + pNewString = NewString; + + do + { + /* If this is a CRLF line-ending, only copy a \n to the new string and skip the next character */ + if(*String == '\r' && *(String + 1) == '\n') + { + *pNewString = '\n'; + ++String; + } + else + { + /* Otherwise copy the string */ + *pNewString = *String; + } + + ++pNewString; + } + while(*++String); + + /* Null-terminate it */ + *pNewString = 0; + + /* Output it */ + printf(NewString); + OutputDebugStringA(NewString); + + /* Cleanup */ + HeapFree(hProcessHeap, 0, NewString); }

1 0

[cwittich] 38839: sync fusion with wine 1.1.13
by cwittich＠svn.reactos.org 17 Jan '09

17 Jan '09

Author: cwittich Date: Sat Jan 17 13:56:32 2009 New Revision: 38839 URL: http://svn.reactos.org/svn/reactos?rev=38839&view=rev Log: sync fusion with wine 1.1.13 Modified: trunk/reactos/dll/win32/fusion/asmname.c trunk/reactos/dll/win32/fusion/assembly.c Modified: trunk/reactos/dll/win32/fusion/asmname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/asmname.c… ============================================================================== --- trunk/reactos/dll/win32/fusion/asmname.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fusion/asmname.c [iso-8859-1] Sat Jan 17 13:56:32 2009 @@ -150,7 +150,7 @@ *pcbProperty = 0; if (name->name) { - lstrcpyW((LPWSTR)pvProperty, name->name); + lstrcpyW(pvProperty, name->name); *pcbProperty = (lstrlenW(name->name) + 1) * 2; } break; @@ -187,7 +187,7 @@ *pcbProperty = 0; if (name->culture) { - lstrcpyW((LPWSTR)pvProperty, name->culture); + lstrcpyW(pvProperty, name->culture); *pcbProperty = (lstrlenW(name->culture) + 1) * 2; } break; Modified: trunk/reactos/dll/win32/fusion/assembly.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/assembly.… ============================================================================== --- trunk/reactos/dll/win32/fusion/assembly.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fusion/assembly.c [iso-8859-1] Sat Jan 17 13:56:32 2009 @@ -153,7 +153,7 @@ static VOID *assembly_data_offset(ASSEMBLY *assembly, ULONG offset) { - return (VOID *)&assembly->data[offset]; + return &assembly->data[offset]; } #define MAX_TABLES_WORD 0xFFFF

1 0

[cwittich] 38838: sync wrc to wine 1.1.3 (except lang2cp struct as too many strange languages were added in wine)
by cwittich＠svn.reactos.org 17 Jan '09

17 Jan '09

Author: cwittich Date: Sat Jan 17 13:46:42 2009 New Revision: 38838 URL: http://svn.reactos.org/svn/reactos?rev=38838&view=rev Log: sync wrc to wine 1.1.3 (except lang2cp struct as too many strange languages were added in wine) Modified: trunk/reactos/tools/wrc/lex.yy.c trunk/reactos/tools/wrc/newstruc.c trunk/reactos/tools/wrc/parser.l trunk/reactos/tools/wrc/utils.c trunk/reactos/tools/wrc/wrc.c Modified: trunk/reactos/tools/wrc/lex.yy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/lex.yy.c?rev=388… ============================================================================== --- trunk/reactos/tools/wrc/lex.yy.c [iso-8859-1] (original) +++ trunk/reactos/tools/wrc/lex.yy.c [iso-8859-1] Sat Jan 17 13:46:42 2009 @@ -902,7 +902,7 @@ errno = 0; l = strtoul(nptr, endptr, base); if (l == ULONG_MAX && errno == ERANGE) - parser_error("integer constant %s is too large\n", nptr); + parser_error("integer constant %s is too large", nptr); return l; } Modified: trunk/reactos/tools/wrc/newstruc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/newstruc.c?rev=3… ============================================================================== --- trunk/reactos/tools/wrc/newstruc.c [iso-8859-1] (original) +++ trunk/reactos/tools/wrc/newstruc.c [iso-8859-1] Sat Jan 17 13:46:42 2009 @@ -84,21 +84,21 @@ version_t *new_version(DWORD v) { - version_t *vp = (version_t *)xmalloc(sizeof(version_t)); + version_t *vp = xmalloc(sizeof(version_t)); *vp = v; return vp; } characts_t *new_characts(DWORD c) { - characts_t *cp = (characts_t *)xmalloc(sizeof(characts_t)); + characts_t *cp = xmalloc(sizeof(characts_t)); *cp = c; return cp; } language_t *new_language(int id, int sub) { - language_t *lan = (language_t *)xmalloc(sizeof(language_t)); + language_t *lan = xmalloc(sizeof(language_t)); lan->id = id; lan->sub = sub; return lan; @@ -138,7 +138,7 @@ rcdata_t *new_rcdata(raw_data_t *rd, int *memopt) { - rcdata_t *rc = (rcdata_t *)xmalloc(sizeof(rcdata_t)); + rcdata_t *rc = xmalloc(sizeof(rcdata_t)); rc->data = rd; if(memopt) { @@ -152,7 +152,7 @@ font_id_t *new_font_id(int size, string_t *face, int weight, int italic) { - font_id_t *fid = (font_id_t *)xmalloc(sizeof(font_id_t)); + font_id_t *fid = xmalloc(sizeof(font_id_t)); fid->name = face; fid->size = size; fid->weight = weight; @@ -162,7 +162,7 @@ user_t *new_user(name_id_t *type, raw_data_t *rd, int *memopt) { - user_t *usr = (user_t *)xmalloc(sizeof(user_t)); + user_t *usr = xmalloc(sizeof(user_t)); usr->data = rd; if(memopt) { @@ -177,7 +177,7 @@ font_t *new_font(raw_data_t *rd, int *memopt) { - font_t *fnt = (font_t *)xmalloc(sizeof(font_t)); + font_t *fnt = xmalloc(sizeof(font_t)); fnt->data = rd; if(memopt) { @@ -191,7 +191,7 @@ fontdir_t *new_fontdir(raw_data_t *rd, int *memopt) { - fontdir_t *fnd = (fontdir_t *)xmalloc(sizeof(fontdir_t)); + fontdir_t *fnd = xmalloc(sizeof(fontdir_t)); fnd->data = rd; if(memopt) { @@ -325,7 +325,7 @@ type |= FL_SIZEBE | FL_OS2; } else - parser_error("Invalid bitmap format, bih->biSize = %d\n", bih->biSize); + parser_error("Invalid bitmap format, bih->biSize = %d", bih->biSize); switch(type) { @@ -409,7 +409,7 @@ if(!*list) { - *list = (id_alloc_t *)xmalloc(sizeof(id_alloc_t)); + *list = xmalloc(sizeof(id_alloc_t)); *n = 1; (*list)[0].lan = *lan; (*list)[0].id = 1; @@ -422,7 +422,7 @@ return ++((*list)[i].id); } - *list = (id_alloc_t *)xrealloc(*list, sizeof(id_alloc_t) * (*n+1)); + *list = xrealloc(*list, sizeof(id_alloc_t) * (*n+1)); (*list)[*n].lan = *lan; (*list)[*n].id = 1; *n += 1; @@ -459,7 +459,7 @@ else if(BYTESWAP_WORD(ih->type) == 1) swap = 1; else - parser_error("Icon resource data has invalid type id %d\n", ih->type); + parser_error("Icon resource data has invalid type id %d", ih->type); cnt = swap ? BYTESWAP_WORD(ih->count) : ih->count; for(i = 0; i < cnt; i++) @@ -479,7 +479,7 @@ } if(ide.offset > rd->size || ide.offset + ide.ressize > rd->size) - parser_error("Icon resource data corrupt\n"); + parser_error("Icon resource data corrupt"); ico->width = ide.width; ico->height = ide.height; ico->nclr = ide.nclr; @@ -554,7 +554,7 @@ else if(BYTESWAP_WORD(ch->type) == 2) swap = 1; else - parser_error("Cursor resource data has invalid type id %d\n", ch->type); + parser_error("Cursor resource data has invalid type id %d", ch->type); cnt = swap ? BYTESWAP_WORD(ch->count) : ch->count; for(i = 0; i < cnt; i++) { @@ -573,7 +573,7 @@ } if(cde.offset > rd->size || cde.offset + cde.ressize > rd->size) - parser_error("Cursor resource data corrupt\n"); + parser_error("Cursor resource data corrupt"); cur->width = cde.width; cur->height = cde.height; cur->nclr = cde.nclr; @@ -619,7 +619,7 @@ icon_group_t *new_icon_group(raw_data_t *rd, int *memopt) { - icon_group_t *icog = (icon_group_t *)xmalloc(sizeof(icon_group_t)); + icon_group_t *icog = xmalloc(sizeof(icon_group_t)); if(memopt) { icog->memopt = *memopt; @@ -636,7 +636,7 @@ cursor_group_t *new_cursor_group(raw_data_t *rd, int *memopt) { - cursor_group_t *curg = (cursor_group_t *)xmalloc(sizeof(cursor_group_t)); + cursor_group_t *curg = xmalloc(sizeof(cursor_group_t)); if(memopt) { curg->memopt = *memopt; @@ -743,21 +743,21 @@ if(type == res_anicur && ctype != 2 && !once) { - parser_warning("Animated cursor contains invalid \"icon\" tag cursor-file (%d->%s)", + parser_warning("Animated cursor contains invalid \"icon\" tag cursor-file (%d->%s)\n", ctype, ctype == 1 ? "icontype" : "?"); once++; } else if(type == res_aniico && ctype != 1 && !once) { - parser_warning("Animated icon contains invalid \"icon\" tag icon-file (%d->%s)", + parser_warning("Animated icon contains invalid \"icon\" tag icon-file (%d->%s)\n", ctype, ctype == 2 ? "cursortype" : "?"); once++; } else if(ctype != 1 && ctype != 2 && !once) { - parser_warning("Animated %s contains invalid \"icon\" tag file-type (%d; neither icon nor cursor)", anistr, ctype); + parser_warning("Animated %s contains invalid \"icon\" tag file-type (%d; neither icon nor cursor)\n", anistr, ctype); once++; } @@ -809,7 +809,7 @@ rtp = NEXT_TAG(rtp); } else - internal_error(__FILE__, __LINE__, "Unknown tag \"%c%c%c%c\" in RIFF file", + internal_error(__FILE__, __LINE__, "Unknown tag \"%c%c%c%c\" in RIFF file\n", isprint(rtp->tag[0]) ? rtp->tag[0] : '.', isprint(rtp->tag[1]) ? rtp->tag[1] : '.', isprint(rtp->tag[2]) ? rtp->tag[2] : '.', @@ -822,7 +822,7 @@ ani_curico_t *new_ani_curico(enum res_e type, raw_data_t *rd, int *memopt) { - ani_curico_t *ani = (ani_curico_t *)xmalloc(sizeof(ani_curico_t)); + ani_curico_t *ani = xmalloc(sizeof(ani_curico_t)); riff_tag_t *rtp; int isswapped = 0; int doswap; @@ -838,7 +838,7 @@ else if(rtp->size + 2*sizeof(DWORD) == rd->size) isswapped = 0; else - parser_error("Animated %s has an invalid RIFF length\n", anistr); + parser_error("Animated %s has an invalid RIFF length", anistr); switch(byteorder) { @@ -919,7 +919,7 @@ rtp = NEXT_TAG(rtp); } else - internal_error(__FILE__, __LINE__, "Unknown tag \"%c%c%c%c\" in RIFF file", + internal_error(__FILE__, __LINE__, "Unknown tag \"%c%c%c%c\" in RIFF file\n", isprint(rtp->tag[0]) ? rtp->tag[0] : '.', isprint(rtp->tag[1]) ? rtp->tag[1] : '.', isprint(rtp->tag[2]) ? rtp->tag[2] : '.', @@ -949,7 +949,7 @@ /* Bitmaps */ bitmap_t *new_bitmap(raw_data_t *rd, int *memopt) { - bitmap_t *bmp = (bitmap_t *)xmalloc(sizeof(bitmap_t)); + bitmap_t *bmp = xmalloc(sizeof(bitmap_t)); bmp->data = rd; if(memopt) @@ -965,8 +965,8 @@ ver_words_t *new_ver_words(int i) { - ver_words_t *w = (ver_words_t *)xmalloc(sizeof(ver_words_t)); - w->words = (WORD *)xmalloc(sizeof(WORD)); + ver_words_t *w = xmalloc(sizeof(ver_words_t)); + w->words = xmalloc(sizeof(WORD)); w->words[0] = (WORD)i; w->nwords = 1; return w; @@ -974,7 +974,7 @@ ver_words_t *add_ver_words(ver_words_t *w, int i) { - w->words = (WORD *)xrealloc(w->words, (w->nwords+1) * sizeof(WORD)); + w->words = xrealloc(w->words, (w->nwords+1) * sizeof(WORD)); w->words[w->nwords] = (WORD)i; w->nwords++; return w; @@ -983,7 +983,7 @@ #define MSGTAB_BAD_PTR(p, b, l, r) (((l) - ((char *)(p) - (char *)(b))) > (r)) messagetable_t *new_messagetable(raw_data_t *rd, int *memopt) { - messagetable_t *msg = (messagetable_t *)xmalloc(sizeof(messagetable_t)); + messagetable_t *msg = xmalloc(sizeof(messagetable_t)); msgtab_block_t *mbp; DWORD nblk; DWORD i; @@ -1000,7 +1000,7 @@ msg->memopt = WRC_MO_MOVEABLE | WRC_MO_PURE; if(rd->size < sizeof(DWORD)) - parser_error("Invalid messagetable, size too small\n"); + parser_error("Invalid messagetable, size too small"); nblk = *(DWORD *)rd->data; lo = WRC_LOWORD(nblk); @@ -1017,7 +1017,7 @@ if(hi && lo) internal_error(__FILE__, __LINE__, "Messagetable contains more than 65535 blocks; cannot determine endian\n"); if(!hi && !lo) - parser_error("Invalid messagetable block count 0\n"); + parser_error("Invalid messagetable block count 0"); if(!hi && lo) /* Messagetable byteorder == native byteorder */ { @@ -1030,7 +1030,7 @@ mbp = (msgtab_block_t *)&(((DWORD *)rd->data)[1]); if(MSGTAB_BAD_PTR(mbp, rd->data, rd->size, nblk * sizeof(*mbp))) - parser_error("Messagetable's blocks are outside of defined data\n"); + parser_error("Messagetable's blocks are outside of defined data"); for(i = 0; i < nblk; i++) { msgtab_entry_t *mep, *next_mep; @@ -1041,7 +1041,7 @@ for(id = mbp[i].idlo; id <= mbp[i].idhi; id++) { if(MSGTAB_BAD_PTR(mep, rd->data, rd->size, mep->length)) - parser_error("Messagetable's data for block %d, ID 0x%08x is outside of defined data\n", i, id); + parser_error("Messagetable's data for block %d, ID 0x%08x is outside of defined data", i, id); if(mep->flags == 1) /* Docu says 'flags == 0x0001' for unicode */ { WORD *wp = (WORD *)&mep[1]; @@ -1049,7 +1049,7 @@ int n; if(mep->length & 1) - parser_error("Message 0x%08x is unicode (block %d), but has odd length (%d)\n", id, i, mep->length); + parser_error("Message 0x%08x is unicode (block %d), but has odd length (%d)", id, i, mep->length); for(n = 0; n < l; n++) wp[n] = BYTESWAP_WORD(wp[n]); @@ -1077,7 +1077,7 @@ mbp = (msgtab_block_t *)&(((DWORD *)rd->data)[1]); nblk = BYTESWAP_DWORD(nblk); if(MSGTAB_BAD_PTR(mbp, rd->data, rd->size, nblk * sizeof(*mbp))) - parser_error("Messagetable's blocks are outside of defined data\n"); + parser_error("Messagetable's blocks are outside of defined data"); for(i = 0; i < nblk; i++) { msgtab_entry_t *mep; @@ -1094,7 +1094,7 @@ mep->flags = BYTESWAP_WORD(mep->flags); if(MSGTAB_BAD_PTR(mep, rd->data, rd->size, mep->length)) - parser_error("Messagetable's data for block %d, ID 0x%08x is outside of defined data\n", i, id); + parser_error("Messagetable's data for block %d, ID 0x%08x is outside of defined data", i, id); if(mep->flags == 1) /* Docu says 'flags == 0x0001' for unicode */ { WORD *wp = (WORD *)&mep[1]; @@ -1102,7 +1102,7 @@ int n; if(mep->length & 1) - parser_error("Message 0x%08x is unicode (block %d), but has odd length (%d)\n", id, i, mep->length); + parser_error("Message 0x%08x is unicode (block %d), but has odd length (%d)", id, i, mep->length); for(n = 0; n < l; n++) wp[n] = BYTESWAP_WORD(wp[n]); @@ -1123,11 +1123,11 @@ assert(offs + len <= src->size); if(!dst->data) { - dst->data = (char *)xmalloc(len); + dst->data = xmalloc(len); dst->size = 0; } else - dst->data = (char *)xrealloc(dst->data, dst->size + len); + dst->data = xrealloc(dst->data, dst->size + len); /* dst->size holds the offset to copy to */ memcpy(dst->data + dst->size, src->data + offs, len); dst->size += len; @@ -1135,14 +1135,14 @@ int *new_int(int i) { - int *ip = (int *)xmalloc(sizeof(int)); + int *ip = xmalloc(sizeof(int)); *ip = i; return ip; } stringtable_t *new_stringtable(lvc_t *lvc) { - stringtable_t *stt = (stringtable_t *)xmalloc(sizeof(stringtable_t)); + stringtable_t *stt = xmalloc(sizeof(stringtable_t)); memset( stt, 0, sizeof(*stt) ); if(lvc) @@ -1153,7 +1153,7 @@ 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)); + toolbar_t *tb = xmalloc(sizeof(toolbar_t)); memset( tb, 0, sizeof(*tb) ); tb->button_width = button_width; tb->button_height = button_height; @@ -1164,7 +1164,7 @@ dlginit_t *new_dlginit(raw_data_t *rd, int *memopt) { - dlginit_t *di = (dlginit_t *)xmalloc(sizeof(dlginit_t)); + dlginit_t *di = xmalloc(sizeof(dlginit_t)); di->data = rd; if(memopt) { @@ -1179,7 +1179,7 @@ style_pair_t *new_style_pair(style_t *style, style_t *exstyle) { - style_pair_t *sp = (style_pair_t *)xmalloc(sizeof(style_pair_t)); + style_pair_t *sp = xmalloc(sizeof(style_pair_t)); sp->style = style; sp->exstyle = exstyle; return sp; @@ -1187,7 +1187,7 @@ style_t *new_style(DWORD or_mask, DWORD and_mask) { - style_t *st = (style_t *)xmalloc(sizeof(style_t)); + style_t *st = xmalloc(sizeof(style_t)); st->or_mask = or_mask; st->and_mask = and_mask; return st; Modified: trunk/reactos/tools/wrc/parser.l URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/parser.l?rev=388… ============================================================================== --- trunk/reactos/tools/wrc/parser.l [iso-8859-1] (original) +++ trunk/reactos/tools/wrc/parser.l [iso-8859-1] Sat Jan 17 13:46:42 2009 @@ -306,7 +306,7 @@ errno = 0; l = strtoul(nptr, endptr, base); if (l == ULONG_MAX && errno == ERANGE) - parser_error("integer constant %s is too large\n", nptr); + parser_error("integer constant %s is too large", nptr); return l; } Modified: trunk/reactos/tools/wrc/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/utils.c?rev=3883… ============================================================================== --- trunk/reactos/tools/wrc/utils.c [iso-8859-1] (original) +++ trunk/reactos/tools/wrc/utils.c [iso-8859-1] Sat Jan 17 13:46:42 2009 @@ -144,7 +144,7 @@ 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)) { @@ -186,7 +186,7 @@ char *s; assert(str != NULL); - s = (char *)xmalloc(strlen(str)+1); + s = xmalloc(strlen(str)+1); return strcpy(s, str); } Modified: trunk/reactos/tools/wrc/wrc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/wrc.c?rev=38838&… ============================================================================== --- trunk/reactos/tools/wrc/wrc.c [iso-8859-1] (original) +++ trunk/reactos/tools/wrc/wrc.c [iso-8859-1] Sat Jan 17 13:46:42 2009 @@ -266,7 +266,7 @@ cmdlen = 4; /* for "wrc " */ for(i = 1; i < argc; i++) cmdlen += strlen(argv[i]) + 1; - cmdline = (char *)xmalloc(cmdlen); + cmdline = xmalloc(cmdlen); strcpy(cmdline, "wrc "); for(i = 1; i < argc; i++) {

1 0

[cwittich] 38837: -Dmitry Timoshkov <dmitry at codeweavers.com> wrc: Warn for duplicate dialog ids.
by cwittich＠svn.reactos.org 17 Jan '09

17 Jan '09

Author: cwittich Date: Sat Jan 17 13:27:13 2009 New Revision: 38837 URL: http://svn.reactos.org/svn/reactos?rev=38837&view=rev Log: -Dmitry Timoshkov <dmitry at codeweavers.com> wrc: Warn for duplicate dialog ids. Modified: trunk/reactos/tools/wrc/parser.tab.c trunk/reactos/tools/wrc/parser.y Modified: trunk/reactos/tools/wrc/parser.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/parser.tab.c?rev… ============================================================================== --- trunk/reactos/tools/wrc/parser.tab.c [iso-8859-1] (original) +++ trunk/reactos/tools/wrc/parser.tab.c [iso-8859-1] Sat Jan 17 13:27:13 2009 @@ -4656,6 +4656,14 @@ if(prev) prev->next = ctrl; + /* Check for duplicate identifiers */ + while (prev) + { + if (ctrl->id != -1 && ctrl->id == prev->id) + parser_warning("Duplicate dialog control id %d\n", ctrl->id); + prev = prev->prev; + } + if(type != -1) { ctrl->ctlclass = new_name_id(); @@ -5773,3 +5781,4 @@ return token; } + Modified: trunk/reactos/tools/wrc/parser.y URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/parser.y?rev=388… ============================================================================== --- trunk/reactos/tools/wrc/parser.y [iso-8859-1] (original) +++ trunk/reactos/tools/wrc/parser.y [iso-8859-1] Sat Jan 17 13:27:13 2009 @@ -1966,6 +1966,14 @@ if(prev) prev->next = ctrl; + /* Check for duplicate identifiers */ + while (prev) + { + if (ctrl->id != -1 && ctrl->id == prev->id) + parser_warning("Duplicate dialog control id %d\n", ctrl->id); + prev = prev->prev; + } + if(type != -1) { ctrl->ctlclass = new_name_id();

1 0

[cwittich] 38836: forgot to commit this file
by cwittich＠svn.reactos.org 17 Jan '09

17 Jan '09

Author: cwittich Date: Sat Jan 17 13:18:06 2009 New Revision: 38836 URL: http://svn.reactos.org/svn/reactos?rev=38836&view=rev Log: forgot to commit this file Added: trunk/reactos/dll/win32/cryptui/cryptui_Ko.rc (with props) Added: trunk/reactos/dll/win32/cryptui/cryptui_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptui_… ============================================================================== --- trunk/reactos/dll/win32/cryptui/cryptui_Ko.rc (added) +++ trunk/reactos/dll/win32/cryptui/cryptui_Ko.rc [iso-8859-1] Sat Jan 17 13:18:06 2009 @@ -1,0 +1,332 @@ +/* + * cryptui dll Korean resources + + * Copyright 2008 Juan Lang + * Copyright 2008 YunSong Hwang + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + + +LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_CERTIFICATE "ÀÎÁõ¼" + IDS_CERTIFICATEINFORMATION "ÀÎÁõ¼ Á¤º¸" + IDS_CERT_INFO_BAD_SIG "ÀÌ ÀÎÁõ¼´Â ¿Ã¹Ù¸£Áö ¾ÊÀº ¼¸íÀ» °¡Áö°í ÀÖ½À´Ï´Ù. ÀÌ ÀÎÁõ¼´Â ¾Æ¸¶µµ °íÃÄÁ³°Å³ª ¸Á°¡Áø °Í°°½À´Ï°¡" + IDS_CERT_INFO_UNTRUSTED_CA "ÀÌ ·çÆ® ÀÎÁõ¼´Â ½Å·Ú ÇÒ ¼ö ¾ø½À´Ï´Ù. ÀÌ°ÍÀ» ½Å·ÚÇÏ·Á¸é,´ç½ÅÀÇ ½Ã½ºÅÛÀÇ ½Å·ÚµÈ ·çÆ® ÀÎÁõ¼ º¸°ü¼Ò¿¡ Ãß°¡ÇÏ½Ê½Ã¿À." + IDS_CERT_INFO_UNTRUSTED_ROOT "ÀÌ ÀÎÁõ¼´Â ½Å·ÚµÈ ·çÆ® ÀÎÁõ¼·Î Çã°¡µÉ ¼ö ¾ø½À´Ï´Ù." + IDS_CERT_INFO_PARTIAL_CHAIN "ÀÌ ÀÎÁõ¼ÀÇ ¹ßÇàÀÚ¸¦ Ã£À» ¼ö ¾ø½À´Ï´Ù." + IDS_CERT_INFO_BAD_PURPOSES "ÀÌ ÀÎÁõ¼ÀÇ ¸ðµç °èÈ¹µÈ ¸ñÀûÀº °ËÁõµÉ ¼ö ¾ø½À´Ï´Ù." + IDS_CERT_INFO_PURPOSES "ÀÌ ÀÎÁõ¼´Â ´ÙÀ½ÀÇ ¸ñÀûÀ¸·Î °èÈ¹µÇ¾îÀÖ½À´Ï´Ù:" + IDS_SUBJECT_HEADING "¹ßÇà´ë»ó: " + IDS_ISSUER_HEADING "¹ßÇàÀÚ: " + IDS_VALID_FROM "À¯È¿±â°£(½ÃÀÛ) " + IDS_VALID_TO "À¯È¿±â°£(³¡) " + IDS_CERTIFICATE_BAD_SIGNATURE "ÀÌ ÀÎÁõ¼´Â ¿Ã¹Ù¸£Áö ¾ÊÀº ¼¸íÀ» °¡Áö°í ÀÖ½À´Ï´Ù." + IDS_CERTIFICATE_BAD_TIME "ÀÌ ÀÎÁõ¼´Â ¸¸·áµÇ¾ú°Å³ª ¾ÆÁ÷ À¯È¿ÇÏÁö ¾Ê½À´Ï´Ù." + IDS_CERTIFICATE_BAD_TIMENEST "ÀÌ ÀÎÁõ¼´Â ¹ßÇàÀÚ°¡ Á¤ÇÑ À¯È¿½Ã°£À» ÃÊ°úÇß½À´Ï´Ù" + IDS_CERTIFICATE_REVOKED "ÀÌ ÀÎÁõ¼´Â ¹ßÇàÀÚ¿¡ ÀÇÇÏ¿© Ãë¼ÒµÇ¾ú½À´Ï´Ù." + IDS_CERTIFICATE_VALID "ÀÌ ÀÎÁõ¼´Â ¿Ã¹Ù¸¨´Ï´Ù.." + IDS_FIELD "ÇÊµå" + IDS_VALUE "°ª" + IDS_FIELDS_ALL "<¸ðµÎ>" + IDS_FIELDS_V1 "¿ÀÁ÷ ¹öÁ¯ 1 ÇÊµå¸¸" + IDS_FIELDS_EXTENSIONS "¿ÀÁ÷ È®Àå¸¸" + IDS_FIELDS_CRITICAL_EXTENSIONS "¿ÀÁ÷ Áß¿äÇÑ È®Àå¸¸" + IDS_FIELDS_PROPERTIES "¿ÀÁ÷ ¼Ó¼º¸¸" + IDS_FIELD_VERSION "¹öÁ¯" + IDS_FIELD_SERIAL_NUMBER "½Ã¸®¾ó ¹øÈ£" + IDS_FIELD_ISSUER "¹ßÇàÀÚ" + IDS_FIELD_VALID_FROM "À¯È¿±â°£(½ÃÀÛ)" + IDS_FIELD_VALID_TO "À¯È¿±â°£(³¡)" + IDS_FIELD_SUBJECT "Á¦¸ñ" + IDS_FIELD_PUBLIC_KEY "°ø¿ë Å°" + IDS_FIELD_PUBLIC_KEY_FORMAT "%s (%d ºñÆ®)" + IDS_PROP_HASH "SHA1 ÇØ½¬" + IDS_PROP_ENHKEY_USAGE "È®Àå Å° »ç¿ë (¼Ó¼º)" + IDS_PROP_FRIENDLY_NAME "¾ÖÄª" + IDS_PROP_DESCRIPTION "¼³¸í" + IDS_CERTIFICATE_PROPERTIES "ÀÎÁõ¼ ¼Ó¼º" + IDS_CERTIFICATE_PURPOSE_ERROR "Æû 1,2,3,4¿¡ ÇÏ³ªÀÇ OID¸¦ ÀÔ·ÂÇÏ½Ê½Ã¿À" + IDS_CERTIFICATE_PURPOSE_EXISTS "´ç½ÅÀÌ ÀÔ·ÂÇÑ OID´Â ÀÌ¹Ì Á¸ÀçÇÕ´Ï´Ù." + IDS_SELECT_STORE_TITLE "ÀÎÁõ¼ ÀúÀå¼Ò ¼±ÅÃ" + IDS_SELECT_STORE "ÀÎÁõ¼ ÀúÀå¼Ò¸¦ ¼±ÅÃÇÏ½Ê½Ã¿À." + IDS_IMPORT_WIZARD "ÀÎÁõ¼ °¡Á®¿À±â ¸¶¹ý»ç" + IDS_IMPORT_TYPE_MISMATCH "ÀÌ ÆÄÀÏÀº ÁÖ¾îÁø ±âÁ¸¿¡ ¸ÂÁö ¾Ê´Â °´Ã¼¸¦ Æ÷ÇÔÇÏ°í ÀÖ½À´Ï´Ù. ´Ù¸¥ ÆÄÀÏÀ» ¼±ÅÃÇÏ½Ê½Ã¿À." + IDS_IMPORT_FILE_TITLE "°¡Á®¿Ã ÆÄÀÏ" + IDS_IMPORT_FILE_SUBTITLE "°¡Á®¿Ã ÆÄÀÏ ¼±ÅÃ." + IDS_IMPORT_STORE_TITLE "ÀÎÁõ¼ º¸°ü¼Ò" + IDS_IMPORT_STORE_SUBTITLE "ÀÎÁõ¼ º¸°ü¼Ò´Â ÀÎÁõ¼, ÀÎÁõ¼ ÆÄ±â ¸ñ·Ï, ÀÎÁõ¼ ½Å·Ú ¸ñ·ÏÀÇ ÁýÇÕ¼ÒÀÔ´Ï´Ù." + IDS_IMPORT_FILTER_CERT "X.509 ÀÎÁõ¼ (*.cer; *.crt)" + IDS_IMPORT_FILTER_PFX "°³ÀÎ Á¤º¸ ±³È¯ (*.pfx; *.p12)" + IDS_IMPORT_FILTER_CRL "ÀÎÁõ¼Ò ÆÄ±â ¸ñ·Ï (*.crl)" + IDS_IMPORT_FILTER_CTL "ÀÎÁõ¼ ½Å·Ú ¸ñ·Ï (*.stl)" + IDS_IMPORT_FILTER_SERIALIZED_STORE "Microsoft ¿¬¼Ó ÀÎÁõ¼ º¸°ü¼Ò (*.sst)" + IDS_IMPORT_FILTER_CMS "CMS/PKCS #7 ¸Þ¼¼Áö (*.spc; *.p7b)" + IDS_IMPORT_FILTER_ALL "¸ðµç ÆÄÀÏ (*.*)" + IDS_IMPORT_EMPTY_FILE "ÆÄÀÏÀ» ¼±ÅÃÇÏ½Ê½Ã¿À." + IDS_IMPORT_BAD_FORMAT "ÀÌ ÆÄÀÏ Çü½ÄÀº ÀÎ½ÄÇÒ ¼ö ¾ø½À´Ï´Ù. ´Ù¸¥ ÆÄÀÏÀ» ¼±ÅÃÇÏ½Ê½Ã¿À." + IDS_IMPORT_OPEN_FAILED "¿¼ö ¾ø½À´Ï´Ù " + IDS_IMPORT_DEST_DETERMINED "ÇÁ·Î±×·¥¿¡ ÀÇÇØ °áÁ¤" + IDS_IMPORT_SELECT_STORE "º¸°ü¼Ò¸¦ ¼±ÅÃÇÏ½Ê½Ã¿À" + IDS_IMPORT_STORE_SELECTION "ÀÎÁõ¼ º¸°ü¼Ò°¡ ¼±ÅÃµÊ" + IDS_IMPORT_DEST_AUTOMATIC "ÀÚµ¿À¸·Î ÇÁ·Î±×·¥¿¡ ÀÇÇØ °áÁ¤" + IDS_IMPORT_FILE "ÆÄÀÏ" + IDS_IMPORT_CONTENT "³»¿ë" + IDS_IMPORT_CONTENT_CERT "ÀÎÁõ¼" + IDS_IMPORT_CONTENT_CRL "ÀÎÁõ¼ ÆÄ±â ¸ñ·Ï" + IDS_IMPORT_CONTENT_CTL "ÀÎÁõ¼ ½Å·Ú ¸ñ·Ï" + IDS_IMPORT_CONTENT_CMS "CMS/PKCS #7 ¸Þ¼¼Áö" + IDS_IMPORT_CONTENT_PFX "°³ÀÎ Á¤º¸ ±³È¯" + IDS_IMPORT_CONTENT_STORE "ÀÎÁõ¼ º¸°ü¼Ò" + IDS_IMPORT_SUCCEEDED "°¡Á®¿À±â ¼º°ø." + IDS_IMPORT_FAILED "°¡Á®¿À±â ½ÇÆÐ." + IDS_WIZARD_TITLE_FONT "Arial" + IDS_PURPOSE_ALL "<¸ðµÎ>" + IDS_PURPOSE_ADVANCED "<Ãß°¡ ¿ëµµ>" + IDS_SUBJECT_COLUMN "¹ßÇà¸ñÀû" + IDS_ISSUER_COLUMN "¹ßÇàÀÚ" + IDS_EXPIRATION_COLUMN "¸¸±âÀÏ" + IDS_FRIENDLY_NAME_COLUMN "¾ÖÄª" + IDS_ALLOWED_PURPOSE_ALL "<¸ðµÎ>" + IDS_ALLOWED_PURPOSE_NONE "<¾øÀ½>" + IDS_WARN_REMOVE_MY "´ç½ÅÀº ´õ ÀÌ»ó ÀÌ ÀÎÁõ¼¸¦ ÀÌ¿ëÇØ¼ ¸Þ¼¼Áö¸¦ ÇØµ¶ÇÏ°Å³ª,¾Æ´Ï¸é ¼¸íÀ» ÇÒ ¼ö ¾øÀ» °ÍÀÔ´Ï´Ù.\n´ç½ÅÀº Á¤¸»·Î ÀÌ ÀÎÁõ¼¸¦ Á¦°ÅÇÏ±â¸¦ ¿øÇÕ´Ï±î?" + IDS_WARN_REMOVE_PLURAL_MY "´ç½ÅÀº ´õ ÀÌ»ó ÀÌ ÀÎÁõ¼´Ùµé¸¦ ÀÌ¿ëÇØ¼ ¸Þ¼¼Áö¸¦ ÇØµ¶ÇÏ°Å³ª,¾Æ´Ï¸é ¼¸íÀ» ÇÒ ¼ö ¾øÀ» °ÍÀÔ´Ï´Ù.\n´ç½ÅÀº Á¤¸»·Î ÀÌ ÀÎÁõ¼µé¸¦ Á¦°ÅÇÏ±â¸¦ ¿øÇÕ´Ï±î??" + IDS_WARN_REMOVE_ADDRESSBOOK "´ç½ÅÀº ´õ ÀÌ»ó ÀÌ ÀÎÁõ¼¸¦ ÀÌ¿ëÇØ¼ ¸Þ¼¼Áö¸¦ ¾ÏÈ£ÇÏ°Å³ª,¾Æ´Ï¸é ¼¸íµÈ °ÍÀ» °ËÁõÇÒ ¼ö ¾øÀ» °ÍÀÔ´Ï´Ù.\n´ç½ÅÀº Á¤¸»·Î ÀÌ ÀÎÁõ¼¸¦ Á¦°ÅÇÏ±â¸¦ ¿øÇÕ´Ï±î?" + IDS_WARN_REMOVE_PLURAL_ADDRESSBOOK "´ç½ÅÀº ´õ ÀÌ»ó ÀÌ ÀÎÁõ¼µé¸¦ ÀÌ¿ëÇØ¼ ¸Þ¼¼Áö¸¦ ¾ÏÈ£ÇÏ°Å³ª,¾Æ´Ï¸é ¼¸íµÈ °ÍÀ» °ËÁõÇÒ ¼ö ¾øÀ» °ÍÀÔ´Ï´Ù.\n´ç½ÅÀº Á¤¸»·Î ÀÌ ÀÎÁõ¼µé¸¦ Á¦°ÅÇÏ±â¸¦ ¿øÇÕ´Ï±î?" + IDS_WARN_REMOVE_CA "ÀÌ ÀÎÁõ ±â°üÀÌ ¹ß±ÞÇÑ ÀÎÁõ¼¸¦ ´õ ÀÌ»ó ½Å·ÚÇÒ ¼ö ¾øÀ» °ÍÀÔ´Ï´Ù.\n´ç½ÅÀº Á¤¸»·Î ÀÌ ÀÎÁõ¼¸¦ Á¦°ÅÇÏ±â¸¦ ¿øÇÕ´Ï±î?" + IDS_WARN_REMOVE_PLURAL_CA "ÀÌ ÀÎÁõ ±â°üÀÌ ¹ß±ÞÇÑ ÀÎÁõ¼µé¸¦ ´õ ÀÌ»ó ½Å·ÚÇÒ ¼ö ¾øÀ» °ÍÀÔ´Ï´Ù.\n´ç½ÅÀº Á¤¸»·Î ÀÌ ÀÎÁõ¼µé¸¦ Á¦°ÅÇÏ±â¸¦ ¿øÇÕ´Ï±î?" + IDS_WARN_REMOVE_ROOT "ÀÌ ·çÆ®ÀÎÁõ ±â°üÀÌ³ª ´Ù¸¥ ¾î¶² ÀÎÁõ±â°ü¿¡¿¡¼ ¹ß±ÞÇÑ ÀÎÁõ¼¸¦ ´õ ÀÌ»ó ½Å·ÚÇÒ ¼ö ¾øÀ» °ÍÀÔ´Ï´Ù.\n´ç½ÅÀº Á¤¸»·Î ÀÌ ½Å·ÚµÈ ·çÆ®ÀÎÁõ¼¸¦ Á¦°ÅÇÏ±â¸¦ ¿øÇÕ´Ï±î?" + IDS_WARN_REMOVE_PLURAL_ROOT "ÀÌ ·çÆ®ÀÎÁõ ±â°üÀÌ³ª ´Ù¸¥ ¾î¶² ÀÎÁõ±â°ü¿¡¿¡¼ ¹ß±ÞÇÑ ÀÎÁõ¼¸¦ ´õ ÀÌ»ó ½Å·ÚÇÒ ¼ö ¾øÀ» °ÍÀÔ´Ï´Ù.\n´ç½ÅÀº Á¤¸»·Î ÀÌ ½Å·ÚµÈ ·çÆ®ÀÎÁõ¼µé¸¦ Á¦°ÅÇÏ±â¸¦ ¿øÇÕ´Ï±î?" + IDS_WARN_REMOVE_TRUSTEDPUBLISHER "ÀÌ ¹ßÇàÀÚ¿¡ ÀÇÇØ ¼¸íµÈ ¼ÒÇÁÆ®¿þ¾î´Â ´õ ÀÌ»ó ½Å·ÚÇÒ ¼ö ¾øÀ» °ÍÀÔ´Ï´Ù.\n´ç½ÅÀº Á¤¸»·Î ÀÌ ÀÎÁõ¼¸¦ Á¦°ÅÇÏ±â¸¦ ¿øÇÕ´Ï±î?" + IDS_WARN_REMOVE_PLURAL_TRUSTEDPUBLISHER "ÀÌ ¹ßÇàÀÚµé¿¡ ÀÇÇØ ¼¸íµÈ ¼ÒÇÁÆ®¿þ¾î´Â ´õ ÀÌ»ó ½Å·ÚÇÒ ¼ö ¾øÀ» °ÍÀÔ´Ï´Ù.\n´ç½ÅÀº Á¤¸»·Î ÀÌ ÀÎÁõ¼µé¸¦ Á¦°ÅÇÏ±â¸¦ ¿øÇÕ´Ï±î?" + IDS_WARN_REMOVE_DEFAULT "ÀÌ ÀÎÁõ°Å¸¦ Á¦°ÅÇÏ±â¸¦ ¿øÇÕ´Ï±î?" + IDS_WARN_REMOVE_PLURAL_DEFAULT "ÀÌ ÀÎÁõ¼µé¸¦ Á¦°ÅÇÏ±â¸¦ ¿øÇÕ´Ï±î?" + IDS_CERT_MGR "ÀÎÁõ¼" + IDS_PURPOSE_SERVER_AUTH "¿ø°Ý ÄÄÇ»ÅÍÀÇ µ¿ÀÏ¼º º¸Áõ" + IDS_PURPOSE_CLIENT_AUTH "´ç½ÅÀÇ ½Å¿øÀ» ¿ø°ÝÄÄÇ»ÅÍ·Î ÀÎÁõ" + IDS_PURPOSE_CODE_SIGNING "¼ÒÇÁÆ®¿þ¾î ¹ßÇàÀÚ·ÎºÎÅÍ ¿Â ¼ÒÇÁÆ®¿þ¾î º¸Áõ\n¹ßÇàµÈ ÈÄÀÇ ¼ÒÇÁÆ®¿þ¾î¸¦ °³Á¶·ÎºÎÅÍ º¸È£" + IDS_PURPOSE_EMAIL_PROTECTION "ÀüÀÚ¿ìÆí ¸Þ½ÃÁö º¸È£" + IDS_PURPOSE_IPSEC "ÀÎÅÍ³ÝÀ» ÅëÇÑ º¸¾È Åë½Å Çã¿ë" + IDS_PURPOSE_TIMESTAMP_SIGNING "ÇöÀç ½Ã°£¿¡ µû¸¥ ¼¸í Çã¿ë" + IDS_PURPOSE_CTL_USAGE_SIGNING "½Å·ÚÇÒ ¼ö ÀÖ´Â Áõ¸í¼ ¸ñ·Ï¿¡ ÀüÀÚ ¼¸í Çã¿ë" + IDS_PURPOSE_EFS "µð½ºÅ©¿¡ µ¥ÀÌÅ¸ ¾ÏÈ£È Çã¿ë" + IDS_PURPOSE_EFS_RECOVERY "ÆÄÀÏ º¹±¸" + IDS_PURPOSE_WHQL "À©µµ¿ìÁî ÇÏµå¿þ¾î µå¶óÀÌ¹ö È®ÀÎ" + IDS_PURPOSE_NT5 "À©µµ¿ìÁî ½Ã½ºÅÛ ÄÄÆ÷³ÍÆ® È®ÀÎ" + IDS_PURPOSE_OEM_WHQL "OEM À©µµ¿ìÁî ½Ã½ºÅÛ ÄÄÆ÷³ÍÆ® È®ÀÎ" + IDS_PURPOSE_EMBEDDED_NT "ÀÓº£µðµå À©µµ¿ìÁî ½Ã½ºÅÛ ÄÄÆ÷³ÍÆ® È®ÀÎ" + IDS_PURPOSE_ROOT_LIST_SIGNER "·çÆ® ¸ñ·Ï ¼¸íÀÚ" + IDS_PURPOSE_QUALIFIED_SUBORDINATION "ÀÚ°ÝÀÖ´Â Á¾¼Ó" + IDS_PURPOSE_KEY_RECOVERY "Å° º¹±¸" + IDS_PURPOSE_DOCUMENT_SIGNING "¹®¼ ¼¸í" + IDS_PURPOSE_LIFETIME_SIGNING "À¯È¿±â°£" + IDS_PURPOSE_DRM "µðÁöÅÐ ±Ç¸®" + IDS_PURPOSE_LICENSES "Å° ÆÑ ¶óÀÌ¼¾½º" + IDS_PURPOSE_LICENSE_SERVER "¶óÀÌ¼¾½º ¼¹ö È®ÀÎ" + IDS_PURPOSE_ENROLLMENT_AGENT "ÀÎÁõ¼ ¿äÃ» ¿¡ÀÌÀüÆ®" + IDS_PURPOSE_SMARTCARD_LOGON "½º¸¶Æ® Ä«µå ·Î±×¿Â" + IDS_PURPOSE_CA_EXCHANGE "»çÀû Å° º¸°ü¼Ò" + IDS_PURPOSE_KEY_RECOVERY_AGENT "Å° º¹±¸ ¿¡ÀÌÀüÆ®" + IDS_PURPOSE_DS_EMAIL_REPLICATION "µð·ºÅä¸® ¼ºñ½º ÀüÀÚ¿ìÆí º¹Á¦" +} + +IDD_GENERAL DIALOG DISCARDABLE 0, 0, 255, 236 +CAPTION "ÀÏ¹Ý" +STYLE WS_VISIBLE +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", -1, "Static", WS_BORDER|SS_WHITERECT, 6,10,241,200 + CONTROL "", IDC_CERTIFICATE_ICON,"RichEdit20W", + ES_READONLY|WS_DISABLED,8,11,26,26 + CONTROL "", IDC_CERTIFICATE_INFO,"RichEdit20W", + ES_READONLY|WS_DISABLED,34,11,212,26 + CONTROL "", -1, "Static", SS_BLACKFRAME, 16,37,222,1 + CONTROL "", IDC_CERTIFICATE_STATUS,"RichEdit20W", + ES_READONLY|ES_MULTILINE,8,38,238,78 + CONTROL "", -1, "Static", SS_BLACKFRAME, 16,116,222,1 + CONTROL "", IDC_CERTIFICATE_NAMES,"RichEdit20W", + ES_READONLY|ES_MULTILINE|WS_DISABLED,8,118,238,90 + PUSHBUTTON "ÀÎÁõ¼ ¼³Ä¡(&I)...", IDC_ADDTOSTORE,103,216,70,14 + PUSHBUTTON "¹ßÇàÀÚ ¼³¸í(&S)", IDC_ISSUERSTATEMENT,177,216,70,14 +END + +IDD_DETAIL DIALOG DISCARDABLE 0, 0, 255, 236 +CAPTION "ÀÚ¼¼È÷" +STYLE WS_VISIBLE +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Ç¥½Ã(&S):", -1, 6,12,40,14 + COMBOBOX IDC_DETAIL_SELECT, 28,10,100,14, + CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP + CONTROL "", IDC_DETAIL_LIST, "SysListView32", + LVS_REPORT|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, + 6,28,241,100 + CONTROL "", IDC_DETAIL_VALUE, "RichEdit20W", + ES_READONLY|ES_MULTILINE|WS_TABSTOP, 6,136,241,70 + PUSHBUTTON "¼Ó¼º ÆíÁý(&E)...", IDC_EDITPROPERTIES,103,216,70,14 + PUSHBUTTON "ÆÄÀÏ·Î º¹»ç(&C)...", IDC_EXPORT,177,216,70,14 +END + +IDD_HIERARCHY DIALOG DISCARDABLE 0, 0, 255, 236 +CAPTION "ÀÎÁõ¼ °æ·Î" +STYLE WS_VISIBLE +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "ÀÎÁõ¼ °æ·Î(&P)", -1,6,10,245,165, BS_GROUPBOX + CONTROL "",IDC_CERTPATH, "SysTreeView32", TVS_HASLINES|WS_BORDER, + 13,22,231,130 + PUSHBUTTON "ÀÎÁõ¼ º¸±â(&V)", IDC_VIEWCERTIFICATE,175,156,70,14 + LTEXT "ÀÎÁõ¼ »óÅÂ(&S):", IDC_CERTIFICATESTATUS,6,183,70,14 + CONTROL "", IDC_CERTIFICATESTATUSTEXT,"RichEdit20W", + WS_BORDER|ES_READONLY|ES_MULTILINE|WS_DISABLED,6,195,245,36 +END + +IDD_USERNOTICE DIALOG DISCARDABLE 0, 0, 255, 256 +CAPTION "°ÅºÎ" +STYLE WS_VISIBLE +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_USERNOTICE,"RichEdit20W", + WS_BORDER|ES_READONLY|ES_MULTILINE|WS_DISABLED,6,10,241,200 + PUSHBUTTON "´Ý±â", IDOK,103,216,70,14 + PUSHBUTTON "Ãß°¡ Á¤º¸(&I)", IDC_CPS,177,216,70,14 +END + +IDD_CERT_PROPERTIES_GENERAL DIALOG DISCARDABLE 0, 0, 255, 236 +CAPTION "ÀÏ¹Ý" +STYLE WS_VISIBLE +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "¾ÖÄª(&F):", -1, 6,14,60,14 + EDITTEXT IDC_FRIENDLY_NAME, 60,12,191,14, ES_AUTOHSCROLL|WS_TABSTOP + LTEXT "¼³¸í(&D):", -1, 6,32,60,14 + EDITTEXT IDC_DESCRIPTION, 60,30,191,14, ES_AUTOVSCROLL|ES_MULTILINE|WS_TABSTOP|WS_VSCROLL + GROUPBOX "ÀÎÁõ¼ ¿ëµµ", -1,6,48,245,165, BS_GROUPBOX + AUTORADIOBUTTON "ÀÎÁõ¼¸¦ ¸ðµç ¿ëµµ·Î »ç¿ë °¡´É(&E)", + IDC_ENABLE_ALL_PURPOSES, 12,58,180,14, BS_AUTORADIOBUTTON|WS_TABSTOP + AUTORADIOBUTTON "ÀÎÁõ¼¸¦ ¸ðµç ¿ëµµ·Î »ç¿ëÇÏÁö ¾ÊÀ½(&I)", + IDC_DISABLE_ALL_PURPOSES, 12,70,180,14, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "ÀÎÁõ¼¸¦ ¿ÀÁ÷ ´ÙÀ½ÀÇ ¿ëµµ·Î¸¸ »ç¿ë(&O):", + IDC_ENABLE_SELECTED_PURPOSES, 12,82,180,14, BS_AUTORADIOBUTTON + CONTROL "", IDC_CERTIFICATE_USAGES,"SysListView32", + LVS_REPORT|LVS_NOCOLUMNHEADER|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER,24,100,220,90 + PUSHBUTTON "¿ëµµ Ãß°¡(&)...", IDC_ADD_PURPOSE,184,194,60,14 +END + +IDD_ADD_CERT_PURPOSE DIALOG DISCARDABLE 0,0,200,68 +CAPTION "¿ëµµ Ãß°¡" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Ãß°¡ÇÏ°íÀÚ ÇÏ´Â ÀÎÁõ¼ ¿ëµµÀÇ °´Ã¼ ½Äº°ÀÚ(OID) Ãß°¡:",-1, 6,6,190,28 + EDITTEXT IDC_NEW_PURPOSE, 6,28,190,14, ES_AUTOVSCROLL|ES_MULTILINE|WS_TABSTOP|WS_VSCROLL + PUSHBUTTON "È®ÀÎ", IDOK, 33,48,60,14 + PUSHBUTTON "Ãë¼Ò", IDCANCEL, 100,48,60,14 +END + +IDD_SELECT_STORE DIALOG DISCARDABLE 0,0,200,136 +CAPTION "ÀÎÁõ¼ ÀúÀå¼Ò ¼±ÅÃ" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "»ç¿ëÇÏ°íÀÚ ÇÏ´Â ÀÎÁõ¼ ÀúÀå¼Ò¸¦ ¼±ÅÃÇÏ½Ê½Ã¿À:", IDC_STORE_TEXT, 6,6,190,28 + CONTROL "",IDC_STORE_LIST, "SysTreeView32", TVS_HASLINES|WS_BORDER|WS_TABSTOP,6,28,188,70 + CHECKBOX "¹°¸®Àû ÀúÀå¼Ò º¸¿©ÁÖ±â(&S)", IDC_SHOW_PHYSICAL_STORES, 6,102,90,14,BS_AUTOCHECKBOX|WS_TABSTOP + PUSHBUTTON "È®ÀÎ", IDOK, 90,118,50,14, BS_DEFPUSHBUTTON + PUSHBUTTON "Ãë¼Ò", IDCANCEL, 144,118,50,14 +END + +IDD_IMPORT_WELCOME DIALOG DISCARDABLE 0,0,317,143 +CAPTION "ÀÎÁõ¼ °¡Á®¿À±â ¸¶¹ý»ç" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "ÀÎÁõ¼ °¡Á®¿À±â ¸¶¹ý»ç¿¡ ¿Â °ÍÀ» È¯¿µÇÕ´Ï´Ù", IDC_IMPORT_TITLE,115,1,195,40 + LTEXT "ÀÌ ¸¶¹ý»ç´Â ´ç½ÅÀÌ ÆÄÀÏ·ÎºÎÅÍ ÀÎÁõ¼,ÀÎÁõ¼ ÆÄ±â ¸ñ·Ï,ÀÎÁõ¼ ½Å·Ú ¸ñ·ÏÀ» ÀÎÁõ¼ º¸°ü¼Ò¿¡ °¡Á®¿À´Â °ÍÀ» µµ¿ÍÁÝ´Ï´Ù.",-1, 115,33,195,16 + LTEXT "ÀÌ ÀÎÁõ¼´Â ´ç½ÅÀÌ³ª ´ç½ÅÀÌ Åë½Å¿¡ »ç¿ëÇÏ´Â ÄÄÇ»ÅÍ¸¦ ½Å¿øº¸ÁõÇÏ´Â µ¥ »ç¿ëµË´Ï´Ù. ¶ÇÇÑ ¸Þ¼¼Áö¿¡ »çÀÎÇÏ°í ÀÎÁõÇÏ´Â µ¥µµ »ç¿ëµË´Ï´Ù. ÀÎÁõ¼ º¸°ü¼Ò´Â ÀÎÁõ¼, ÀÎÁõ¼ ÆÄ±â ¸ñ·Ï, ÀÎÁõ¼ ½Å·Ú ¸ñ·ÏÀÇ ÀúÀå¼ÒÀÔ´Ï´Ù.",-1, 115,56,195,40 + LTEXT "°è¼ÓÇÏ·Á¸é, ´ÙÀ½À» Å¬¸¯ÇÏ½Ê½Ã¿À.",-1, 115,103,195,8 +END + +IDD_IMPORT_FILE DIALOG DISCARDABLE 0,0,317,143 +CAPTION "ÀÎÁõ¼ °¡Á®¿À±â ¸¶¹ý»ç" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "ÆÄÀÏ ÀÌ¸§(&F):", -1, 21,1,195,10 + EDITTEXT IDC_IMPORT_FILENAME, 21,11,208,14, ES_AUTOHSCROLL|WS_TABSTOP + PUSHBUTTON "Ã£±â(&R)...", IDC_IMPORT_BROWSE_FILE, 236,11,60,14 + LTEXT "ÁÖÀÇ: ÀÌ ÆÄÀÏ Çü½ÄÀº ¾Æ¸¶µµ ÇÏ³ª ÀÌ»óÀÇ ÀÎÁõ¼,ÀÎÁõ¼ ÆÄ±â ¸ñ·Ï,ÀÎÁõ¼ ½Å·Ú ¸ñ·ÏÀ» °¡Áö°í ÀÖÀ» ¼ö ÀÖ½À´Ï´Ù:", -1, 21,26,265,16 + LTEXT "¾ÏÈ£È ¸Þ¼¼Áö ¹®¹ý Ç¥ÁØ/PKCS #7 ¸Þ½ÃÁö (.p7b)",-1, 31,49,265,10 + LTEXT "°³ÀÎ Á¤º¸ ±³È¯/PKCS #12 (.pfx, .p12)",-1, 31,64,265,10 + LTEXT "Microsoft ¿¬¼Ó ÀÎÁõ¼ º¸°ü¼Ò (.sst)",-1, 31,79,265,10 +END + +IDD_IMPORT_STORE DIALOG DISCARDABLE 0,0,317,143 +CAPTION "ÀÎÁõ¼ °¡Á®¿À±â ¸¶¹ý»ç" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "WineÀÌ ÀÚµ¿À¸·Î ÀÎÁõ¼ ÀúÀå¼Ò¸¦ ¼±ÅÃÇÏ°Å³ª, ¾Æ´Ï¸é Á÷Á¢ ÀúÀåÇÒ °÷À» ¼±ÅÃÇÒ ¼ö ÀÖ½À´Ï´Ù.", -1, 21,1,195,20 + AUTORADIOBUTTON "ÀÚµ¿À¸·Î ÀÎÁõ¼ ÀúÀå¼Ò ¼±ÅÃ(&A)",IDC_IMPORT_AUTO_STORE, 31,18,180,12, BS_AUTORADIOBUTTON|WS_TABSTOP + AUTORADIOBUTTON "´ÙÀ½ ÀúÀå¼Ò¿¡ ¸ðµç ÀÎÁõ¼ ÀúÀå(&P):",IDC_IMPORT_SPECIFY_STORE, 31,30,180,12, BS_AUTORADIOBUTTON + EDITTEXT IDC_IMPORT_STORE, 44,49,185,14, ES_READONLY + PUSHBUTTON "Ã£±â(&R)...", IDC_IMPORT_BROWSE_STORE, 236,49,60,14 +END + +IDD_IMPORT_FINISH DIALOG DISCARDABLE 0,0,317,143 +CAPTION "ÀÎÁõ¼ °¡Á®¿À±â ¸¶¹ý»ç" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "ÀÎÁõ¼ °¡Á®¿À±â ¸¶¹ý»ç ¸¶Ä¡´Â Áß", IDC_IMPORT_TITLE,115,1,195,40 + LTEXT "´ç½ÅÀº ÀÎÁõ¼ °¡Á®¿À±â ¸¶¹ý»ç¸¦ ¸¶Ä¡´Âµ¥ ¼º°øÇß½À´Ï´Ù.",-1, 115,33,195,24 + LTEXT "´ç½ÅÀº ´ÙÀ½ ¼³Á¤À» ÁöÁ¤Çß½À´Ï´Ù:",-1, 115,57,195,12 + CONTROL "", IDC_IMPORT_SETTINGS, "SysListView32", + LVS_REPORT|LVS_NOCOLUMNHEADER|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, + 115,67,174,100 +END + +IDD_CERT_MGR DIALOG DISCARDABLE 0,0,335,270 +CAPTION "ÀÎÁõ¼" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "ÁöÁ¤µÈ ¿ëµµ(&N):", -1, 7,9,100,12 + COMBOBOX IDC_MGR_PURPOSE_SELECTION, 83,7,245,14, + CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP + CONTROL "", IDC_MGR_STORES, "SysTabControl32", + WS_CLIPSIBLINGS|WS_TABSTOP, 7,25,321,140 + CONTROL "", IDC_MGR_CERTS, "SysListView32", + LVS_REPORT|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 15,46,305,111 + PUSHBUTTON "ºÒ·¯¿À±â(&I)...", IDC_MGR_IMPORT, 7,172,51,14 + PUSHBUTTON "³»º¸³»±â(&E)...", IDC_MGR_EXPORT, 62,172,51,14, WS_DISABLED + PUSHBUTTON "Á¦°ÅÇÏ±â(&R)", IDC_MGR_REMOVE, 117,172,51,14, WS_DISABLED + PUSHBUTTON "Ãß°¡(&A)...", IDC_MGR_ADVANCED, 277,172,51,14 + GROUPBOX "ÀÎÁõ¼ ÁöÁ¤ ¿ëµµ", -1,7,194,321,47, BS_GROUPBOX + LTEXT "", IDC_MGR_PURPOSES, 13,208,252,30 + PUSHBUTTON "º¸±â(&V)...", IDC_MGR_VIEW, 269,218,51,14, WS_DISABLED + PUSHBUTTON "´Ý±â(&C)", IDCANCEL, 277,249,51,14, BS_DEFPUSHBUTTON +END + +IDD_CERT_MGR_ADVANCED DIALOG DISCARDABLE 0,0,248,176 +CAPTION "Ãß°¡ ¿É¼Ç" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "ÀÎÁõ¼ ¿ëµµ", -1, 7,7,234,141, BS_GROUPBOX + LTEXT "Ãß°¡ ¿ëµµ°¡ ¼±ÅÃµÇ¾úÀ» ¶§ ³ªÅ¸³ª´Â ÇÏ³ª³ª ´Ù¼öÀÇ ¿ëµµ ¼±ÅÃ.", + -1, 14,18,220,16 + LTEXT "ÀÎÁõ¼ ¿ëµµ(&C):", -1, 14,41,90,12, WS_TABSTOP + CONTROL "", IDC_CERTIFICATE_USAGES,"SysListView32", + LVS_REPORT|LVS_NOCOLUMNHEADER|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, + 14,51,220,90 + PUSHBUTTON "È®ÀÎ", IDOK, 132,155,51,14, BS_DEFPUSHBUTTON + PUSHBUTTON "Ãë¼Ò", IDCANCEL, 190,155,51,14 +END Propchange: trunk/reactos/dll/win32/cryptui/cryptui_Ko.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[cwittich] 38835: sync cabinet headers with wine 1.1.13
by cwittich＠svn.reactos.org 17 Jan '09

17 Jan '09

Author: cwittich Date: Sat Jan 17 13:14:53 2009 New Revision: 38835 URL: http://svn.reactos.org/svn/reactos?rev=38835&view=rev Log: sync cabinet headers with wine 1.1.13 Modified: trunk/reactos/include/psdk/fci.h trunk/reactos/include/psdk/fdi.h Modified: trunk/reactos/include/psdk/fci.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/fci.h?rev=388… ============================================================================== --- trunk/reactos/include/psdk/fci.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/fci.h [iso-8859-1] Sat Jan 17 13:14:53 2009 @@ -13,11 +13,13 @@ * * 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 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #ifndef __WINE_FCI_H #define __WINE_FCI_H + +#include <basetsd.h> #ifdef __cplusplus extern "C" { @@ -32,10 +34,10 @@ * Common FCI/TDI declarations */ -typedef unsigned long CHECKSUM; - -typedef unsigned long UOFF; -typedef unsigned long COFF; +typedef ULONG CHECKSUM; + +typedef ULONG UOFF; +typedef ULONG COFF; /**********************************************************************/ @@ -161,7 +163,7 @@ /**********************************************************************/ -typedef void * (__cdecl *PFNFCIALLOC)(ULONG cb); +typedef void * (__cdecl __WINE_ALLOC_SIZE(1) *PFNFCIALLOC)(ULONG cb); #define FNFCIALLOC(fn) void * __cdecl fn(ULONG cb) typedef void (__cdecl *PFNFCIFREE)(void *memory); @@ -179,8 +181,8 @@ typedef int (__cdecl *PFNFCICLOSE)(INT_PTR hf, int *err, void *pv); #define FNFCICLOSE(fn) int __cdecl fn(INT_PTR hf, int *err, void *pv) -typedef long (__cdecl *PFNFCISEEK) (INT_PTR hf, long dist, int seektype, int *err, void *pv); -#define FNFCISEEK(fn) long __cdecl fn(INT_PTR hf, long dist, int seektype, int *err, void *pv) +typedef LONG (__cdecl *PFNFCISEEK) (INT_PTR hf, LONG dist, int seektype, int *err, void *pv); +#define FNFCISEEK(fn) LONG __cdecl fn(INT_PTR hf, LONG dist, int seektype, int *err, void *pv) typedef int (__cdecl *PFNFCIDELETE) (char *pszFile, int *err, void *pv); #define FNFCIDELETE(fn) int __cdecl fn(char *pszFile, int *err, void *pv) @@ -192,12 +194,12 @@ typedef int (__cdecl *PFNFCIFILEPLACED)(PCCAB pccab, char *pszFile, - long cbFile, + LONG cbFile, BOOL fContinuation, void *pv); #define FNFCIFILEPLACED(fn) int __cdecl fn(PCCAB pccab, \ char *pszFile, \ - long cbFile, \ + LONG cbFile, \ BOOL fContinuation, \ void *pv) @@ -218,11 +220,11 @@ #define statusFolder 1 /* Add Folder to Cabinet callback */ #define statusCabinet 2 /* Write out a completed cabinet callback */ -typedef long (__cdecl *PFNFCISTATUS)(UINT typeStatus, +typedef LONG (__cdecl *PFNFCISTATUS)(UINT typeStatus, ULONG cb1, ULONG cb2, void *pv); -#define FNFCISTATUS(fn) long __cdecl fn(UINT typeStatus, \ +#define FNFCISTATUS(fn) LONG __cdecl fn(UINT typeStatus, \ ULONG cb1, \ ULONG cb2, \ void *pv) Modified: trunk/reactos/include/psdk/fdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/fdi.h?rev=388… ============================================================================== --- trunk/reactos/include/psdk/fdi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/fdi.h [iso-8859-1] Sat Jan 17 13:14:53 2009 @@ -13,7 +13,7 @@ * * 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 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #ifndef __WINE_FDI_H @@ -32,10 +32,10 @@ * Common FCI/TDI declarations */ -typedef unsigned long CHECKSUM; - -typedef unsigned long UOFF; -typedef unsigned long COFF; +typedef ULONG CHECKSUM; + +typedef ULONG UOFF; +typedef ULONG COFF; /**********************************************************************/ @@ -143,7 +143,7 @@ /**********************************************************************/ typedef struct { - long cbCabinet; /* Total length of cabinet file */ + LONG cbCabinet; /* Total length of cabinet file */ USHORT cFolders; /* Count of folders in cabinet */ USHORT cFiles; /* Count of files in cabinet */ USHORT setID; /* Cabinet set ID */ @@ -217,14 +217,14 @@ typedef int (__cdecl *PFNCLOSE)(INT_PTR hf); #define FNCLOSE(fn) int __cdecl fn(INT_PTR hf) -typedef long (__cdecl *PFNSEEK) (INT_PTR hf, long dist, int seektype); -#define FNSEEK(fn) long __cdecl fn(INT_PTR hf, long dist, int seektype) +typedef LONG (__cdecl *PFNSEEK) (INT_PTR hf, LONG dist, int seektype); +#define FNSEEK(fn) LONG __cdecl fn(INT_PTR hf, LONG dist, int seektype) typedef int (__cdecl *PFNFDIDECRYPT)(PFDIDECRYPT pfdid); #define FNFDIDECRYPT(fn) int __cdecl fn(PFDIDECRYPT pfdid) typedef struct { - long cb; + LONG cb; char *psz1; char *psz2; char *psz3; /* Points to a 256 character buffer */ @@ -261,7 +261,7 @@ typedef struct { char ach[2]; /* Set to { '*', '\0' } */ - long cbFile; /* Required spill file size */ + LONG cbFile; /* Required spill file size */ } FDISPILLFILE, *PFDISPILLFILE; #include <poppack.h>

1 0

[cwittich] 38834: sync wordpad with wine 1.1.13
by cwittich＠svn.reactos.org 17 Jan '09

17 Jan '09

Author: cwittich Date: Sat Jan 17 13:10:56 2009 New Revision: 38834 URL: http://svn.reactos.org/svn/reactos?rev=38834&view=rev Log: sync wordpad with wine 1.1.13 Modified: trunk/reactos/base/applications/wordpad/Da.rc trunk/reactos/base/applications/wordpad/De.rc trunk/reactos/base/applications/wordpad/En.rc trunk/reactos/base/applications/wordpad/Fr.rc trunk/reactos/base/applications/wordpad/Hu.rc trunk/reactos/base/applications/wordpad/Ja.rc trunk/reactos/base/applications/wordpad/Ko.rc trunk/reactos/base/applications/wordpad/Nl.rc trunk/reactos/base/applications/wordpad/No.rc trunk/reactos/base/applications/wordpad/Pl.rc trunk/reactos/base/applications/wordpad/Pt.rc trunk/reactos/base/applications/wordpad/Ru.rc trunk/reactos/base/applications/wordpad/Si.rc trunk/reactos/base/applications/wordpad/Tr.rc trunk/reactos/base/applications/wordpad/Zh.rc trunk/reactos/base/applications/wordpad/wordpad.c Modified: trunk/reactos/base/applications/wordpad/Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Da.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Da.rc [iso-8859-1] Sat Jan 17 13:10:56 2009 @@ -109,7 +109,7 @@ CAPTION "Dato og tid" FONT 10, "MS Sans Serif" BEGIN - LTEXT "Tilgængelige formater",0,3,2,100,15 + LTEXT "Tilgængelige formater",-1,3,2,100,15 LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT | LBS_NOTIFY PUSHBUTTON "&OK",IDOK,87,12,40,12 PUSHBUTTON "&Annuller",IDCANCEL,87,26,40,12 @@ -120,7 +120,7 @@ CAPTION "Ny" FONT 10, "MS Sans Serif" BEGIN - LTEXT "Ny dokumenttype",0,3,2,100,15 + LTEXT "Ny dokumenttype",-1,3,2,100,15 LISTBOX IDC_NEWFILE,3,12,90,65,LBS_NOINTEGRALHEIGHT PUSHBUTTON "&OK",IDOK,97,12,40,12 PUSHBUTTON "&Annuller",IDCANCEL,97,26,40,12 @@ -131,14 +131,14 @@ Caption "Formater afsnit" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Indryk", 0, 10, 10, 120, 68 - LTEXT "Venstre", 0, 15, 22, 40, 13 + GROUPBOX "Indryk", -1, 10, 10, 120, 68 + LTEXT "Venstre", -1, 15, 22, 40, 13 EDITTEXT IDC_PARA_LEFT, 55, 20, 60, 13 - LTEXT "Højre", 0, 15, 40, 40, 13 + LTEXT "Højre", -1, 15, 40, 40, 13 EDITTEXT IDC_PARA_RIGHT, 55, 38, 60, 13 - LTEXT "Første linie", 0, 15, 58, 40, 13 + LTEXT "Første linie", -1, 15, 58, 40, 13 EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13 - LTEXT "Justering", 0, 15, 87, 40, 13 + LTEXT "Justering", -1, 15, 87, 40, 13 COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15 PUSHBUTTON "&Annuller", IDCANCEL, 137, 33, 50, 15 @@ -149,7 +149,7 @@ Caption "Tabulatorer" FONT 8, "MS SHell DLg" BEGIN - GROUPBOX "Tabulatorstop", 0, 10, 10, 120, 90 + GROUPBOX "Tabulatorstop", -1, 10, 10, 120, 90 COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE | CBS_SORT DEFPUSHBUTTON "&Tilføj", ID_TAB_ADD, 20, 80, 45, 15 PUSHBUTTON "&Fjern", ID_TAB_DEL, 72, 80, 45, 15 @@ -163,11 +163,11 @@ Caption "" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Liniebrydning", 0, 10, 10, 130, 85 + GROUPBOX "Liniebrydning", -1, 10, 10, 130, 85 RADIOBUTTON "No line wrapping", IDC_PAGEFMT_WN, 18, 25, 117, 15 RADIOBUTTON "Bryd tekst efter v&indusbredden", IDC_PAGEFMT_WW, 18, 45, 117, 15 RADIOBUTTON "Bryd tekst efter &margen", IDC_PAGEFMT_WM, 18, 65, 117, 15 - GROUPBOX "Værktøjslinier", 0, 150, 10, 120, 85 + GROUPBOX "Værktøjslinier", -1, 150, 10, 120, 85 CHECKBOX "&Værktøjslinie", IDC_PAGEFMT_TB, 160, 20, 80, 15 CHECKBOX "&Formatteringlinie", IDC_PAGEFMT_FB, 160, 38, 80, 15 CHECKBOX "&Lineal", IDC_PAGEFMT_RU, 160, 56, 80, 15 Modified: trunk/reactos/base/applications/wordpad/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/De.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/De.rc [iso-8859-1] Sat Jan 17 13:10:56 2009 @@ -111,7 +111,7 @@ CAPTION "Datum und Uhrzeit" FONT 10, "MS Sans Serif" BEGIN - LTEXT "VerfÃ¼gbare Formate",0,3,2,100,15 + LTEXT "VerfÃ¼gbare Formate",-1,3,2,100,15 LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT | LBS_NOTIFY PUSHBUTTON "&OK",IDOK,87,12,40,12 PUSHBUTTON "A&bbrechen",IDCANCEL,87,26,40,12 @@ -122,7 +122,7 @@ CAPTION "Neu" FONT 10, "MS Sans Serif" BEGIN - LTEXT "Neuer Dokumenttyp",0,3,2,100,15 + LTEXT "Neuer Dokumenttyp",-1,3,2,100,15 LISTBOX IDC_NEWFILE,3,12,90,65,LBS_NOINTEGRALHEIGHT PUSHBUTTON "&OK",IDOK,97,12,40,12 PUSHBUTTON "A&bbrechen",IDCANCEL,97,26,40,12 @@ -133,14 +133,14 @@ Caption "Absatz" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Einzug", 0, 10, 10, 120, 68 - LTEXT "Links", 0, 15, 22, 40, 13 + GROUPBOX "Einzug", -1, 10, 10, 120, 68 + LTEXT "Links", -1, 15, 22, 40, 13 EDITTEXT IDC_PARA_LEFT, 55, 20, 60, 13 - LTEXT "Rechts", 0, 15, 40, 40, 13 + LTEXT "Rechts", -1, 15, 40, 40, 13 EDITTEXT IDC_PARA_RIGHT, 55, 38, 60, 13 - LTEXT "Erste Zeile", 0, 15, 58, 40, 13 + LTEXT "Erste Zeile", -1, 15, 58, 40, 13 EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13 - LTEXT "Ausrichtung", 0, 15, 87, 40, 13 + LTEXT "Ausrichtung", -1, 15, 87, 40, 13 COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15 PUSHBUTTON "A&bbrechen", IDCANCEL, 137, 33, 50, 15 @@ -151,7 +151,7 @@ Caption "Tabstopps" FONT 8, "MS SHell DLg" BEGIN - GROUPBOX "Tabstoppposition", 0, 10, 10, 120, 90 + GROUPBOX "Tabstoppposition", -1, 10, 10, 120, 90 COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE | CBS_SORT DEFPUSHBUTTON "&Festlegen", ID_TAB_ADD, 20, 80, 45, 15 PUSHBUTTON "&LÃ¶schen", ID_TAB_DEL, 72, 80, 45, 15 @@ -165,11 +165,11 @@ Caption "" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Zeilenumbruch", 0, 10, 10, 130, 85 + GROUPBOX "Zeilenumbruch", -1, 10, 10, 130, 85 RADIOBUTTON "No line wrapping", IDC_PAGEFMT_WN, 18, 25, 117, 15 RADIOBUTTON "&Am Fenster umbrechen", IDC_PAGEFMT_WW, 18, 45, 117, 15 RADIOBUTTON "A&m Lineal umbrechen", IDC_PAGEFMT_WM, 18, 65, 117, 15 - GROUPBOX "Symbolleisten", 0, 150, 10, 120, 85 + GROUPBOX "Symbolleisten", -1, 150, 10, 120, 85 CHECKBOX "&Symbolleiste", IDC_PAGEFMT_TB, 160, 20, 80, 15 CHECKBOX "&Formatierungsleiste", IDC_PAGEFMT_FB, 160, 38, 80, 15 CHECKBOX "L&ineal", IDC_PAGEFMT_RU, 160, 56, 80, 15 Modified: trunk/reactos/base/applications/wordpad/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/En.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/En.rc [iso-8859-1] Sat Jan 17 13:10:56 2009 @@ -109,7 +109,7 @@ CAPTION "Date and time" FONT 10, "MS Sans Serif" BEGIN - LTEXT "Available formats",0,3,2,100,15 + LTEXT "Available formats",-1,3,2,100,15 LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT | LBS_NOTIFY PUSHBUTTON "&OK",IDOK,87,12,40,12 PUSHBUTTON "&Cancel",IDCANCEL,87,26,40,12 @@ -120,7 +120,7 @@ CAPTION "New" FONT 10, "MS Sans Serif" BEGIN - LTEXT "New document type",0,3,2,100,15 + LTEXT "New document type",-1,3,2,100,15 LISTBOX IDC_NEWFILE,3,12,90,65,LBS_NOINTEGRALHEIGHT PUSHBUTTON "&OK",IDOK,97,12,40,12 PUSHBUTTON "&Cancel",IDCANCEL,97,26,40,12 @@ -131,14 +131,14 @@ Caption "Paragraph format" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Indentation", 0, 10, 10, 120, 68 - LTEXT "Left", 0, 15, 22, 40, 13 + GROUPBOX "Indentation", -1, 10, 10, 120, 68 + LTEXT "Left", -1, 15, 22, 40, 13 EDITTEXT IDC_PARA_LEFT, 55, 20, 60, 13 - LTEXT "Right", 0, 15, 40, 40, 13 + LTEXT "Right", -1, 15, 40, 40, 13 EDITTEXT IDC_PARA_RIGHT, 55, 38, 60, 13 - LTEXT "First line", 0, 15, 58, 40, 13 + LTEXT "First line", -1, 15, 58, 40, 13 EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13 - LTEXT "Alignment", 0, 15, 87, 40, 13 + LTEXT "Alignment", -1, 15, 87, 40, 13 COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15 PUSHBUTTON "&Cancel", IDCANCEL, 137, 33, 50, 15 @@ -149,7 +149,7 @@ Caption "Tabs" FONT 8, "MS SHell DLg" BEGIN - GROUPBOX "Tab stops", 0, 10, 10, 120, 90 + GROUPBOX "Tab stops", -1, 10, 10, 120, 90 COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE | CBS_SORT DEFPUSHBUTTON "&Add", ID_TAB_ADD, 20, 80, 45, 15 PUSHBUTTON "&Remove", ID_TAB_DEL, 72, 80, 45, 15 @@ -163,11 +163,11 @@ Caption "" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Line wrapping", 0, 10, 10, 130, 85 + GROUPBOX "Line wrapping", -1, 10, 10, 130, 85 RADIOBUTTON "&No line wrapping", IDC_PAGEFMT_WN, 18, 25, 117, 15 RADIOBUTTON "Wrap text by the &window border", IDC_PAGEFMT_WW, 18, 45, 117, 15 RADIOBUTTON "Wrap text by the &margin", IDC_PAGEFMT_WM, 18, 65, 117, 15 - GROUPBOX "Toolbars", 0, 150, 10, 120, 85 + GROUPBOX "Toolbars", -1, 150, 10, 120, 85 CHECKBOX "&Toolbar", IDC_PAGEFMT_TB, 160, 20, 80, 15 CHECKBOX "&Formatbar", IDC_PAGEFMT_FB, 160, 38, 80, 15 CHECKBOX "&Ruler", IDC_PAGEFMT_RU, 160, 56, 80, 15 Modified: trunk/reactos/base/applications/wordpad/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Fr.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Fr.rc [iso-8859-1] Sat Jan 17 13:10:56 2009 @@ -109,7 +109,7 @@ CAPTION "Date et heure" FONT 10, "MS Sans Serif" BEGIN - LTEXT "Formats disponibles",0,3,2,100,15 + LTEXT "Formats disponibles",-1,3,2,100,15 LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT | LBS_NOTIFY PUSHBUTTON "&OK",IDOK,87,12,40,12 PUSHBUTTON "&Annuler",IDCANCEL,87,26,40,12 @@ -120,7 +120,7 @@ CAPTION "Nouveau" FONT 10, "MS Sans Serif" BEGIN - LTEXT "Nouveau type de document",0,3,2,100,15 + LTEXT "Nouveau type de document",-1,3,2,100,15 LISTBOX IDC_NEWFILE,3,12,90,65,LBS_NOINTEGRALHEIGHT PUSHBUTTON "&OK",IDOK,97,12,40,12 PUSHBUTTON "&Annuler",IDCANCEL,97,26,40,12 @@ -131,14 +131,14 @@ Caption "Format de paragraphe" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Indentation", 0, 10, 10, 120, 68 - LTEXT "Gauche", 0, 15, 22, 40, 13 + GROUPBOX "Indentation", -1, 10, 10, 120, 68 + LTEXT "Gauche", -1, 15, 22, 40, 13 EDITTEXT IDC_PARA_LEFT, 55, 20, 60, 13 - LTEXT "Droite", 0, 15, 40, 40, 13 + LTEXT "Droite", -1, 15, 40, 40, 13 EDITTEXT IDC_PARA_RIGHT, 55, 38, 60, 13 - LTEXT "Première ligne", 0, 15, 58, 40, 18 + LTEXT "Première ligne", -1, 15, 58, 40, 18 EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13 - LTEXT "Alignement", 0, 15, 87, 40, 13 + LTEXT "Alignement", -1, 15, 87, 40, 13 COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15 PUSHBUTTON "&Annuler", IDCANCEL, 137, 33, 50, 15 @@ -149,7 +149,7 @@ Caption "Tabulations" FONT 8, "MS SHell DLg" BEGIN - GROUPBOX "Arrêts de tabulation", 0, 10, 10, 120, 90 + GROUPBOX "Arrêts de tabulation", -1, 10, 10, 120, 90 COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE | CBS_SORT DEFPUSHBUTTON "&Ajouter", ID_TAB_ADD, 20, 80, 45, 15 PUSHBUTTON "&Supprimer", ID_TAB_DEL, 72, 80, 45, 15 @@ -163,11 +163,11 @@ Caption "" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Enveloppement de ligne", 0, 10, 10, 170, 85 + GROUPBOX "Enveloppement de ligne", -1, 10, 10, 170, 85 RADIOBUTTON "No line wrapping", IDC_PAGEFMT_WN, 18, 25, 145, 15 RADIOBUTTON "Enveloppe le texte à partir de la bordure de fenêtre", IDC_PAGEFMT_WW, 18, 45, 145, 15 RADIOBUTTON "Enveloppe le texte à partir de la &marge", IDC_PAGEFMT_WM, 18, 65, 145, 15 - GROUPBOX "Barres d'outils", 0, 170, 10, 120, 85 + GROUPBOX "Barres d'outils", -1, 170, 10, 120, 85 CHECKBOX "&Barre d'outils", IDC_PAGEFMT_TB, 180, 20, 80, 15 CHECKBOX "Barre de &format", IDC_PAGEFMT_FB, 180, 38, 80, 15 CHECKBOX "&Règle", IDC_PAGEFMT_RU, 180, 56, 80, 15 Modified: trunk/reactos/base/applications/wordpad/Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Hu.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Hu.rc [iso-8859-1] Sat Jan 17 13:10:56 2009 @@ -109,7 +109,7 @@ CAPTION "Date and time" FONT 10, "MS Sans Serif" BEGIN - LTEXT "Available formats",0,3,2,100,15 + LTEXT "Available formats",-1,3,2,100,15 LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT | LBS_NOTIFY PUSHBUTTON "&OK",IDOK,87,12,40,12 PUSHBUTTON "&Cancel",IDCANCEL,87,26,40,12 @@ -120,7 +120,7 @@ CAPTION "New" FONT 10, "MS Sans Serif" BEGIN - LTEXT "New document type",0,3,2,100,15 + LTEXT "New document type",-1,3,2,100,15 LISTBOX IDC_NEWFILE,3,12,90,65,LBS_NOINTEGRALHEIGHT PUSHBUTTON "&OK",IDOK,97,12,40,12 PUSHBUTTON "&Cancel",IDCANCEL,97,26,40,12 @@ -131,14 +131,14 @@ Caption "Paragraph format" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Indentation", 0, 10, 10, 120, 68 - LTEXT "Left", 0, 15, 22, 40, 13 + GROUPBOX "Indentation", -1, 10, 10, 120, 68 + LTEXT "Left", -1, 15, 22, 40, 13 EDITTEXT IDC_PARA_LEFT, 55, 20, 60, 13 - LTEXT "Right", 0, 15, 40, 40, 13 + LTEXT "Right", -1, 15, 40, 40, 13 EDITTEXT IDC_PARA_RIGHT, 55, 38, 60, 13 - LTEXT "First line", 0, 15, 58, 40, 13 + LTEXT "First line", -1, 15, 58, 40, 13 EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13 - LTEXT "Alignment", 0, 15, 87, 40, 13 + LTEXT "Alignment", -1, 15, 87, 40, 13 COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15 PUSHBUTTON "&Cancel", IDCANCEL, 137, 33, 50, 15 @@ -149,7 +149,7 @@ Caption "Tabs" FONT 8, "MS SHell DLg" BEGIN - GROUPBOX "Tab stops", 0, 10, 10, 120, 90 + GROUPBOX "Tab stops", -1, 10, 10, 120, 90 COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE | CBS_SORT DEFPUSHBUTTON "&Add", ID_TAB_ADD, 20, 80, 45, 15 PUSHBUTTON "&Remove", ID_TAB_DEL, 72, 80, 45, 15 @@ -163,11 +163,11 @@ Caption "" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Line wrapping", 0, 10, 10, 130, 85 + GROUPBOX "Line wrapping", -1, 10, 10, 130, 85 RADIOBUTTON "No line wrapping", IDC_PAGEFMT_WN, 18, 25, 117, 15 RADIOBUTTON "Wrap text by the &window border", IDC_PAGEFMT_WW, 18, 45, 117, 15 RADIOBUTTON "Wrap text by the &margin", IDC_PAGEFMT_WM, 18, 65, 117, 15 - GROUPBOX "Toolbars", 0, 150, 10, 120, 85 + GROUPBOX "Toolbars", -1, 150, 10, 120, 85 CHECKBOX "&Toolbar", IDC_PAGEFMT_TB, 160, 20, 80, 15 CHECKBOX "&Formatbar", IDC_PAGEFMT_FB, 160, 38, 80, 15 CHECKBOX "&Ruler", IDC_PAGEFMT_RU, 160, 56, 80, 15 Modified: trunk/reactos/base/applications/wordpad/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Ja.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Ja.rc [iso-8859-1] Sat Jan 17 13:10:56 2009 @@ -112,7 +112,7 @@ CAPTION "æ¥ä»ã¨æå»" FONT 9, "MS Shell Dlg" BEGIN - LTEXT "å©ç¨ã§ããå½¢å¼",0,3,2,100,15 + LTEXT "å©ç¨ã§ããå½¢å¼",-1,3,2,100,15 LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT|LBS_NOTIFY PUSHBUTTON "&OK",IDOK,87,12,40,12 PUSHBUTTON "ãã£ã³ã»ã«(&C)",IDCANCEL,87,26,40,12 @@ -123,7 +123,7 @@ CAPTION "æ°è¦ä½æ" FONT 9, "MS Shell Dlg" BEGIN - LTEXT "æ°ããææ¸å½¢å¼",0,3,2,100,15 + LTEXT "æ°ããææ¸å½¢å¼",-1,3,2,100,15 LISTBOX IDC_NEWFILE,3,12,90,65,LBS_NOINTEGRALHEIGHT PUSHBUTTON "&OK",IDOK,97,12,40,12 PUSHBUTTON "ãã£ã³ã»ã«(&C)",IDCANCEL,97,26,40,12 @@ -134,14 +134,14 @@ CAPTION "æ®µè½ã®è¨å®" FONT 9, "MS Shell Dlg" BEGIN - GROUPBOX "ã¤ã³ãã³ã", 0, 10, 10, 120, 68 - LTEXT "å·¦(&L)", 0, 15, 22, 40, 13 + GROUPBOX "ã¤ã³ãã³ã", -1, 10, 10, 120, 68 + LTEXT "å·¦(&L)", -1, 15, 22, 40, 13 EDITTEXT IDC_PARA_LEFT, 55, 20, 60, 13 - LTEXT "å³(&R)", 0, 15, 40, 40, 13 + LTEXT "å³(&R)", -1, 15, 40, 40, 13 EDITTEXT IDC_PARA_RIGHT, 55, 38, 60, 13 - LTEXT "æåã®è¡(&F)", 0, 15, 58, 40, 13 + LTEXT "æåã®è¡(&F)", -1, 15, 58, 40, 13 EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13 - LTEXT "æ´å(&A)", 0, 15, 87, 40, 13 + LTEXT "æ´å(&A)", -1, 15, 87, 40, 13 COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15 PUSHBUTTON "ãã£ã³ã»ã«(&C)", IDCANCEL, 137, 33, 50, 15 @@ -152,7 +152,7 @@ CAPTION "ã¿ãã®è¨å®" FONT 9, "MS Shell Dlg" BEGIN - GROUPBOX "ã¿ãã®åæ¢ä½ç½®(&T)", 0, 10, 10, 120, 90 + GROUPBOX "ã¿ãã®åæ¢ä½ç½®(&T)", -1, 10, 10, 120, 90 COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE | CBS_SORT DEFPUSHBUTTON "è¿½å (&A)", ID_TAB_ADD, 20, 80, 45, 15 PUSHBUTTON "åé¤(&R)", ID_TAB_DEL, 72, 80, 45, 15 @@ -166,11 +166,11 @@ CAPTION "" FONT 9, "MS Shell Dlg" BEGIN - GROUPBOX "è¡ã®æãè¿ã", 0, 10, 10, 130, 85 + GROUPBOX "è¡ã®æãè¿ã", -1, 10, 10, 130, 85 RADIOBUTTON "No line wrapping", IDC_PAGEFMT_WN, 18, 25, 117, 15 RADIOBUTTON "ã¦ã£ã³ãã¦ã®å¢çã§æãè¿ã(&W)", IDC_PAGEFMT_WW, 18, 45, 117, 15 RADIOBUTTON "ãã¼ã¸ã³ã§æãè¿ã(&M)", IDC_PAGEFMT_WM, 18, 65, 117, 15 - GROUPBOX "ãã¼ã«ãã¼", 0, 150, 10, 120, 85 + GROUPBOX "ãã¼ã«ãã¼", -1, 150, 10, 120, 85 CHECKBOX "ãã¼ã«ãã¼(&T)", IDC_PAGEFMT_TB, 160, 20, 80, 15 CHECKBOX "æ¸å¼ãã¼(&F)", IDC_PAGEFMT_FB, 160, 38, 80, 15 CHECKBOX "ã«ã¼ã©ã¼(&R)", IDC_PAGEFMT_RU, 160, 56, 80, 15 Modified: trunk/reactos/base/applications/wordpad/Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Ko.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Ko.rc [iso-8859-1] Sat Jan 17 13:10:56 2009 @@ -111,7 +111,7 @@ CAPTION "³¯Â¥¿Í ½Ã°£" FONT 10, "MS Shell Dlg" BEGIN - LTEXT "°¡´ÉÇÑ Çü½Ä",0,3,2,100,15 + LTEXT "°¡´ÉÇÑ Çü½Ä",-1,3,2,100,15 LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT | LBS_NOTIFY PUSHBUTTON "È®ÀÎ(&O)",IDOK,87,12,40,12 PUSHBUTTON "Ãë¼Ò(&C)",IDCANCEL,87,26,40,12 @@ -122,7 +122,7 @@ CAPTION "»õ ¹®¼" FONT 10, "MS Shell Dlg" BEGIN - LTEXT "»õ ¹®¼ Çü½Ä",0,3,2,100,15 + LTEXT "»õ ¹®¼ Çü½Ä",-1,3,2,100,15 LISTBOX IDC_NEWFILE,3,12,90,65,LBS_NOINTEGRALHEIGHT PUSHBUTTON "È®ÀÎ(&O)",IDOK,97,12,40,12 PUSHBUTTON "Ãë¼Ò(&C)",IDCANCEL,97,26,40,12 @@ -133,14 +133,14 @@ Caption "´Ü¶ô Çü½Ä" FONT 9, "MS Shell Dlg" BEGIN - GROUPBOX "µé¿©¾²±â", 0, 10, 10, 120, 68 - LTEXT "¿ÞÂÊ", 0, 15, 22, 40, 13 + GROUPBOX "µé¿©¾²±â", -1, 10, 10, 120, 68 + LTEXT "¿ÞÂÊ", -1, 15, 22, 40, 13 EDITTEXT IDC_PARA_LEFT, 55, 20, 60, 13 - LTEXT "¿À¸¥ÂÊ", 0, 15, 40, 40, 13 + LTEXT "¿À¸¥ÂÊ", -1, 15, 40, 40, 13 EDITTEXT IDC_PARA_RIGHT, 55, 38, 60, 13 - LTEXT "Ã¹Â° ÁÙ", 0, 15, 58, 40, 13 + LTEXT "Ã¹Â° ÁÙ", -1, 15, 58, 40, 13 EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13 - LTEXT "Á¤·Ä", 0, 15, 87, 40, 13 + LTEXT "Á¤·Ä", -1, 15, 87, 40, 13 COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST PUSHBUTTON "È®ÀÎ(&O)", IDOK, 137, 15, 50, 15 PUSHBUTTON "Ãë¼Ò(&C)", IDCANCEL, 137, 33, 50, 15 @@ -151,7 +151,7 @@ Caption "ÅÇ" FONT 9, "MS Shell Dlg" BEGIN - GROUPBOX "ÅÇ Á¤Áö", 0, 10, 10, 120, 90 + GROUPBOX "ÅÇ Á¤Áö", -1, 10, 10, 120, 90 COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE | CBS_SORT DEFPUSHBUTTON "´õÇÏ±â(&A)", ID_TAB_ADD, 20, 80, 45, 15 PUSHBUTTON "Áö¿ì±â(&R)", ID_TAB_DEL, 72, 80, 45, 15 @@ -165,11 +165,11 @@ Caption "" FONT 9, "MS Shell Dlg" BEGIN - GROUPBOX "ÁÙ ³Ñ±â±â", 0, 10, 10, 130, 85 + GROUPBOX "ÁÙ ³Ñ±â±â", -1, 10, 10, 130, 85 RADIOBUTTON "ÁÙ³Ñ±âÁö ¾ÊÀ½", IDC_PAGEFMT_WN, 18, 25, 117, 15 RADIOBUTTON "Ã¢ °¡ÀåÀÚ¸®¼ ±Û ³Ñ±â±â(&W)", IDC_PAGEFMT_WW, 18, 45, 117, 15 RADIOBUTTON "°¡ÀåÀÚ¸®¿¡¼ ÁÙ ³Ñ±â±â(&M)", IDC_PAGEFMT_WM, 18, 65, 117, 15 - GROUPBOX " µµ±¸¹Ù", 0, 150, 10, 120, 85 + GROUPBOX " µµ±¸¹Ù", -1, 150, 10, 120, 85 CHECKBOX "µµ±¸¹Ù(&T)", IDC_PAGEFMT_TB, 160, 20, 80, 15 CHECKBOX "Çü½Ä¹Ù(&F)", IDC_PAGEFMT_FB, 160, 38, 80, 15 CHECKBOX "±æÀÌ¹Ù(&R)", IDC_PAGEFMT_RU, 160, 56, 80, 15 Modified: trunk/reactos/base/applications/wordpad/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Nl.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Nl.rc [iso-8859-1] Sat Jan 17 13:10:56 2009 @@ -110,7 +110,7 @@ CAPTION "Datum en tijd" FONT 10, "MS Sans Serif" BEGIN - LTEXT "Beschikbare formaten",0,3,2,100,15 + LTEXT "Beschikbare formaten",-1,3,2,100,15 LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT | LBS_NOTIFY PUSHBUTTON "&OK",IDOK,87,12,40,12 PUSHBUTTON "&Annuleren",IDCANCEL,87,26,40,12 @@ -121,7 +121,7 @@ CAPTION "Nieuw" FONT 10, "MS Sans Serif" BEGIN - LTEXT "Nieuw document type",0,3,2,100,15 + LTEXT "Nieuw document type",-1,3,2,100,15 LISTBOX IDC_NEWFILE,3,12,90,65,LBS_NOINTEGRALHEIGHT PUSHBUTTON "&OK",IDOK,97,12,40,12 PUSHBUTTON "&Annuleren",IDCANCEL,97,26,40,12 @@ -132,14 +132,14 @@ Caption "Paragraaf formaat" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Indentation", 0, 10, 10, 120, 68 - LTEXT "Links", 0, 15, 22, 40, 13 + GROUPBOX "Indentation", -1, 10, 10, 120, 68 + LTEXT "Links", -1, 15, 22, 40, 13 EDITTEXT IDC_PARA_LEFT, 55, 20, 60, 13 - LTEXT "Rechts", 0, 15, 40, 40, 13 + LTEXT "Rechts", -1, 15, 40, 40, 13 EDITTEXT IDC_PARA_RIGHT, 55, 38, 60, 13 - LTEXT "Eerste regel", 0, 15, 58, 40, 13 + LTEXT "Eerste regel", -1, 15, 58, 40, 13 EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13 - LTEXT "Uitlijning", 0, 15, 87, 40, 13 + LTEXT "Uitlijning", -1, 15, 87, 40, 13 COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15 PUSHBUTTON "&Annuleren", IDCANCEL, 137, 33, 50, 15 @@ -150,7 +150,7 @@ Caption "Tabs" FONT 8, "MS SHell DLg" BEGIN - GROUPBOX "Tab stops", 0, 10, 10, 120, 90 + GROUPBOX "Tab stops", -1, 10, 10, 120, 90 COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE | CBS_SORT DEFPUSHBUTTON "&Toevoegen", ID_TAB_ADD, 20, 80, 45, 15 PUSHBUTTON "&Verwijderen", ID_TAB_DEL, 72, 80, 45, 15 @@ -164,11 +164,11 @@ Caption "" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Regel afbreken", 0, 10, 10, 130, 85 + GROUPBOX "Regel afbreken", -1, 10, 10, 130, 85 RADIOBUTTON "No line wrapping", IDC_PAGEFMT_WN, 18, 25, 117, 15 RADIOBUTTON "Breek tekst af bij &venster rand", IDC_PAGEFMT_WW, 18, 45, 117, 15 RADIOBUTTON "Breek tekst af bij de &marge", IDC_PAGEFMT_WM, 18, 65, 117, 15 - GROUPBOX "Toolbars", 0, 150, 10, 120, 85 + GROUPBOX "Toolbars", -1, 150, 10, 120, 85 CHECKBOX "&Toolbalk", IDC_PAGEFMT_TB, 160, 20, 80, 15 CHECKBOX "&Formaatbalk", IDC_PAGEFMT_FB, 160, 38, 80, 15 CHECKBOX "&Lineaal", IDC_PAGEFMT_RU, 160, 56, 80, 15 Modified: trunk/reactos/base/applications/wordpad/No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/No.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/No.rc [iso-8859-1] Sat Jan 17 13:10:56 2009 @@ -109,7 +109,7 @@ CAPTION "Dato og klokkeslett" FONT 10, "MS Sans Serif" BEGIN - LTEXT "Tilgjengelige formater",0,3,2,100,15 + LTEXT "Tilgjengelige formater",-1,3,2,100,15 LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT | LBS_NOTIFY PUSHBUTTON "&OK",IDOK,87,12,40,12 PUSHBUTTON "&Avbryt",IDCANCEL,87,26,40,12 @@ -120,7 +120,7 @@ CAPTION "Ny" FONT 10, "MS Sans Serif" BEGIN - LTEXT "Ny dokumenttype",0,3,2,100,15 + LTEXT "Ny dokumenttype",-1,3,2,100,15 LISTBOX IDC_NEWFILE,3,12,90,65,LBS_NOINTEGRALHEIGHT PUSHBUTTON "&OK",IDOK,97,12,40,12 PUSHBUTTON "&Avbryt",IDCANCEL,97,26,40,12 @@ -131,14 +131,14 @@ Caption "Formater avsnitt" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Innrykk", 0, 10, 10, 120, 68 - LTEXT "Venstre", 0, 15, 22, 40, 13 + GROUPBOX "Innrykk", -1, 10, 10, 120, 68 + LTEXT "Venstre", -1, 15, 22, 40, 13 EDITTEXT IDC_PARA_LEFT, 55, 20, 60, 13 - LTEXT "Høyre", 0, 15, 40, 40, 13 + LTEXT "Høyre", -1, 15, 40, 40, 13 EDITTEXT IDC_PARA_RIGHT, 55, 38, 60, 13 - LTEXT "Første linje", 0, 15, 58, 40, 13 + LTEXT "Første linje", -1, 15, 58, 40, 13 EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13 - LTEXT "Justering", 0, 15, 87, 40, 13 + LTEXT "Justering", -1, 15, 87, 40, 13 COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15 PUSHBUTTON "&Avbryt", IDCANCEL, 137, 33, 50, 15 @@ -149,7 +149,7 @@ Caption "Tabulatorer" FONT 8, "MS SHell DLg" BEGIN - GROUPBOX "Tabulatorstopp", 0, 10, 10, 120, 90 + GROUPBOX "Tabulatorstopp", -1, 10, 10, 120, 90 COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE | CBS_SORT DEFPUSHBUTTON "&Legg til", ID_TAB_ADD, 20, 80, 45, 15 PUSHBUTTON "&Fjern", ID_TAB_DEL, 72, 80, 45, 15 @@ -163,11 +163,11 @@ Caption "" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Linjebryting", 0, 10, 10, 130, 85 + GROUPBOX "Linjebryting", -1, 10, 10, 130, 85 RADIOBUTTON "No line wrapping", IDC_PAGEFMT_WN, 18, 25, 117, 15 RADIOBUTTON "Bryt tekst etter v&indusbredden", IDC_PAGEFMT_WW, 18, 45, 117, 15 RADIOBUTTON "Bryt tekst etter &margen", IDC_PAGEFMT_WM, 18, 65, 117, 15 - GROUPBOX "Verktøylinjer", 0, 150, 10, 120, 85 + GROUPBOX "Verktøylinjer", -1, 150, 10, 120, 85 CHECKBOX "&Verktøylinje", IDC_PAGEFMT_TB, 160, 20, 80, 15 CHECKBOX "&Formatlinje", IDC_PAGEFMT_FB, 160, 38, 80, 15 CHECKBOX "&Linjal", IDC_PAGEFMT_RU, 160, 56, 80, 15 Modified: trunk/reactos/base/applications/wordpad/Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Pl.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Pl.rc [iso-8859-1] Sat Jan 17 13:10:56 2009 @@ -110,7 +110,7 @@ CAPTION "Data i godzina" FONT 10, "MS Sans Serif" BEGIN - LTEXT "Dostêpne formaty",0,3,2,100,15 + LTEXT "Dostêpne formaty",-1,3,2,100,15 LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT | LBS_NOTIFY PUSHBUTTON "&OK",IDOK,87,12,40,12 PUSHBUTTON "&Anuluj",IDCANCEL,87,26,40,12 @@ -121,7 +121,7 @@ CAPTION "Nowy" FONT 10, "MS Sans Serif" BEGIN - LTEXT "Typ nowego dokumentu",0,3,2,100,15 + LTEXT "Typ nowego dokumentu",-1,3,2,100,15 LISTBOX IDC_NEWFILE,3,12,90,65,LBS_NOINTEGRALHEIGHT PUSHBUTTON "&OK",IDOK,97,12,40,12 PUSHBUTTON "&Anuluj",IDCANCEL,97,26,40,12 @@ -132,14 +132,14 @@ Caption "Format akapitu" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Wciêcia", 0, 10, 10, 120, 68 - LTEXT "Z lewej", 0, 15, 22, 40, 13 + GROUPBOX "Wciêcia", -1, 10, 10, 120, 68 + LTEXT "Z lewej", -1, 15, 22, 40, 13 EDITTEXT IDC_PARA_LEFT, 55, 20, 60, 13 - LTEXT "Z prawej", 0, 15, 40, 40, 13 + LTEXT "Z prawej", -1, 15, 40, 40, 13 EDITTEXT IDC_PARA_RIGHT, 55, 38, 60, 13 - LTEXT "Pierwszy wiersz", 0, 15, 55, 40, 19 + LTEXT "Pierwszy wiersz", -1, 15, 55, 40, 19 EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13 - LTEXT "Wyrównanie", 0, 15, 87, 40, 13 + LTEXT "Wyrównanie", -1, 15, 87, 40, 13 COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15 PUSHBUTTON "&Anuluj", IDCANCEL, 137, 33, 50, 15 @@ -150,7 +150,7 @@ Caption "Tabulatory" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Pozycje tabulatorów", 0, 10, 10, 120, 90 + GROUPBOX "Pozycje tabulatorów", -1, 10, 10, 120, 90 COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE | CBS_SORT DEFPUSHBUTTON "&Dodaj", ID_TAB_ADD, 20, 80, 45, 15 PUSHBUTTON "&Usuñ", ID_TAB_DEL, 72, 80, 45, 15 @@ -164,11 +164,11 @@ Caption "" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Zawijanie wierszy", 0, 10, 10, 130, 85 + GROUPBOX "Zawijanie wierszy", -1, 10, 10, 130, 85 RADIOBUTTON "No line wrapping", IDC_PAGEFMT_WN, 18, 25, 117, 15 RADIOBUTTON "Zawijaj do &brzegu okna", IDC_PAGEFMT_WW, 18, 45, 117, 15 RADIOBUTTON "Zawijaj do &marginesu", IDC_PAGEFMT_WM, 18, 65, 117, 15 - GROUPBOX "Paski narzêdzi", 0, 150, 10, 120, 85 + GROUPBOX "Paski narzêdzi", -1, 150, 10, 120, 85 CHECKBOX "Pasek &narzêdzi", IDC_PAGEFMT_TB, 160, 20, 80, 15 CHECKBOX "Pasek &formatu", IDC_PAGEFMT_FB, 160, 38, 80, 15 CHECKBOX "&Linijka", IDC_PAGEFMT_RU, 160, 56, 80, 15 Modified: trunk/reactos/base/applications/wordpad/Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Pt.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Pt.rc [iso-8859-1] Sat Jan 17 13:10:56 2009 @@ -111,7 +111,7 @@ CAPTION "Data e hora" FONT 10, "MS Sans Serif" BEGIN - LTEXT "Formatos Disponíveis",0,3,2,100,15 + LTEXT "Formatos Disponíveis",-1,3,2,100,15 LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT | LBS_NOTIFY PUSHBUTTON "&OK",IDOK,87,12,40,12 PUSHBUTTON "&Cancelar",IDCANCEL,87,26,40,12 @@ -122,7 +122,7 @@ CAPTION "Novo" FONT 10, "MS Sans Serif" BEGIN - LTEXT "Novo tipo de documento",0,3,2,100,15 + LTEXT "Novo tipo de documento",-1,3,2,100,15 LISTBOX IDC_NEWFILE,3,12,90,65,LBS_NOINTEGRALHEIGHT PUSHBUTTON "&OK",IDOK,97,12,40,12 PUSHBUTTON "&Cancelar",IDCANCEL,97,26,40,12 @@ -133,14 +133,14 @@ Caption "Parágrafo" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Identação", 0, 10, 10, 120, 68 - LTEXT "Esquerda", 0, 15, 22, 40, 13 + GROUPBOX "Identação", -1, 10, 10, 120, 68 + LTEXT "Esquerda", -1, 15, 22, 40, 13 EDITTEXT IDC_PARA_LEFT, 55, 20, 60, 13 - LTEXT "Direita", 0, 15, 40, 40, 13 + LTEXT "Direita", -1, 15, 40, 40, 13 EDITTEXT IDC_PARA_RIGHT, 55, 38, 60, 13 - LTEXT "Primeira Linha", 0, 15, 58, 40, 13 + LTEXT "Primeira Linha", -1, 15, 58, 40, 13 EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13 - LTEXT "Alinhamento", 0, 15, 87, 40, 13 + LTEXT "Alinhamento", -1, 15, 87, 40, 13 COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15 PUSHBUTTON "&Cancelar", IDCANCEL, 137, 33, 50, 15 @@ -151,7 +151,7 @@ Caption "Tabulações" FONT 8, "MS SHell DLg" BEGIN - GROUPBOX "Marca de tabulação", 0, 10, 10, 120, 90 + GROUPBOX "Marca de tabulação", -1, 10, 10, 120, 90 COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE | CBS_SORT DEFPUSHBUTTON "&Adicionar", ID_TAB_ADD, 20, 80, 45, 15 PUSHBUTTON "&Remover", ID_TAB_DEL, 72, 80, 45, 15 @@ -165,11 +165,11 @@ Caption "" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Moldar o texto", 0, 10, 10, 130, 85 + GROUPBOX "Moldar o texto", -1, 10, 10, 130, 85 RADIOBUTTON "&Sem moldagem", IDC_PAGEFMT_WN, 18, 25, 117, 15 RADIOBUTTON "&Moldar à janela", IDC_PAGEFMT_WW, 18, 45, 117, 15 RADIOBUTTON "Moldar pela &régua", IDC_PAGEFMT_WM, 18, 65, 117, 15 - GROUPBOX "Barras de Ferramentas", 0, 150, 10, 120, 85 + GROUPBOX "Barras de Ferramentas", -1, 150, 10, 120, 85 CHECKBOX "&Barra de Ferramentas", IDC_PAGEFMT_TB, 160, 20, 90, 15 CHECKBOX "Barra de &Formatação", IDC_PAGEFMT_FB, 160, 38, 90, 15 CHECKBOX "&Régua", IDC_PAGEFMT_RU, 160, 56, 90, 15 Modified: trunk/reactos/base/applications/wordpad/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Ru.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Ru.rc [iso-8859-1] Sat Jan 17 13:10:56 2009 @@ -109,7 +109,7 @@ CAPTION "Äàòà è âðåìÿ" FONT 10, "MS Sans Serif" BEGIN - LTEXT "Äîñòóïíûå ôîðìàòû",0,3,2,100,15 + LTEXT "Äîñòóïíûå ôîðìàòû",-1,3,2,100,15 LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT | LBS_NOTIFY PUSHBUTTON "&ÎÊ",IDOK,87,12,40,12 PUSHBUTTON "Î&òìåíà",IDCANCEL,87,26,40,12 @@ -120,7 +120,7 @@ CAPTION "Íîâûé äîêóìåíò" FONT 10, "MS Sans Serif" BEGIN - LTEXT "Òèï ñîçäàâàåìîãî äîêóìåíòà",0,3,2,100,15 + LTEXT "Òèï ñîçäàâàåìîãî äîêóìåíòà",-1,3,2,100,15 LISTBOX IDC_NEWFILE,3,12,90,65,LBS_NOINTEGRALHEIGHT PUSHBUTTON "&ÎÊ",IDOK,97,12,40,12 PUSHBUTTON "Î&òìåíà",IDCANCEL,97,26,40,12 @@ -131,14 +131,14 @@ Caption "Àáçàö" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Îòñòóï", 0, 10, 10, 120, 68 - LTEXT "Ñëåâà", 0, 15, 22, 40, 13 + GROUPBOX "Îòñòóï", -1, 10, 10, 120, 68 + LTEXT "Ñëåâà", -1, 15, 22, 40, 13 EDITTEXT IDC_PARA_LEFT, 55, 20, 60, 13 - LTEXT "Ñïðàâà", 0, 15, 40, 40, 13 + LTEXT "Ñïðàâà", -1, 15, 40, 40, 13 EDITTEXT IDC_PARA_RIGHT, 55, 38, 60, 13 - LTEXT "Ïåðâàÿ ñòðîêà", 0, 15, 58, 40, 13 + LTEXT "Ïåðâàÿ ñòðîêà", -1, 15, 58, 40, 13 EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13 - LTEXT "Âûðàâíèâàíèå", 0, 15, 87, 40, 13 + LTEXT "Âûðàâíèâàíèå", -1, 15, 87, 40, 13 COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST PUSHBUTTON "&ÎÊ", IDOK, 137, 15, 50, 15 PUSHBUTTON "Î&òìåíà", IDCANCEL, 137, 33, 50, 15 @@ -149,7 +149,7 @@ Caption "Òàáóëÿöèÿ" FONT 8, "MS SHell DLg" BEGIN - GROUPBOX "Ïîçèöèè òàáóëÿöèè", 0, 10, 10, 120, 90 + GROUPBOX "Ïîçèöèè òàáóëÿöèè", -1, 10, 10, 120, 90 COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE | CBS_SORT DEFPUSHBUTTON "&Óñòàíîâèòü", ID_TAB_ADD, 20, 80, 45, 15 PUSHBUTTON "Î&÷èñòèòü", ID_TAB_DEL, 72, 80, 45, 15 @@ -163,11 +163,11 @@ Caption "" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Ïåðåíîñ ïî ñëîâàì", 0, 10, 10, 130, 85 + GROUPBOX "Ïåðåíîñ ïî ñëîâàì", -1, 10, 10, 130, 85 RADIOBUTTON "No line wrapping", IDC_PAGEFMT_WN, 18, 25, 117, 15 RADIOBUTTON "Â ãðàíèöàõ &îêíà", IDC_PAGEFMT_WW, 18, 45, 117, 15 RADIOBUTTON "Â ãðàíèöàõ &ïîëåé", IDC_PAGEFMT_WM, 18, 65, 117, 15 - GROUPBOX "Ïàíåëè", 0, 150, 10, 120, 85 + GROUPBOX "Ïàíåëè", -1, 150, 10, 120, 85 CHECKBOX "&Èíñòðóìåíòîâ", IDC_PAGEFMT_TB, 160, 20, 80, 15 CHECKBOX "&Ôîðìàòèðîâàíèÿ", IDC_PAGEFMT_FB, 160, 38, 80, 15 CHECKBOX "&Ëèíåéêà", IDC_PAGEFMT_RU, 160, 56, 80, 15 Modified: trunk/reactos/base/applications/wordpad/Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Si.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Si.rc [iso-8859-1] Sat Jan 17 13:10:56 2009 @@ -111,7 +111,7 @@ CAPTION "Datum in Äas" FONT 10, "MS Sans Serif" BEGIN - LTEXT "RazpoloÅ¾ljive oblike",0,3,2,100,15 + LTEXT "RazpoloÅ¾ljive oblike",-1,3,2,100,15 LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT | LBS_NOTIFY PUSHBUTTON "&V redu",IDOK,87,12,40,12 PUSHBUTTON "&PrekliÄi",IDCANCEL,87,26,40,12 @@ -122,7 +122,7 @@ CAPTION "Nov dokument" FONT 10, "MS Sans Serif" BEGIN - LTEXT "Vrsta dokumenta",0,3,2,100,15 + LTEXT "Vrsta dokumenta",-1,3,2,100,15 LISTBOX IDC_NEWFILE,3,12,90,65,LBS_NOINTEGRALHEIGHT PUSHBUTTON "&V redu",IDOK,97,12,40,12 PUSHBUTTON "&PrekliÄi",IDCANCEL,97,26,40,12 @@ -133,14 +133,14 @@ Caption "Oblika odstavka" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Zamiki", 0, 10, 10, 120, 68 - LTEXT "Levo", 0, 15, 22, 40, 13 + GROUPBOX "Zamiki", -1, 10, 10, 120, 68 + LTEXT "Levo", -1, 15, 22, 40, 13 EDITTEXT IDC_PARA_LEFT, 55, 20, 60, 13 - LTEXT "Desno", 0, 15, 40, 40, 13 + LTEXT "Desno", -1, 15, 40, 40, 13 EDITTEXT IDC_PARA_RIGHT, 55, 38, 60, 13 - LTEXT "Prva vrstica", 0, 15, 58, 40, 13 + LTEXT "Prva vrstica", -1, 15, 58, 40, 13 EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13 - LTEXT "Poravnava", 0, 15, 87, 40, 13 + LTEXT "Poravnava", -1, 15, 87, 40, 13 COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST PUSHBUTTON "&V redu", IDOK, 137, 15, 50, 15 PUSHBUTTON "&PrekliÄi", IDCANCEL, 137, 33, 50, 15 @@ -151,7 +151,7 @@ Caption "Tabulatorji" FONT 8, "MS SHell DLg" BEGIN - GROUPBOX "PoloÅ¾aji tabulatorja", 0, 10, 10, 120, 90 + GROUPBOX "PoloÅ¾aji tabulatorja", -1, 10, 10, 120, 90 COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE | CBS_SORT DEFPUSHBUTTON "&Dodaj", ID_TAB_ADD, 20, 80, 45, 15 PUSHBUTTON "&Odstrani", ID_TAB_DEL, 72, 80, 45, 15 @@ -165,11 +165,11 @@ Caption "" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Prelom vrstic", 0, 10, 10, 130, 85 + GROUPBOX "Prelom vrstic", -1, 10, 10, 130, 85 RADIOBUTTON "No line wrapping", IDC_PAGEFMT_WN, 18, 25, 117, 15 RADIOBUTTON "Prelomi besedilo na robu o&kna", IDC_PAGEFMT_WW, 18, 45, 117, 15 RADIOBUTTON "Prelomi besedilo na robu &papirja", IDC_PAGEFMT_WM, 18, 65, 117, 15 - GROUPBOX "Orodne vrstice", 0, 150, 10, 120, 85 + GROUPBOX "Orodne vrstice", -1, 150, 10, 120, 85 CHECKBOX "O&rodna vrstica", IDC_PAGEFMT_TB, 160, 20, 80, 15 CHECKBOX "O&blikovna vrstica", IDC_PAGEFMT_FB, 160, 38, 80, 15 CHECKBOX "&Ravnilo", IDC_PAGEFMT_RU, 160, 56, 80, 15 Modified: trunk/reactos/base/applications/wordpad/Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Tr.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Tr.rc [iso-8859-1] Sat Jan 17 13:10:56 2009 @@ -111,7 +111,7 @@ CAPTION "Date and time" FONT 10, "MS Sans Serif" BEGIN - LTEXT "Available formats",0,3,2,100,15 + LTEXT "Available formats",-1,3,2,100,15 LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT | LBS_NOTIFY PUSHBUTTON "&OK",IDOK,87,12,40,12 PUSHBUTTON "&Cancel",IDCANCEL,87,26,40,12 @@ -122,7 +122,7 @@ CAPTION "New" FONT 10, "MS Sans Serif" BEGIN - LTEXT "New document type",0,3,2,100,15 + LTEXT "New document type",-1,3,2,100,15 LISTBOX IDC_NEWFILE,3,12,90,65,LBS_NOINTEGRALHEIGHT PUSHBUTTON "&OK",IDOK,97,12,40,12 PUSHBUTTON "&Cancel",IDCANCEL,97,26,40,12 @@ -133,14 +133,14 @@ Caption "Paragraph format" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Indentation", 0, 10, 10, 120, 68 - LTEXT "Left", 0, 15, 22, 40, 13 + GROUPBOX "Indentation", -1, 10, 10, 120, 68 + LTEXT "Left", -1, 15, 22, 40, 13 EDITTEXT IDC_PARA_LEFT, 55, 20, 60, 13 - LTEXT "Right", 0, 15, 40, 40, 13 + LTEXT "Right", -1, 15, 40, 40, 13 EDITTEXT IDC_PARA_RIGHT, 55, 38, 60, 13 - LTEXT "First line", 0, 15, 58, 40, 13 + LTEXT "First line", -1, 15, 58, 40, 13 EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13 - LTEXT "Alignment", 0, 15, 87, 40, 13 + LTEXT "Alignment", -1, 15, 87, 40, 13 COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15 PUSHBUTTON "&Cancel", IDCANCEL, 137, 33, 50, 15 @@ -151,7 +151,7 @@ Caption "Tabs" FONT 8, "MS SHell DLg" BEGIN - GROUPBOX "Tab stops", 0, 10, 10, 120, 90 + GROUPBOX "Tab stops", -1, 10, 10, 120, 90 COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE | CBS_SORT DEFPUSHBUTTON "&Add", ID_TAB_ADD, 20, 80, 45, 15 PUSHBUTTON "&Remove", ID_TAB_DEL, 72, 80, 45, 15 @@ -165,11 +165,11 @@ Caption "" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Line wrapping", 0, 10, 10, 130, 85 + GROUPBOX "Line wrapping", -1, 10, 10, 130, 85 RADIOBUTTON "No line wrapping", IDC_PAGEFMT_WN, 18, 25, 117, 15 RADIOBUTTON "Wrap text by the &window border", IDC_PAGEFMT_WW, 18, 45, 117, 15 RADIOBUTTON "Wrap text by the &margin", IDC_PAGEFMT_WM, 18, 65, 117, 15 - GROUPBOX "Toolbars", 0, 150, 10, 120, 85 + GROUPBOX "Toolbars", -1, 150, 10, 120, 85 CHECKBOX "&Toolbar", IDC_PAGEFMT_TB, 160, 20, 80, 15 CHECKBOX "&Formatbar", IDC_PAGEFMT_FB, 160, 38, 80, 15 CHECKBOX "&Ruler", IDC_PAGEFMT_RU, 160, 56, 80, 15 Modified: trunk/reactos/base/applications/wordpad/Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Zh.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Zh.rc [iso-8859-1] Sat Jan 17 13:10:56 2009 @@ -114,7 +114,7 @@ CAPTION "æ¥æåæ¶é´" FONT 9, "MS Shell Dlg" BEGIN - LTEXT "å¯ç¨æ ¼å¼",0,3,2,100,15 + LTEXT "å¯ç¨æ ¼å¼",-1,3,2,100,15 LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT | LBS_NOTIFY PUSHBUTTON "ç¡®å®(&O)",IDOK,87,12,40,12 PUSHBUTTON "åæ¶(&C)",IDCANCEL,87,26,40,12 @@ -125,7 +125,7 @@ CAPTION "æ°å»º" FONT 9, "MS Shell Dlg" BEGIN - LTEXT "æ°æä»¶ç±»å",0,3,2,100,15 + LTEXT "æ°æä»¶ç±»å",-1,3,2,100,15 LISTBOX IDC_NEWFILE,3,12,90,65,LBS_NOINTEGRALHEIGHT PUSHBUTTON "ç¡®å®(&O)",IDOK,97,12,40,12 PUSHBUTTON "åæ¶(&C)",IDCANCEL,97,26,40,12 @@ -136,14 +136,14 @@ Caption "æ®µè½æ ¼å¼" FONT 9, "MS Shell Dlg" BEGIN - GROUPBOX "ç¼©è¿", 0, 10, 10, 120, 68 - LTEXT "å·¦", 0, 15, 22, 40, 13 + GROUPBOX "ç¼©è¿", -1, 10, 10, 120, 68 + LTEXT "å·¦", -1, 15, 22, 40, 13 EDITTEXT IDC_PARA_LEFT, 55, 20, 60, 13 - LTEXT "å³", 0, 15, 40, 40, 13 + LTEXT "å³", -1, 15, 40, 40, 13 EDITTEXT IDC_PARA_RIGHT, 55, 38, 60, 13 - LTEXT "ç¬¬ä¸è¡", 0, 15, 58, 40, 13 + LTEXT "ç¬¬ä¸è¡", -1, 15, 58, 40, 13 EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13 - LTEXT "å¯¹é½", 0, 15, 87, 40, 13 + LTEXT "å¯¹é½", -1, 15, 87, 40, 13 COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST PUSHBUTTON "ç¡®å®(&O)", IDOK, 137, 15, 50, 15 PUSHBUTTON "åæ¶(&C)", IDCANCEL, 137, 33, 50, 15 @@ -154,7 +154,7 @@ Caption "æ ç¾" FONT 9, "MS Shell Dlg" BEGIN - GROUPBOX "æ ç¾åç¹", 0, 10, 10, 120, 90 + GROUPBOX "æ ç¾åç¹", -1, 10, 10, 120, 90 COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE | CBS_SORT DEFPUSHBUTTON "æ·»å (&A)", ID_TAB_ADD, 20, 80, 45, 15 PUSHBUTTON "å é¤(&R)", ID_TAB_DEL, 72, 80, 45, 15 @@ -168,11 +168,11 @@ Caption "" FONT 9, "MS Shell Dlg" BEGIN - GROUPBOX "èªå¨æ¢è¡", 0, 10, 10, 130, 85 + GROUPBOX "èªå¨æ¢è¡", -1, 10, 10, 130, 85 RADIOBUTTON "No line wrapping", IDC_PAGEFMT_WN, 18, 25, 117, 15 RADIOBUTTON "æè§çªå®½åº¦(&W)", IDC_PAGEFMT_WW, 18, 45, 117, 15 RADIOBUTTON "æçº¸å¼ å®½åº¦(&M)", IDC_PAGEFMT_WM, 18, 65, 117, 15 - GROUPBOX "å·¥å·æ ", 0, 150, 10, 120, 85 + GROUPBOX "å·¥å·æ ", -1, 150, 10, 120, 85 CHECKBOX "å·¥å·æ (&T)", IDC_PAGEFMT_TB, 160, 20, 80, 15 CHECKBOX "æ ¼å¼å·¥å·æ (&F)", IDC_PAGEFMT_FB, 160, 38, 80, 15 CHECKBOX "æ å°º(&R)", IDC_PAGEFMT_RU, 160, 56, 80, 15 @@ -339,7 +339,7 @@ CAPTION "æ¥æåæé" FONT 9, "MS Shell Dlg" BEGIN - LTEXT "å¯ç¨æ ¼å¼",0,3,2,100,15 + LTEXT "å¯ç¨æ ¼å¼",-1,3,2,100,15 LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT PUSHBUTTON "ç¢ºå®(&O)",IDOK,87,12,40,12 PUSHBUTTON "åæ¶(&C)",IDCANCEL,87,26,40,12 @@ -350,7 +350,7 @@ CAPTION "æ°å»º" FONT 9, "MS Shell Dlg" BEGIN - LTEXT "æ°æªæ¡é¡å",0,3,2,100,15 + LTEXT "æ°æªæ¡é¡å",-1,3,2,100,15 LISTBOX IDC_NEWFILE,3,12,90,65,LBS_NOINTEGRALHEIGHT PUSHBUTTON "ç¢ºå®(&O)",IDOK,97,12,40,12 PUSHBUTTON "åæ¶(&C)",IDCANCEL,97,26,40,12 @@ -361,14 +361,14 @@ Caption "æ®µè½æ ¼å¼" FONT 9, "MS Shell Dlg" BEGIN - GROUPBOX "ç¸®é²", 0, 10, 10, 120, 68 - LTEXT "å·¦", 0, 15, 22, 40, 13 + GROUPBOX "ç¸®é²", -1, 10, 10, 120, 68 + LTEXT "å·¦", -1, 15, 22, 40, 13 EDITTEXT IDC_PARA_LEFT, 55, 20, 60, 13 - LTEXT "å³", 0, 15, 40, 40, 13 + LTEXT "å³", -1, 15, 40, 40, 13 EDITTEXT IDC_PARA_RIGHT, 55, 38, 60, 13 - LTEXT "ç¬¬ä¸è¡", 0, 15, 58, 40, 13 + LTEXT "ç¬¬ä¸è¡", -1, 15, 58, 40, 13 EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13 - LTEXT "å°é½", 0, 15, 87, 40, 13 + LTEXT "å°é½", -1, 15, 87, 40, 13 COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST PUSHBUTTON "ç¢ºå®(&O)", IDOK, 137, 15, 50, 15 PUSHBUTTON "åæ¶(&C)", IDCANCEL, 137, 33, 50, 15 @@ -379,7 +379,7 @@ Caption "æ¨ç±¤" FONT 9, "MS Shell Dlg" BEGIN - GROUPBOX "æ¨ç±¤åé»", 0, 10, 10, 120, 90 + GROUPBOX "æ¨ç±¤åé»", -1, 10, 10, 120, 90 COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE | CBS_SORT DEFPUSHBUTTON "æ·»å (&A)", ID_TAB_ADD, 20, 80, 45, 15 PUSHBUTTON "åªé¤(&R)", ID_TAB_DEL, 72, 80, 45, 15 @@ -393,10 +393,10 @@ Caption "" FONT 9, "MS Shell Dlg" BEGIN - GROUPBOX "èªåæè¡", 0, 10, 10, 130, 85 + GROUPBOX "èªåæè¡", -1, 10, 10, 130, 85 RADIOBUTTON "æè¦çªå¯¬åº¦(&W)", IDC_PAGEFMT_WW, 18, 25, 117, 15 RADIOBUTTON "æç´å¼µå¯¬åº¦(&M)", IDC_PAGEFMT_WM, 18, 45, 117, 15 - GROUPBOX "å·¥å·æ¬", 0, 150, 10, 120, 85 + GROUPBOX "å·¥å·æ¬", -1, 150, 10, 120, 85 CHECKBOX "å·¥å·æ¬(&T)", IDC_PAGEFMT_TB, 160, 20, 80, 15 CHECKBOX "æ ¼å¼å·¥å·æ¬(&F)", IDC_PAGEFMT_FB, 160, 38, 80, 15 CHECKBOX "æ¨å°º(&R)", IDC_PAGEFMT_RU, 160, 56, 80, 15 Modified: trunk/reactos/base/applications/wordpad/wordpad.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/wordpad.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/wordpad.c [iso-8859-1] Sat Jan 17 13:10:56 2009 @@ -1314,7 +1314,7 @@ static const WCHAR fmt[] = {'%','.','2','f',' ','%','s','\0'}; float converted = (float)number / (float)TWIPS_PER_INCH *(float)CENTMM_PER_INCH / 1000.0; - wsprintfW(buffer, fmt, converted, units_cmW); + sprintfW(buffer, fmt, converted, units_cmW); } static BOOL get_comboexlist_selection(HWND hComboEx, LPWSTR wszBuffer, UINT bufferLength) @@ -1341,7 +1341,7 @@ cbItem.iItem = idx; cbItem.pszText = wszBuffer; cbItem.cchTextMax = bufferLength-1; - result = SendMessageW(hComboEx, CBEM_GETITEM, 0, (LPARAM)&cbItem); + result = SendMessageW(hComboEx, CBEM_GETITEMW, 0, (LPARAM)&cbItem); return result != 0; }

1 0

[cwittich] 38833: sync cryptui with wine 1.1.13
by cwittich＠svn.reactos.org 17 Jan '09

17 Jan '09

Author: cwittich Date: Sat Jan 17 13:10:09 2009 New Revision: 38833 URL: http://svn.reactos.org/svn/reactos?rev=38833&view=rev Log: sync cryptui with wine 1.1.13 Modified: trunk/reactos/dll/win32/cryptui/cryptui.rc trunk/reactos/dll/win32/cryptui/cryptui_En.rc trunk/reactos/dll/win32/cryptui/cryptuires.h Modified: trunk/reactos/dll/win32/cryptui/cryptui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptui.… ============================================================================== --- trunk/reactos/dll/win32/cryptui/cryptui.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptui/cryptui.rc [iso-8859-1] Sat Jan 17 13:10:09 2009 @@ -47,3 +47,4 @@ IDB_CERT_HEADER BITMAP LOADONCALL DISCARDABLE certheader.bmp #include "cryptui_En.rc" +#include "cryptui_Ko.rc" Modified: trunk/reactos/dll/win32/cryptui/cryptui_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptui_… ============================================================================== --- trunk/reactos/dll/win32/cryptui/cryptui_En.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptui/cryptui_En.rc [iso-8859-1] Sat Jan 17 13:10:09 2009 @@ -148,15 +148,15 @@ STYLE WS_VISIBLE FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_STATIC, "Static", WS_BORDER|SS_WHITERECT, 6,10,241,200 + CONTROL "", -1, "Static", WS_BORDER|SS_WHITERECT, 6,10,241,200 CONTROL "", IDC_CERTIFICATE_ICON,"RichEdit20W", ES_READONLY|WS_DISABLED,8,11,26,26 CONTROL "", IDC_CERTIFICATE_INFO,"RichEdit20W", ES_READONLY|WS_DISABLED,34,11,212,26 - CONTROL "", IDC_STATIC, "Static", SS_BLACKFRAME, 16,37,222,1 + CONTROL "", -1, "Static", SS_BLACKFRAME, 16,37,222,1 CONTROL "", IDC_CERTIFICATE_STATUS,"RichEdit20W", ES_READONLY|ES_MULTILINE,8,38,238,78 - CONTROL "", IDC_STATIC, "Static", SS_BLACKFRAME, 16,116,222,1 + CONTROL "", -1, "Static", SS_BLACKFRAME, 16,116,222,1 CONTROL "", IDC_CERTIFICATE_NAMES,"RichEdit20W", ES_READONLY|ES_MULTILINE|WS_DISABLED,8,118,238,90 PUSHBUTTON "&Install Certificate...", IDC_ADDTOSTORE,103,216,70,14 @@ -168,7 +168,7 @@ STYLE WS_VISIBLE FONT 8, "MS Shell Dlg" BEGIN - LTEXT "&Show:", stc1, 6,12,40,14 + LTEXT "&Show:", -1, 6,12,40,14 COMBOBOX IDC_DETAIL_SELECT, 28,10,100,14, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP CONTROL "", IDC_DETAIL_LIST, "SysListView32", @@ -185,7 +185,7 @@ STYLE WS_VISIBLE FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Certification &path", grp1,6,10,245,165, BS_GROUPBOX + GROUPBOX "Certification &path", -1,6,10,245,165, BS_GROUPBOX CONTROL "",IDC_CERTPATH, "SysTreeView32", TVS_HASLINES|WS_BORDER, 13,22,231,130 PUSHBUTTON "&View Certificate", IDC_VIEWCERTIFICATE,175,156,70,14 @@ -210,11 +210,11 @@ STYLE WS_VISIBLE FONT 8, "MS Shell Dlg" BEGIN - LTEXT "&Friendly name:", stc1, 6,14,60,14 + LTEXT "&Friendly name:", -1, 6,14,60,14 EDITTEXT IDC_FRIENDLY_NAME, 60,12,191,14, ES_AUTOHSCROLL|WS_TABSTOP - LTEXT "&Description:", stc2, 6,32,60,14 + LTEXT "&Description:", -1, 6,32,60,14 EDITTEXT IDC_DESCRIPTION, 60,30,191,14, ES_AUTOVSCROLL|ES_MULTILINE|WS_TABSTOP|WS_VSCROLL - GROUPBOX "Certificate purposes", grp1,6,48,245,165, BS_GROUPBOX + GROUPBOX "Certificate purposes", -1,6,48,245,165, BS_GROUPBOX AUTORADIOBUTTON "&Enable all purposes for this certificate", IDC_ENABLE_ALL_PURPOSES, 12,58,180,14, BS_AUTORADIOBUTTON|WS_TABSTOP AUTORADIOBUTTON "D&isable all purposes for this certificate", @@ -232,7 +232,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Add the object identifier (OID) for the certificate purpose you wish to add:", - stc1, 6,6,190,28 + -1, 6,6,190,28 EDITTEXT IDC_NEW_PURPOSE, 6,28,190,14, ES_AUTOVSCROLL|ES_MULTILINE|WS_TABSTOP|WS_VSCROLL PUSHBUTTON "OK", IDOK, 33,48,60,14 PUSHBUTTON "Cancel", IDCANCEL, 100,48,60,14 @@ -258,34 +258,36 @@ LTEXT "Welcome to the Certificate Import Wizard", IDC_IMPORT_TITLE, 115,1,195,40 LTEXT "This wizard helps you import certificates, certificate revocation lists, and certificate trust lists from a file to a certificate store.", - stc1, 115,33,195,16 + -1, 115,33,195,16 LTEXT "A certificate can be used to identify you or the computer with which you are communicating. It can also be used for authentication, and to sign messages. Certificate stores are collections of certificates, certificate revocation lists, and certificate trust lists.", - stc2, 115,56,195,40 + -1, 115,56,195,40 LTEXT "To continue, click Next.", - stc3, 115,103,195,8 + -1, 115,103,195,8 END IDD_IMPORT_FILE DIALOG DISCARDABLE 0,0,317,143 CAPTION "Certificate Import Wizard" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "&File name:", stc1, 21,1,195,10 + LTEXT "&File name:", -1, 21,1,195,10 EDITTEXT IDC_IMPORT_FILENAME, 21,11,208,14, ES_AUTOHSCROLL|WS_TABSTOP PUSHBUTTON "B&rowse...", IDC_IMPORT_BROWSE_FILE, 236,11,60,14 - LTEXT "Note: The following file formats may contain more than one certificate, certificate revocation list, or certificate trust list:", stc2, 21,26,265,16 + LTEXT "Note: The following file formats may contain more than one certificate, certificate revocation list, or certificate trust list:", + -1, 21,26,265,16 LTEXT "Cryptographic Message Syntax Standard/PKCS #7 Messages (.p7b)", - stc3, 31,49,265,10 + -1, 31,49,265,10 LTEXT "Personal Information Exchange/PKCS #12 (.pfx, .p12)", - stc3, 31,64,265,10 + -1, 31,64,265,10 LTEXT "Microsoft Serialized Certificate Store (.sst)", - stc3, 31,79,265,10 + -1, 31,79,265,10 END IDD_IMPORT_STORE DIALOG DISCARDABLE 0,0,317,143 CAPTION "Certificate Import Wizard" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Wine can automatically select the certificate store, or you can specify a location for the certificates.", stc1, 21,1,195,20 + LTEXT "Wine can automatically select the certificate store, or you can specify a location for the certificates.", + -1, 21,1,195,20 AUTORADIOBUTTON "&Automatically select certificate store", IDC_IMPORT_AUTO_STORE, 31,18,180,12, BS_AUTORADIOBUTTON|WS_TABSTOP AUTORADIOBUTTON "&Place all certificates in the following store:", @@ -301,9 +303,9 @@ LTEXT "Completing the Certificate Import Wizard", IDC_IMPORT_TITLE, 115,1,195,40 LTEXT "You have successfully completed the Certificate Import Wizard.", - stc1, 115,33,195,24 + -1, 115,33,195,24 LTEXT "You have specified the following settings:", - stc2, 115,57,195,12 + -1, 115,57,195,12 CONTROL "", IDC_IMPORT_SETTINGS, "SysListView32", LVS_REPORT|LVS_NOCOLUMNHEADER|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 115,67,174,100 @@ -313,7 +315,7 @@ CAPTION "Certificates" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "I&ntended purpose:", IDC_STATIC, 7,9,100,12 + LTEXT "I&ntended purpose:", -1, 7,9,100,12 COMBOBOX IDC_MGR_PURPOSE_SELECTION, 83,7,245,14, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP CONTROL "", IDC_MGR_STORES, "SysTabControl32", @@ -324,7 +326,7 @@ PUSHBUTTON "&Export...", IDC_MGR_EXPORT, 62,172,51,14, WS_DISABLED PUSHBUTTON "&Remove", IDC_MGR_REMOVE, 117,172,51,14, WS_DISABLED PUSHBUTTON "&Advanced...", IDC_MGR_ADVANCED, 277,172,51,14 - GROUPBOX "Certificate intended purposes", grp1,7,194,321,47, BS_GROUPBOX + GROUPBOX "Certificate intended purposes", -1,7,194,321,47, BS_GROUPBOX LTEXT "", IDC_MGR_PURPOSES, 13,208,252,30 PUSHBUTTON "&View...", IDC_MGR_VIEW, 269,218,51,14, WS_DISABLED PUSHBUTTON "&Close", IDCANCEL, 277,249,51,14, BS_DEFPUSHBUTTON @@ -334,10 +336,10 @@ CAPTION "Advanced Options" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Certificate purpose", grp1, 7,7,234,141, BS_GROUPBOX + GROUPBOX "Certificate purpose", -1, 7,7,234,141, BS_GROUPBOX LTEXT "Select one or more purposes to be listed when Advanced Purposes is selected.", - IDC_STATIC, 14,18,220,16 - LTEXT "&Certificate purposes:", IDC_STATIC, 14,41,90,12, WS_TABSTOP + -1, 14,18,220,16 + LTEXT "&Certificate purposes:", -1, 14,41,90,12, WS_TABSTOP CONTROL "", IDC_CERTIFICATE_USAGES,"SysListView32", LVS_REPORT|LVS_NOCOLUMNHEADER|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 14,51,220,90 Modified: trunk/reactos/dll/win32/cryptui/cryptuires.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptuir… ============================================================================== --- trunk/reactos/dll/win32/cryptui/cryptuires.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptui/cryptuires.h [iso-8859-1] Sat Jan 17 13:10:09 2009 @@ -162,7 +162,6 @@ #define IDB_CERT_WATERMARK 205 #define IDB_CERT_HEADER 206 -#define IDC_STATIC 2000 #define IDC_CERTIFICATE_ICON 2001 #define IDC_CERTIFICATE_INFO 2002 #define IDC_CERTIFICATE_STATUS 2003

1 0

← Newer
1
...
39
40
41
42
43
44
45
...
76
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 January 2009