January 2011 - Wine-Commits

Kusanagi Kouichi : gdi32/tests: Add a test for GetCharABCWidthsA with DBCS.
by Alexandre Julliard Jan. 13, 2011

Jan. 13, 2011

Module: wine Branch: master Commit: fcb4a1610e97cde8ec8c266f2c7817768a4ba3ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcb4a1610e97cde8ec8c266f2… Author: Kusanagi Kouichi <slash(a)ac.auone-net.jp> Date: Thu Jan 13 19:17:45 2011 +0900 gdi32/tests: Add a test for GetCharABCWidthsA with DBCS. --- dlls/gdi32/tests/font.c | 65 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 63 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 4230ebc..9b9a5b4 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -38,6 +38,7 @@ static LONG (WINAPI *pGdiGetCharDimensions)(HDC hdc, LPTEXTMETRICW lptm, LONG *height); static BOOL (WINAPI *pGetCharABCWidthsI)(HDC hdc, UINT first, UINT count, LPWORD glyphs, LPABC abc); +static BOOL (WINAPI *pGetCharABCWidthsA)(HDC hdc, UINT first, UINT last, LPABC abc); static BOOL (WINAPI *pGetCharABCWidthsW)(HDC hdc, UINT first, UINT last, LPABC abc); static DWORD (WINAPI *pGetFontUnicodeRanges)(HDC hdc, LPGLYPHSET lpgs); static DWORD (WINAPI *pGetGlyphIndicesA)(HDC hdc, LPCSTR lpstr, INT count, LPWORD pgi, DWORD flags); @@ -55,6 +56,7 @@ static void init(void) pGdiGetCharDimensions = (void *)GetProcAddress(hgdi32, "GdiGetCharDimensions"); pGetCharABCWidthsI = (void *)GetProcAddress(hgdi32, "GetCharABCWidthsI"); + pGetCharABCWidthsA = (void *)GetProcAddress(hgdi32, "GetCharABCWidthsA"); pGetCharABCWidthsW = (void *)GetProcAddress(hgdi32, "GetCharABCWidthsW"); pGetFontUnicodeRanges = (void *)GetProcAddress(hgdi32, "GetFontUnicodeRanges"); pGetGlyphIndicesA = (void *)GetProcAddress(hgdi32, "GetGlyphIndicesA"); @@ -873,6 +875,25 @@ static void test_GdiGetCharDimensions(void) DeleteDC(hdc); } +static int CALLBACK create_font_proc(const LOGFONT *lpelfe, + const TEXTMETRIC *lpntme, + DWORD FontType, LPARAM lParam) +{ + if (FontType & TRUETYPE_FONTTYPE) + { + HFONT hfont; + + hfont = CreateFontIndirect(lpelfe); + if (hfont) + { + *(HFONT *)lParam = hfont; + return 0; + } + } + + return 1; +} + static void test_GetCharABCWidths(void) { static const WCHAR str[] = {'a',0}; @@ -883,10 +904,24 @@ static void test_GetCharABCWidths(void) ABC abc[1]; WORD glyphs[1]; DWORD nb; + static const struct + { + UINT cs; + UINT a; + UINT w; + } c[] = + { + {SHIFTJIS_CHARSET, 0x82a0, 0x3042}, + {HANGEUL_CHARSET, 0x8141, 0xac02}, + {JOHAB_CHARSET, 0x8446, 0x3135}, + {GB2312_CHARSET, 0x8141, 0x4e04}, + {CHINESEBIG5_CHARSET, 0xa142, 0x3001} + }; + UINT i; - if (!pGetCharABCWidthsW || !pGetCharABCWidthsI) + if (!pGetCharABCWidthsA || !pGetCharABCWidthsW || !pGetCharABCWidthsI) { - win_skip("GetCharABCWidthsW/I not available on this platform\n"); + win_skip("GetCharABCWidthsA/W/I not available on this platform\n"); return; } @@ -921,6 +956,32 @@ static void test_GetCharABCWidths(void) hfont = SelectObject(hdc, hfont); DeleteObject(hfont); + + for (i = 0; i < sizeof c / sizeof c[0]; ++i) + { + ABC a[2], w[2]; + + lf.lfFaceName[0] = '\0'; + lf.lfCharSet = c[i].cs; + lf.lfPitchAndFamily = 0; + if (EnumFontFamiliesEx(hdc, &lf, create_font_proc, (LPARAM)&hfont, 0)) + { + skip("TrueType font for charset %u is not installed\n", c[i].cs); + continue; + } + + memset(a, 0, sizeof a); + memset(w, 0, sizeof w); + hfont = SelectObject(hdc, hfont); + todo_wine + ok(pGetCharABCWidthsA(hdc, c[i].a, c[i].a + 1, a) && + pGetCharABCWidthsW(hdc, c[i].w, c[i].w + 1, w) && + memcmp(a, w, sizeof a) == 0, + "GetCharABCWidthsA and GetCharABCWidthsW should return same widths. charset = %u\n", c[i].cs); + hfont = SelectObject(hdc, hfont); + DeleteObject(hfont); + } + ReleaseDC(NULL, hdc); }

1 0

Kusanagi Kouichi : gdi32: GetCharABCWidthsA should work for DBCS.
by Alexandre Julliard Jan. 13, 2011

Jan. 13, 2011

Module: wine Branch: master Commit: 5c987fc57403a4ed26cd35b33318069913a66ab6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c987fc57403a4ed26cd35b33… Author: Kusanagi Kouichi <slash(a)ac.auone-net.jp> Date: Thu Jan 13 19:18:16 2011 +0900 gdi32: GetCharABCWidthsA should work for DBCS. --- dlls/gdi32/font.c | 27 +++++++++++++++++++++------ dlls/gdi32/tests/font.c | 1 - 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index fe68893..5d47ca6 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2296,18 +2296,33 @@ BOOL WINAPI GetAspectRatioFilterEx( HDC hdc, LPSIZE pAspectRatio ) BOOL WINAPI GetCharABCWidthsA(HDC hdc, UINT firstChar, UINT lastChar, LPABC abc ) { - INT i, wlen, count = (INT)(lastChar - firstChar + 1); + INT i, wlen; + UINT c; LPSTR str; LPWSTR wstr; BOOL ret = TRUE; - if(count <= 0) return FALSE; + if (lastChar < firstChar) + return FALSE; - str = HeapAlloc(GetProcessHeap(), 0, count); - for(i = 0; i < count; i++) - str[i] = (BYTE)(firstChar + i); + str = HeapAlloc(GetProcessHeap(), 0, (lastChar - firstChar + 1) * 2 + 1); + if (str == NULL) + return FALSE; - wstr = FONT_mbtowc(hdc, str, count, &wlen, NULL); + for(i = 0, c = firstChar; c <= lastChar; i++, c++) + { + if (c > 0xff) + str[i++] = (BYTE)(c >> 8); + str[i] = (BYTE)c; + } + str[i] = '\0'; + + wstr = FONT_mbtowc(hdc, str, -1, &wlen, NULL); + if (wstr == NULL) + { + HeapFree(GetProcessHeap(), 0, str); + return FALSE; + } for(i = 0; i < wlen; i++) { diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 9b9a5b4..a8c28f4 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -973,7 +973,6 @@ static void test_GetCharABCWidths(void) memset(a, 0, sizeof a); memset(w, 0, sizeof w); hfont = SelectObject(hdc, hfont); - todo_wine ok(pGetCharABCWidthsA(hdc, c[i].a, c[i].a + 1, a) && pGetCharABCWidthsW(hdc, c[i].w, c[i].w + 1, w) && memcmp(a, w, sizeof a) == 0,

1 0

Alexandre Julliard : oledlg: Convert string table resources to po files.
by Alexandre Julliard Jan. 13, 2011

Jan. 13, 2011

Module: wine Branch: master Commit: 7f59564fe073bcf8ad0562714bd73d6e0555658c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f59564fe073bcf8ad0562714… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 13 16:18:24 2011 +0100 oledlg: Convert string table resources to po files. --- configure | 2 +- configure.ac | 2 +- dlls/oledlg/Makefile.in | 3 + dlls/oledlg/oledlg.rc | 44 +++++++++++++++++++++ dlls/oledlg/oledlg_Cs.rc | 9 ---- dlls/oledlg/oledlg_Da.rc | 23 ----------- dlls/oledlg/oledlg_De.rc | 23 ----------- dlls/oledlg/oledlg_En.rc | 23 ----------- dlls/oledlg/oledlg_Es.rc | 23 ----------- dlls/oledlg/oledlg_Fr.rc | 23 ----------- dlls/oledlg/oledlg_He.rc | 23 ----------- dlls/oledlg/oledlg_Hu.rc | 23 ----------- dlls/oledlg/oledlg_It.rc | 23 ----------- dlls/oledlg/oledlg_Ja.rc | 23 ----------- dlls/oledlg/oledlg_Ko.rc | 23 ----------- dlls/oledlg/oledlg_Lt.rc | 23 ----------- dlls/oledlg/oledlg_Nl.rc | 23 ----------- dlls/oledlg/oledlg_No.rc | 23 ----------- dlls/oledlg/oledlg_Pl.rc | 23 ----------- dlls/oledlg/oledlg_Pt.rc | 57 ---------------------------- dlls/oledlg/oledlg_Ro.rc | 23 ----------- dlls/oledlg/oledlg_Ru.rc | 23 ----------- dlls/oledlg/oledlg_Si.rc | 23 ----------- dlls/oledlg/oledlg_Sr.rc | 46 ---------------------- dlls/oledlg/oledlg_Sv.rc | 23 ----------- dlls/oledlg/oledlg_Tr.rc | 9 ---- dlls/oledlg/oledlg_Uk.rc | 23 ----------- dlls/oledlg/oledlg_Zh.rc | 46 ---------------------- po/ar.po | 77 +++++++++++++++++++++++++++++++++++++ po/bg.po | 80 +++++++++++++++++++++++++++++++++++++++ po/cs.po | 88 +++++++++++++++++++++++++++++++++++++++++++ po/da.po | 91 ++++++++++++++++++++++++++++++++++++++++++++ po/de.po | 94 ++++++++++++++++++++++++++++++++++++++++++++++ po/el.po | 78 ++++++++++++++++++++++++++++++++++++++ po/en.po | 81 +++++++++++++++++++++++++++++++++++++++ po/en_US.po | 94 ++++++++++++++++++++++++++++++++++++++++++++++ po/eo.po | 77 +++++++++++++++++++++++++++++++++++++ po/es.po | 94 ++++++++++++++++++++++++++++++++++++++++++++++ po/fa.po | 77 +++++++++++++++++++++++++++++++++++++ po/fi.po | 80 +++++++++++++++++++++++++++++++++++++++ po/fr.po | 94 ++++++++++++++++++++++++++++++++++++++++++++++ po/he.po | 87 ++++++++++++++++++++++++++++++++++++++++++ po/hi.po | 77 +++++++++++++++++++++++++++++++++++++ po/hu.po | 94 ++++++++++++++++++++++++++++++++++++++++++++++ po/it.po | 94 ++++++++++++++++++++++++++++++++++++++++++++++ po/ja.po | 90 ++++++++++++++++++++++++++++++++++++++++++++ po/ko.po | 90 ++++++++++++++++++++++++++++++++++++++++++++ po/lt.po | 92 +++++++++++++++++++++++++++++++++++++++++++++ po/ml.po | 77 +++++++++++++++++++++++++++++++++++++ po/nb_NO.po | 92 +++++++++++++++++++++++++++++++++++++++++++++ po/nl.po | 92 +++++++++++++++++++++++++++++++++++++++++++++ po/or.po | 77 +++++++++++++++++++++++++++++++++++++ po/pa.po | 77 +++++++++++++++++++++++++++++++++++++ po/pl.po | 94 ++++++++++++++++++++++++++++++++++++++++++++++ po/pt_BR.po | 94 ++++++++++++++++++++++++++++++++++++++++++++++ po/pt_PT.po | 94 ++++++++++++++++++++++++++++++++++++++++++++++ po/rm.po | 77 +++++++++++++++++++++++++++++++++++++ po/ro.po | 94 ++++++++++++++++++++++++++++++++++++++++++++++ po/ru.po | 92 +++++++++++++++++++++++++++++++++++++++++++++ po/sk.po | 77 +++++++++++++++++++++++++++++++++++++ po/sl.po | 87 ++++++++++++++++++++++++++++++++++++++++++ po/sr_RS(a)cyrillic.po | 90 ++++++++++++++++++++++++++++++++++++++++++++ po/sr_RS(a)latin.po | 90 ++++++++++++++++++++++++++++++++++++++++++++ po/sv.po | 94 ++++++++++++++++++++++++++++++++++++++++++++++ po/te.po | 77 +++++++++++++++++++++++++++++++++++++ po/th.po | 77 +++++++++++++++++++++++++++++++++++++ po/tr.po | 90 ++++++++++++++++++++++++++++++++++++++++++++ po/uk.po | 92 +++++++++++++++++++++++++++++++++++++++++++++ po/wa.po | 77 +++++++++++++++++++++++++++++++++++++ po/wine.pot | 77 +++++++++++++++++++++++++++++++++++++ po/zh_CN.po | 84 +++++++++++++++++++++++++++++++++++++++++ po/zh_TW.po | 84 +++++++++++++++++++++++++++++++++++++++++ 72 files changed, 3834 insertions(+), 606 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7f59564fe073bcf8ad056…

1 0

Alexandre Julliard : oleacc: Convert string table resources to po files.
by Alexandre Julliard Jan. 13, 2011

Jan. 13, 2011

Module: wine Branch: master Commit: 8062ec1a544b63ef97ca276f518652d43be5a49b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8062ec1a544b63ef97ca276f5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 13 16:00:53 2011 +0100 oleacc: Convert string table resources to po files. --- configure | 2 +- configure.ac | 2 +- dlls/oleacc/Makefile.in | 19 +-- dlls/oleacc/{oleacc_En.rc => oleacc.rc} | 2 +- dlls/oleacc/oleacc_De.rc | 94 ---------- dlls/oleacc/oleacc_Fr.rc | 96 ----------- dlls/oleacc/oleacc_Hu.rc | 95 ----------- dlls/oleacc/oleacc_It.rc | 96 ----------- dlls/oleacc/oleacc_Ko.rc | 95 ----------- dlls/oleacc/oleacc_Lt.rc | 95 ----------- dlls/oleacc/oleacc_Nl.rc | 92 ---------- dlls/oleacc/oleacc_No.rc | 95 ----------- dlls/oleacc/oleacc_Pl.rc | 92 ---------- dlls/oleacc/oleacc_Pt.rc | 166 ------------------ dlls/oleacc/oleacc_Ro.rc | 93 ---------- dlls/oleacc/oleacc_Si.rc | 94 ---------- dlls/oleacc/oleacc_Sr.rc | 166 ------------------ dlls/oleacc/oleacc_Sv.rc | 94 ---------- dlls/oleacc/oleacc_Uk.rc | 97 ----------- po/ar.po | 265 ++++++++++++++++++++++++++++- po/bg.po | 272 +++++++++++++++++++++++++++++- po/cs.po | 272 +++++++++++++++++++++++++++++- po/da.po | 283 ++++++++++++++++++++++++++++++- po/de.po | 269 +++++++++++++++++++++++++++++- po/el.po | 267 ++++++++++++++++++++++++++++- po/en.po | 275 +++++++++++++++++++++++++++++- po/en_US.po | 264 ++++++++++++++++++++++++++++- po/eo.po | 270 +++++++++++++++++++++++++++++- po/es.po | 276 +++++++++++++++++++++++++++++- po/fa.po | 265 ++++++++++++++++++++++++++++- po/fi.po | 277 +++++++++++++++++++++++++++++- po/fr.po | 269 +++++++++++++++++++++++++++++- po/he.po | 280 ++++++++++++++++++++++++++++++- po/hi.po | 266 ++++++++++++++++++++++++++++- po/hu.po | 264 ++++++++++++++++++++++++++++- po/it.po | 269 +++++++++++++++++++++++++++++- po/ja.po | 281 ++++++++++++++++++++++++++++++- po/ko.po | 264 ++++++++++++++++++++++++++++- po/lt.po | 264 ++++++++++++++++++++++++++++- po/ml.po | 266 ++++++++++++++++++++++++++++- po/nb_NO.po | 264 ++++++++++++++++++++++++++++- po/nl.po | 264 ++++++++++++++++++++++++++++- po/or.po | 266 ++++++++++++++++++++++++++++- po/pa.po | 266 ++++++++++++++++++++++++++++- po/pl.po | 269 +++++++++++++++++++++++++++++- po/pt_BR.po | 264 ++++++++++++++++++++++++++++- po/pt_PT.po | 264 ++++++++++++++++++++++++++++- po/rm.po | 266 ++++++++++++++++++++++++++++- po/ro.po | 264 ++++++++++++++++++++++++++++- po/ru.po | 283 ++++++++++++++++++++++++++++++- po/sk.po | 268 ++++++++++++++++++++++++++++- po/sl.po | 264 ++++++++++++++++++++++++++++- po/sr_RS(a)cyrillic.po | 264 ++++++++++++++++++++++++++++- po/sr_RS(a)latin.po | 264 ++++++++++++++++++++++++++++- po/sv.po | 264 ++++++++++++++++++++++++++++- po/te.po | 266 ++++++++++++++++++++++++++++- po/th.po | 268 ++++++++++++++++++++++++++++- po/tr.po | 278 ++++++++++++++++++++++++++++++- po/uk.po | 269 +++++++++++++++++++++++++++++- po/wa.po | 267 ++++++++++++++++++++++++++++- po/wine.pot | 264 ++++++++++++++++++++++++++++- po/zh_CN.po | 279 ++++++++++++++++++++++++++++++- po/zh_TW.po | 283 ++++++++++++++++++++++++++++++- 63 files changed, 11675 insertions(+), 1756 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8062ec1a544b63ef97ca2…

1 0

Alexandre Julliard : avifil32: Convert string table resources to po files.
by Alexandre Julliard Jan. 13, 2011

Jan. 13, 2011

Module: wine Branch: master Commit: af743a6b57c8a6ef408029c3441da5866f80268f URL: http://source.winehq.org/git/wine.git/?a=commit;h=af743a6b57c8a6ef408029c34… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 13 15:37:43 2011 +0100 avifil32: Convert string table resources to po files. --- configure | 2 +- configure.ac | 2 +- dlls/avifil32/Makefile.in | 6 +++- dlls/avifil32/{rsrc.rc => avifil32.rc} | 17 +++++++++++++ dlls/avifil32/avifile_Cs.rc | 13 ---------- dlls/avifil32/avifile_Da.rc | 13 ---------- dlls/avifil32/avifile_De.rc | 13 ---------- dlls/avifil32/avifile_En.rc | 13 ---------- dlls/avifil32/avifile_Es.rc | 13 ---------- dlls/avifil32/avifile_Fr.rc | 13 ---------- dlls/avifil32/avifile_He.rc | 13 ---------- dlls/avifil32/avifile_Hu.rc | 13 ---------- dlls/avifil32/avifile_It.rc | 13 ---------- dlls/avifil32/avifile_Ja.rc | 13 ---------- dlls/avifil32/avifile_Ko.rc | 13 ---------- dlls/avifil32/avifile_Lt.rc | 13 ---------- dlls/avifil32/avifile_Nl.rc | 13 ---------- dlls/avifil32/avifile_No.rc | 13 ---------- dlls/avifil32/avifile_Pl.rc | 13 ---------- dlls/avifil32/avifile_Pt.rc | 31 ----------------------- dlls/avifil32/avifile_Ro.rc | 13 ---------- dlls/avifil32/avifile_Ru.rc | 13 ---------- dlls/avifil32/avifile_Si.rc | 13 ---------- dlls/avifil32/avifile_Sr.rc | 26 ------------------- dlls/avifil32/avifile_Sv.rc | 13 ---------- dlls/avifil32/avifile_Tr.rc | 13 ---------- dlls/avifil32/avifile_Uk.rc | 13 ---------- dlls/avifil32/avifile_Zh.rc | 26 ------------------- po/ar.po | 35 +++++++++++++++++++++++++- po/bg.po | 35 +++++++++++++++++++++++++- po/cs.po | 35 +++++++++++++++++++++++++- po/da.po | 35 +++++++++++++++++++++++++- po/de.po | 35 +++++++++++++++++++++++++- po/el.po | 35 +++++++++++++++++++++++++- po/en.po | 35 +++++++++++++++++++++++++- po/en_US.po | 35 +++++++++++++++++++++++++- po/eo.po | 35 +++++++++++++++++++++++++- po/es.po | 35 +++++++++++++++++++++++++- po/fa.po | 35 +++++++++++++++++++++++++- po/fi.po | 35 +++++++++++++++++++++++++- po/fr.po | 35 +++++++++++++++++++++++++- po/he.po | 35 +++++++++++++++++++++++++- po/hi.po | 35 +++++++++++++++++++++++++- po/hu.po | 35 +++++++++++++++++++++++++- po/it.po | 35 +++++++++++++++++++++++++- po/ja.po | 35 +++++++++++++++++++++++++- po/ko.po | 35 +++++++++++++++++++++++++- po/lt.po | 35 +++++++++++++++++++++++++- po/ml.po | 35 +++++++++++++++++++++++++- po/nb_NO.po | 35 +++++++++++++++++++++++++- po/nl.po | 35 +++++++++++++++++++++++++- po/or.po | 35 +++++++++++++++++++++++++- po/pa.po | 35 +++++++++++++++++++++++++- po/pl.po | 35 +++++++++++++++++++++++++- po/pt_BR.po | 35 +++++++++++++++++++++++++- po/pt_PT.po | 35 +++++++++++++++++++++++++- po/rm.po | 35 +++++++++++++++++++++++++- po/ro.po | 35 +++++++++++++++++++++++++- po/ru.po | 35 +++++++++++++++++++++++++- po/sk.po | 35 +++++++++++++++++++++++++- po/sl.po | 35 +++++++++++++++++++++++++- po/sr_RS(a)cyrillic.po | 35 +++++++++++++++++++++++++- po/sr_RS(a)latin.po | 35 +++++++++++++++++++++++++- po/sv.po | 35 +++++++++++++++++++++++++- po/te.po | 35 +++++++++++++++++++++++++- po/th.po | 35 +++++++++++++++++++++++++- po/tr.po | 35 +++++++++++++++++++++++++- po/uk.po | 35 +++++++++++++++++++++++++- po/wa.po | 35 +++++++++++++++++++++++++- po/wine.pot | 35 +++++++++++++++++++++++++- po/zh_CN.po | 35 +++++++++++++++++++++++++- po/zh_TW.po | 42 ++++++++++++++++++++++++++----- 72 files changed, 1520 insertions(+), 410 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=af743a6b57c8a6ef40802…

1 0

Alexandre Julliard : appwiz.cpl: Convert string table resources to po files .
by Alexandre Julliard Jan. 13, 2011

Jan. 13, 2011

Module: wine Branch: master Commit: 902f10cc6735d95f9870d42c4109439f6621c190 URL: http://source.winehq.org/git/wine.git/?a=commit;h=902f10cc6735d95f9870d42c4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 13 15:16:02 2011 +0100 appwiz.cpl: Convert string table resources to po files. --- configure | 2 +- configure.ac | 2 +- dlls/appwiz.cpl/Bg.rc | 6 --- dlls/appwiz.cpl/Da.rc | 26 ----------- dlls/appwiz.cpl/De.rc | 27 ----------- dlls/appwiz.cpl/En.rc | 27 ----------- dlls/appwiz.cpl/Es.rc | 26 ----------- dlls/appwiz.cpl/Fi.rc | 29 ------------ dlls/appwiz.cpl/Fr.rc | 27 ----------- dlls/appwiz.cpl/He.rc | 26 ----------- dlls/appwiz.cpl/Hu.rc | 26 ----------- dlls/appwiz.cpl/It.rc | 27 ----------- dlls/appwiz.cpl/Ja.rc | 26 ----------- dlls/appwiz.cpl/Ko.rc | 26 ----------- dlls/appwiz.cpl/Lt.rc | 27 ----------- dlls/appwiz.cpl/Makefile.in | 3 +- dlls/appwiz.cpl/Nl.rc | 27 ----------- dlls/appwiz.cpl/No.rc | 26 ----------- dlls/appwiz.cpl/Pl.rc | 27 ----------- dlls/appwiz.cpl/Pt.rc | 57 ------------------------ dlls/appwiz.cpl/Ro.rc | 26 ----------- dlls/appwiz.cpl/Ru.rc | 27 ----------- dlls/appwiz.cpl/Si.rc | 26 ----------- dlls/appwiz.cpl/Sr.rc | 52 ---------------------- dlls/appwiz.cpl/Sv.rc | 27 ----------- dlls/appwiz.cpl/Tr.rc | 6 --- dlls/appwiz.cpl/Uk.rc | 26 ----------- dlls/appwiz.cpl/Zh.rc | 52 ---------------------- dlls/appwiz.cpl/appwiz.rc | 31 +++++++++++++ po/ar.po | 86 +++++++++++++++++++++++++++++------- po/bg.po | 93 +++++++++++++++++++++++++++++++------- po/cs.po | 101 +++++++++++++++++++++++++++++++++-------- po/da.po | 103 +++++++++++++++++++++++++++++++++++-------- po/de.po | 90 +++++++++++++++++++++++++++++++------- po/el.po | 88 +++++++++++++++++++++++++++++------- po/en.po | 99 +++++++++++++++++++++++++++++++++-------- po/en_US.po | 92 +++++++++++++++++++++++++++++++------- po/eo.po | 92 +++++++++++++++++++++++++++++++------- po/es.po | 94 +++++++++++++++++++++++++++++++-------- po/fa.po | 86 +++++++++++++++++++++++++++++------- po/fi.po | 92 +++++++++++++++++++++++++++++++------- po/fr.po | 92 +++++++++++++++++++++++++++++++------- po/he.po | 89 ++++++++++++++++++++++++++++++------- po/hi.po | 86 +++++++++++++++++++++++++++++------- po/hu.po | 94 +++++++++++++++++++++++++++++++-------- po/it.po | 92 +++++++++++++++++++++++++++++++------- po/ja.po | 100 +++++++++++++++++++++++++++++++++--------- po/ko.po | 97 +++++++++++++++++++++++++++++++++------- po/lt.po | 92 +++++++++++++++++++++++++++++++------- po/ml.po | 86 +++++++++++++++++++++++++++++------- po/nb_NO.po | 88 ++++++++++++++++++++++++++++++------- po/nl.po | 97 +++++++++++++++++++++++++++++++++------- po/or.po | 86 +++++++++++++++++++++++++++++------- po/pa.po | 86 +++++++++++++++++++++++++++++------- po/pl.po | 97 +++++++++++++++++++++++++++++++--------- po/pt_BR.po | 90 +++++++++++++++++++++++++++++++------- po/pt_PT.po | 100 +++++++++++++++++++++++++++++++++--------- po/rm.po | 89 ++++++++++++++++++++++++++++++------- po/ro.po | 89 ++++++++++++++++++++++++++++++------- po/ru.po | 96 ++++++++++++++++++++++++++++++++-------- po/sk.po | 88 ++++++++++++++++++++++++++++++------- po/sl.po | 98 +++++++++++++++++++++++++++++++++-------- po/sr_RS(a)cyrillic.po | 89 ++++++++++++++++++++++++++++++------- po/sr_RS(a)latin.po | 99 ++++++++++++++++++++++++++++++++--------- po/sv.po | 91 +++++++++++++++++++++++++++++++------- po/te.po | 86 +++++++++++++++++++++++++++++------- po/th.po | 86 +++++++++++++++++++++++++++++------- po/tr.po | 102 ++++++++++++++++++++++++++++++++++-------- po/uk.po | 103 ++++++++++++++++++++++++++++++++++++------- po/wa.po | 87 +++++++++++++++++++++++++++++------- po/wine.pot | 86 +++++++++++++++++++++++++++++------- po/zh_CN.po | 88 +++++++++++++++++++++++++++++-------- po/zh_TW.po | 93 +++++++++++++++++++++++++++++++-------- 73 files changed, 3331 insertions(+), 1470 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=902f10cc6735d95f9870d…

1 0

Michael Stefaniuc : shlwapi/tests: Finish the COM cleanup in ordinal.c.
by Alexandre Julliard Jan. 13, 2011

Jan. 13, 2011

Module: wine Branch: master Commit: 213532a2602dd90efb4e24c49cca24d3a9415247 URL: http://source.winehq.org/git/wine.git/?a=commit;h=213532a2602dd90efb4e24c49… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 13 10:03:03 2011 +0100 shlwapi/tests: Finish the COM cleanup in ordinal.c. --- dlls/shlwapi/tests/ordinal.c | 51 +++++++++++++++++++++++++++-------------- 1 files changed, 33 insertions(+), 18 deletions(-) diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 1536e52..8f13407 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -2036,10 +2036,15 @@ static void test_SHGetObjectCompatFlags(void) } typedef struct { - const IOleCommandTargetVtbl *lpVtbl; + IOleCommandTarget IOleCommandTarget_iface; LONG ref; } IOleCommandTargetImpl; +static inline IOleCommandTargetImpl *impl_from_IOleCommandTarget(IOleCommandTarget *iface) +{ + return CONTAINING_RECORD(iface, IOleCommandTargetImpl, IOleCommandTarget_iface); +} + static const IOleCommandTargetVtbl IOleCommandTargetImpl_Vtbl; static IOleCommandTarget* IOleCommandTargetImpl_Construct(void) @@ -2047,15 +2052,15 @@ static IOleCommandTarget* IOleCommandTargetImpl_Construct(void) IOleCommandTargetImpl *obj; obj = HeapAlloc(GetProcessHeap(), 0, sizeof(*obj)); - obj->lpVtbl = &IOleCommandTargetImpl_Vtbl; + obj->IOleCommandTarget_iface.lpVtbl = &IOleCommandTargetImpl_Vtbl; obj->ref = 1; - return (IOleCommandTarget*)obj; + return &obj->IOleCommandTarget_iface; } static HRESULT WINAPI IOleCommandTargetImpl_QueryInterface(IOleCommandTarget *iface, REFIID riid, void **ppvObj) { - IOleCommandTargetImpl *This = (IOleCommandTargetImpl *)iface; + IOleCommandTargetImpl *This = impl_from_IOleCommandTarget(iface); if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IOleCommandTarget)) @@ -2074,13 +2079,13 @@ static HRESULT WINAPI IOleCommandTargetImpl_QueryInterface(IOleCommandTarget *if static ULONG WINAPI IOleCommandTargetImpl_AddRef(IOleCommandTarget *iface) { - IOleCommandTargetImpl *This = (IOleCommandTargetImpl *)iface; + IOleCommandTargetImpl *This = impl_from_IOleCommandTarget(iface); return InterlockedIncrement(&This->ref); } static ULONG WINAPI IOleCommandTargetImpl_Release(IOleCommandTarget *iface) { - IOleCommandTargetImpl *This = (IOleCommandTargetImpl *)iface; + IOleCommandTargetImpl *This = impl_from_IOleCommandTarget(iface); ULONG ref = InterlockedDecrement(&This->ref); if (!ref) @@ -2119,15 +2124,25 @@ static const IOleCommandTargetVtbl IOleCommandTargetImpl_Vtbl = }; typedef struct { - const IServiceProviderVtbl *lpVtbl; + IServiceProvider IServiceProvider_iface; LONG ref; } IServiceProviderImpl; +static inline IServiceProviderImpl *impl_from_IServiceProvider(IServiceProvider *iface) +{ + return CONTAINING_RECORD(iface, IServiceProviderImpl, IServiceProvider_iface); +} + typedef struct { - const IProfferServiceVtbl *lpVtbl; + IProfferService IProfferService_iface; LONG ref; } IProfferServiceImpl; +static inline IProfferServiceImpl *impl_from_IProfferService(IProfferService *iface) +{ + return CONTAINING_RECORD(iface, IProfferServiceImpl, IProfferService_iface); +} + static const IServiceProviderVtbl IServiceProviderImpl_Vtbl; static const IProfferServiceVtbl IProfferServiceImpl_Vtbl; @@ -2137,10 +2152,10 @@ static IServiceProvider* IServiceProviderImpl_Construct(void) IServiceProviderImpl *obj; obj = HeapAlloc(GetProcessHeap(), 0, sizeof(*obj)); - obj->lpVtbl = &IServiceProviderImpl_Vtbl; + obj->IServiceProvider_iface.lpVtbl = &IServiceProviderImpl_Vtbl; obj->ref = 1; - return (IServiceProvider*)obj; + return &obj->IServiceProvider_iface; } static IProfferService* IProfferServiceImpl_Construct(void) @@ -2148,15 +2163,15 @@ static IProfferService* IProfferServiceImpl_Construct(void) IProfferServiceImpl *obj; obj = HeapAlloc(GetProcessHeap(), 0, sizeof(*obj)); - obj->lpVtbl = &IProfferServiceImpl_Vtbl; + obj->IProfferService_iface.lpVtbl = &IProfferServiceImpl_Vtbl; obj->ref = 1; - return (IProfferService*)obj; + return &obj->IProfferService_iface; } static HRESULT WINAPI IServiceProviderImpl_QueryInterface(IServiceProvider *iface, REFIID riid, void **ppvObj) { - IServiceProviderImpl *This = (IServiceProviderImpl *)iface; + IServiceProviderImpl *This = impl_from_IServiceProvider(iface); if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IServiceProvider)) @@ -2178,13 +2193,13 @@ static HRESULT WINAPI IServiceProviderImpl_QueryInterface(IServiceProvider *ifac static ULONG WINAPI IServiceProviderImpl_AddRef(IServiceProvider *iface) { - IServiceProviderImpl *This = (IServiceProviderImpl *)iface; + IServiceProviderImpl *This = impl_from_IServiceProvider(iface); return InterlockedIncrement(&This->ref); } static ULONG WINAPI IServiceProviderImpl_Release(IServiceProvider *iface) { - IServiceProviderImpl *This = (IServiceProviderImpl *)iface; + IServiceProviderImpl *This = impl_from_IServiceProvider(iface); ULONG ref = InterlockedDecrement(&This->ref); if (!ref) @@ -2268,7 +2283,7 @@ static void test_IUnknown_QueryServiceExec(void) static HRESULT WINAPI IProfferServiceImpl_QueryInterface(IProfferService *iface, REFIID riid, void **ppvObj) { - IProfferServiceImpl *This = (IProfferServiceImpl *)iface; + IProfferServiceImpl *This = impl_from_IProfferService(iface); if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IProfferService)) @@ -2293,13 +2308,13 @@ static HRESULT WINAPI IProfferServiceImpl_QueryInterface(IProfferService *iface, static ULONG WINAPI IProfferServiceImpl_AddRef(IProfferService *iface) { - IProfferServiceImpl *This = (IProfferServiceImpl *)iface; + IProfferServiceImpl *This = impl_from_IProfferService(iface); return InterlockedIncrement(&This->ref); } static ULONG WINAPI IProfferServiceImpl_Release(IProfferService *iface) { - IProfferServiceImpl *This = (IProfferServiceImpl *)iface; + IProfferServiceImpl *This = impl_from_IProfferService(iface); ULONG ref = InterlockedDecrement(&This->ref); if (!ref)

1 0

Greg Geldorp : user32/tests: Fix menu test failures on East-Asian machines.
by Alexandre Julliard Jan. 13, 2011

Jan. 13, 2011

Module: wine Branch: master Commit: 2b0d8ed7c3f185db392ae6392bb65894ae919583 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b0d8ed7c3f185db392ae6392… Author: Greg Geldorp <ggeldorp(a)vmware.com> Date: Thu Jan 13 11:25:02 2011 +0100 user32/tests: Fix menu test failures on East-Asian machines. --- dlls/user32/tests/menu.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index deecbe8..aa7ebde 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -954,7 +954,9 @@ static void check_menu_item_info( int line, HMENU hmenu, BOOL ansi, UINT mask, U "wrong bmpitem %p/%p\n", info.hbmpItem, item ); ok_(__FILE__, line)( info.dwTypeData == type_data || (ULONG_PTR)info.dwTypeData == LOWORD(type_data), "wrong type data %p/%p\n", info.dwTypeData, type_data ); - ok_(__FILE__, line)( info.cch == out_len, "wrong len %x/%x\n", info.cch, out_len ); + ok_(__FILE__, line)( info.cch == out_len || + broken(! ansi && info.cch == 2 * out_len) /* East-Asian */, + "wrong len %x/%x\n", info.cch, out_len ); if (expname) { if(ansi)

1 0

Michael Stefaniuc : wiaservc: COM cleanup for the IClassFactory iface.
by Alexandre Julliard Jan. 13, 2011

Jan. 13, 2011

Module: wine Branch: master Commit: 70a1ce995445d8f1714044b7893538c6d06f91e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70a1ce995445d8f1714044b78… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 13 01:27:09 2011 +0100 wiaservc: COM cleanup for the IClassFactory iface. --- dlls/wiaservc/factory.c | 11 ++++++++--- dlls/wiaservc/service.c | 5 ++--- dlls/wiaservc/wiaservc_private.h | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/wiaservc/factory.c b/dlls/wiaservc/factory.c index 30caa89..a80b830 100644 --- a/dlls/wiaservc/factory.c +++ b/dlls/wiaservc/factory.c @@ -32,6 +32,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(wia); +static inline ClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, ClassFactoryImpl, IClassFactory_iface); +} + static ULONG WINAPI WIASERVC_IClassFactory_AddRef(LPCLASSFACTORY iface) { @@ -42,11 +47,11 @@ static HRESULT WINAPI WIASERVC_IClassFactory_QueryInterface(LPCLASSFACTORY iface, REFIID riid, LPVOID *ppvObj) { - ClassFactoryImpl *This = (ClassFactoryImpl *) iface; + ClassFactoryImpl *This = impl_from_IClassFactory(iface); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IClassFactory)) { - *ppvObj = &This->lpVtbl; + *ppvObj = &This->IClassFactory_iface; return S_OK; } @@ -99,5 +104,5 @@ static const IClassFactoryVtbl WIASERVC_IClassFactory_Vtbl = ClassFactoryImpl WIASERVC_ClassFactory = { - &WIASERVC_IClassFactory_Vtbl + { &WIASERVC_IClassFactory_Vtbl } }; diff --git a/dlls/wiaservc/service.c b/dlls/wiaservc/service.c index 14b21bd..c1cdb83 100644 --- a/dlls/wiaservc/service.c +++ b/dlls/wiaservc/service.c @@ -95,9 +95,8 @@ StartCount(void) return FALSE; hr = CoRegisterClassObject(&CLSID_WiaDevMgr, - (IUnknown *) &WIASERVC_ClassFactory, - CLSCTX_LOCAL_SERVER, REGCLS_MULTIPLEUSE, - &dwReg); + (IUnknown *) &WIASERVC_ClassFactory.IClassFactory_iface, + CLSCTX_LOCAL_SERVER, REGCLS_MULTIPLEUSE, &dwReg); if (FAILED(hr)) return FALSE; diff --git a/dlls/wiaservc/wiaservc_private.h b/dlls/wiaservc/wiaservc_private.h index 1032819..72c0b21 100644 --- a/dlls/wiaservc/wiaservc_private.h +++ b/dlls/wiaservc/wiaservc_private.h @@ -23,7 +23,7 @@ typedef struct { - const IClassFactoryVtbl *lpVtbl; + IClassFactory IClassFactory_iface; } ClassFactoryImpl; extern ClassFactoryImpl WIASERVC_ClassFactory;

1 0

Jacek Caban : winnt.h: Use Common macro for __C89_NAMELESSUNION and __C89_NAMELESSSTRUCT.
by Alexandre Julliard Jan. 13, 2011

Jan. 13, 2011

Module: wine Branch: master Commit: 42874c62a79a10aa00e8f7f3bfa4d9e39cb87c38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42874c62a79a10aa00e8f7f3b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 12 23:25:03 2011 +0100 winnt.h: Use Common macro for __C89_NAMELESSUNION and __C89_NAMELESSSTRUCT. --- include/winineti.h | 8 ++++---- include/winnt.h | 36 ++++++++++-------------------------- 2 files changed, 14 insertions(+), 30 deletions(-) diff --git a/include/winineti.h b/include/winineti.h index 4f86db6..f1eb880 100644 --- a/include/winineti.h +++ b/include/winineti.h @@ -46,9 +46,9 @@ typedef struct _INTERNET_CACHE_CONFIG_INFOA BOOL fPerUser; DWORD dwSyncMode; DWORD dwNumCachePaths; - __C89_NAMELESSUNION union + __C89_NAMELESS union { - __C89_NAMELESSSTRUCT struct + __C89_NAMELESS struct { CHAR CachePath[MAX_PATH]; DWORD dwCacheSize; @@ -68,9 +68,9 @@ typedef struct _INTERNET_CACHE_CONFIG_INFOW BOOL fPerUser; DWORD dwSyncMode; DWORD dwNumCachePaths; - __C89_NAMELESSUNION union + __C89_NAMELESS union { - __C89_NAMELESSSTRUCT struct + __C89_NAMELESS struct { WCHAR CachePath[MAX_PATH]; DWORD dwCacheSize; diff --git a/include/winnt.h b/include/winnt.h index 6cd97bc..d3df022 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -230,42 +230,26 @@ extern "C" { #define DUMMYUNIONNAME8 u8 #endif /* !defined(NONAMELESSUNION) */ -#ifndef __C89_NAMELESSSTRUCT +#ifndef __C89_NAMELESS # if !defined(__WINESRC__) && !defined(WINE_NO_NAMELESS_EXTENSION) # ifdef __GNUC__ /* Anonymous structs support starts with gcc 2.96/g++ 2.95 */ # if (__GNUC__ > 2) || ((__GNUC__ == 2) && ((__GNUC_MINOR__ > 95) || ((__GNUC_MINOR__ == 95) && defined(__cplusplus)))) -# define __C89_NAMELESSSTRUCT __extension__ +# define __C89_NAMELESS __extension__ # endif # elif defined(_MSC_VER) -# define __C89_NAMELESSSTRUCT +# define __C89_NAMELESS # endif # endif -# ifdef __C89_NAMELESSSTRUCT -# define __C89_NAMELESSSTRUCTNAME -# else -# define __C89_NAMELESSSTRUCT -# define __C89_NAMELESSSTRUCTNAME DUMMYSTRUCTNAME -# endif #endif -#ifndef __C89_NAMELESSUNION -# if !defined(__WINESRC__) && !defined(WINE_NO_NAMELESS_EXTENSION) -# ifdef __GNUC__ - /* Anonymous unions support starts with gcc 2.96/g++ 2.95 */ -# if (__GNUC__ > 2) || ((__GNUC__ == 2) && ((__GNUC_MINOR__ > 95) || ((__GNUC_MINOR__ == 95) && defined(__cplusplus)))) -# define __C89_NAMELESSUNION __extension__ -# endif -# elif defined(_MSC_VER) -# define __C89_NAMELESSUNION -# endif -# endif -# ifdef __C89_NAMELESSUNION -# define __C89_NAMELESSUNIONNAME -# else -# define __C89_NAMELESSUNION -# define __C89_NAMELESSUNIONNAME DUMMYUNIONNAME -# endif +#ifdef __C89_NAMELESS +# define __C89_NAMELESSSTRUCTNAME +# define __C89_NAMELESSUNIONNAME +#else +# define __C89_NAMELESS +# define __C89_NAMELESSSTRUCTNAME DUMMYSTRUCTNAME +# define __C89_NAMELESSUNIONNAME DUMMYUNIONNAME #endif /* C99 restrict support */

1 0