July 2009 - Wine-Commits - list.winehq.org

André Hentschel : notepad: Update German translation.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: c83c0bfd340534626e24e6a95e4ed94a6b430854 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c83c0bfd340534626e24e6a95… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Jul 2 17:02:19 2009 +0200 notepad: Update German translation. --- programs/notepad/De.rc | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/programs/notepad/De.rc b/programs/notepad/De.rc index 2e7154a..51546e3 100644 --- a/programs/notepad/De.rc +++ b/programs/notepad/De.rc @@ -93,6 +93,14 @@ PUSHBUTTON "Abbrechen", IDCANCEL, 180, 21, 40, 15, WS_TABST PUSHBUTTON "&Hilfe", IDHELP, 180, 39, 40, 15, WS_TABSTOP } +IDD_OFN_TEMPLATE DIALOG DISCARDABLE 50,50,300,15 +STYLE DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Kodierung:", -1, 5,0, 50,12 + COMBOBOX IDC_OFN_ENCCOMBO, 53,0, 156,48, WS_CHILD | WS_VSCROLL | CBS_DROPDOWNLIST +END + STRINGTABLE DISCARDABLE { STRING_PAGESETUP_HEADERVALUE, "&f" @@ -122,5 +130,13 @@ STRING_OUT_OF_MEMORY, "Nicht gen um diese Funktion\nabzuschlie�en. Beenden Sie eine oder mehrere \ \nAnwendungen, um den verf�gbaren Arbeitsspeicher zu\nerh�hen." +STRING_UNICODE_LE, "Unicode (UTF-16)" +STRING_UNICODE_BE, "Unicode (UTF-16 Big-Endian)" +STRING_LOSS_OF_UNICODE_CHARACTERS, "%s\n\ +Diese Datei enth�lt Unicode-Zeichen, die verloren gehen, wenn \n\ +Sie die Datei mit %s-Zeichenkodierung speichern. \n\ +Um die Zeichen beizubehalten, klicken Sie Abbrechen und w�hlen \n\ +Sie eine der Unicode-Optionen in der Liste. \n\ +M�chten Sie fortfahren?" }

1 0

Paul Vriens : ole32/tests: Fix some test failures on Win9x/WinME.
by Alexandre Julliard July 2, 2009

July 2, 2009

Module: wine Branch: master Commit: fb0275dd3148a098967f5959adb57ebe41a4383e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb0275dd3148a098967f5959a… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Jul 2 14:00:05 2009 +0200 ole32/tests: Fix some test failures on Win9x/WinME. --- dlls/ole32/tests/marshal.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index dacb7b6..7e3ff40 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -2071,7 +2071,7 @@ static void test_freethreadedmarshaldata(IStream *pStream, MSHCTX mshctx, void * { DWORD expected_size = round_global_size(3*sizeof(DWORD) + sizeof(GUID)); ok(size == expected_size || - broken(size == round_global_size(2*sizeof(DWORD))) /* Win9x & NT4 */, + broken(size == (2*sizeof(DWORD))) /* Win9x & NT4 */, "size should have been %d instead of %d\n", expected_size, size); ok(*(DWORD *)marshal_data == mshlflags, "expected 0x%x, but got 0x%x for mshctx\n", mshlflags, *(DWORD *)marshal_data);

1 0

Michael Stefaniuc : avifil32: Build language resource files separately.
by Alexandre Julliard July 2, 2009

July 2, 2009

Module: wine Branch: master Commit: 38bccbc15ef33a40f0c2a182f2a6a0af8b529de3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38bccbc15ef33a40f0c2a182f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 2 12:33:41 2009 +0200 avifil32: Build language resource files separately. Do not include them from an other rc file. --- dlls/avifil32/Makefile.in | 22 ++++++++++++++++++++++ dlls/avifil32/avifile_Cs.rc | 2 ++ dlls/avifil32/avifile_Da.rc | 2 ++ dlls/avifil32/avifile_De.rc | 2 ++ dlls/avifil32/avifile_En.rc | 2 ++ dlls/avifil32/avifile_Es.rc | 2 ++ dlls/avifil32/avifile_Fr.rc | 2 ++ dlls/avifil32/avifile_Hu.rc | 2 ++ dlls/avifil32/avifile_It.rc | 2 ++ dlls/avifil32/avifile_Ja.rc | 4 ++-- dlls/avifil32/avifile_Ko.rc | 2 ++ dlls/avifil32/avifile_Lt.rc | 4 ++-- dlls/avifil32/avifile_Nl.rc | 2 ++ dlls/avifil32/avifile_No.rc | 2 ++ dlls/avifil32/avifile_Pl.rc | 2 ++ dlls/avifil32/avifile_Pt.rc | 2 ++ dlls/avifil32/avifile_Ro.rc | 4 ++-- dlls/avifil32/avifile_Ru.rc | 2 ++ dlls/avifil32/avifile_Si.rc | 4 ++-- dlls/avifil32/avifile_Sv.rc | 2 ++ dlls/avifil32/avifile_Tr.rc | 2 ++ dlls/avifil32/avifile_Uk.rc | 1 + dlls/avifil32/avifile_Zh.rc | 4 ++-- dlls/avifil32/avifile_private.h | 3 +++ dlls/avifil32/rsrc.rc | 33 --------------------------------- 25 files changed, 68 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=38bccbc15ef33a40f0c2a…

1 0

Michael Stefaniuc : setupapi: Build language resource files separately.
by Alexandre Julliard July 2, 2009

July 2, 2009

Module: wine Branch: master Commit: e2f5875170b28d0d702785b6b5b535f093c0fc4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2f5875170b28d0d702785b6b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 2 12:33:26 2009 +0200 setupapi: Build language resource files separately. Do not include them from an other rc file. --- dlls/setupapi/Bg.rc | 2 + dlls/setupapi/Cs.rc | 2 + dlls/setupapi/Da.rc | 2 + dlls/setupapi/De.rc | 4 +- dlls/setupapi/En.rc | 2 + dlls/setupapi/Eo.rc | 2 + dlls/setupapi/Es.rc | 2 + dlls/setupapi/Fi.rc | 2 + dlls/setupapi/Fr.rc | 2 + dlls/setupapi/Hu.rc | 2 + dlls/setupapi/It.rc | 2 + dlls/setupapi/Ja.rc | 4 +- dlls/setupapi/Ko.rc | 2 + dlls/setupapi/Lt.rc | 4 +- dlls/setupapi/Makefile.in | 27 +++++++++++++++++++- dlls/setupapi/Nl.rc | 2 + dlls/setupapi/No.rc | 2 + dlls/setupapi/Pl.rc | 2 + dlls/setupapi/Pt.rc | 2 + dlls/setupapi/Ro.rc | 4 +- dlls/setupapi/Ru.rc | 2 + dlls/setupapi/Si.rc | 4 +- dlls/setupapi/Sk.rc | 2 + dlls/setupapi/Sv.rc | 2 + dlls/setupapi/Tr.rc | 2 + dlls/setupapi/Zh.rc | 4 +- dlls/setupapi/setupapi.rc | 51 -------------------------------------- dlls/setupapi/setupapi_private.h | 3 ++ 28 files changed, 79 insertions(+), 64 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e2f5875170b28d0d70278…

1 0

Michael Stefaniuc : serialui: Build language resource files separately.
by Alexandre Julliard July 2, 2009

July 2, 2009

Module: wine Branch: master Commit: a879e60ba3d64544146f59f30d559dc3a109ecef URL: http://source.winehq.org/git/wine.git/?a=commit;h=a879e60ba3d64544146f59f30… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 2 12:33:12 2009 +0200 serialui: Build language resource files separately. Do not include them from an other rc file. --- dlls/serialui/Bg.rc | 2 + dlls/serialui/Cs.rc | 2 + dlls/serialui/Da.rc | 2 + dlls/serialui/De.rc | 2 + dlls/serialui/En.rc | 2 + dlls/serialui/Eo.rc | 2 + dlls/serialui/Es.rc | 2 + dlls/serialui/Fi.rc | 2 + dlls/serialui/Fr.rc | 2 + dlls/serialui/Hu.rc | 2 + dlls/serialui/It.rc | 2 + dlls/serialui/Ja.rc | 4 +- dlls/serialui/Ko.rc | 2 + dlls/serialui/Lt.rc | 4 +- dlls/serialui/Makefile.in | 24 +++++++++++++++++++++- dlls/serialui/Nl.rc | 2 + dlls/serialui/No.rc | 2 + dlls/serialui/Pt.rc | 2 + dlls/serialui/Ru.rc | 2 + dlls/serialui/Si.rc | 4 +- dlls/serialui/Sv.rc | 2 + dlls/serialui/Tr.rc | 2 + dlls/serialui/Zh.rc | 4 +- dlls/serialui/serialui.h | 3 ++ dlls/serialui/serialui_rc.rc | 45 ------------------------------------------ 25 files changed, 70 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a879e60ba3d64544146f5…

1 0

Huw Davies : gdi32/tests: Add some traces and fix a few comments.
by Alexandre Julliard July 2, 2009

July 2, 2009

Module: wine Branch: master Commit: dca1b517ec55d089127389820bc8d7b5156bb6fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=dca1b517ec55d089127389820… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jul 2 11:45:12 2009 +0100 gdi32/tests: Add some traces and fix a few comments. --- dlls/gdi32/tests/metafile.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 4aa177b..a85c608 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -1476,6 +1476,7 @@ static void test_SetMetaFileBits(void) METAHEADER *mh; hmf = SetMetaFileBitsEx(sizeof(MF_GRAPHICS_BITS), MF_GRAPHICS_BITS); + trace("hmf %p\n", hmf); ok(hmf != 0, "SetMetaFileBitsEx error %d\n", GetLastError()); type = GetObjectType(hmf); ok(type == OBJ_METAFILE, "SetMetaFileBitsEx created object with type %d\n", type); @@ -1492,21 +1493,23 @@ static void test_SetMetaFileBits(void) /* NULL data crashes XP SP1 */ /*hmf = SetMetaFileBitsEx(sizeof(MF_GRAPHICS_BITS), NULL);*/ - /* Now with not zero size */ + /* Now with zero size */ SetLastError(0xdeadbeef); hmf = SetMetaFileBitsEx(0, MF_GRAPHICS_BITS); + trace("hmf %p\n", hmf); ok(!hmf, "SetMetaFileBitsEx should fail\n"); ok(GetLastError() == ERROR_INVALID_DATA || broken(GetLastError() == ERROR_INVALID_PARAMETER), /* Win9x */ "wrong error %d\n", GetLastError()); - /* Now with not even size */ + /* Now with odd size */ SetLastError(0xdeadbeef); hmf = SetMetaFileBitsEx(sizeof(MF_GRAPHICS_BITS) - 1, MF_GRAPHICS_BITS); + trace("hmf %p\n", hmf); ok(!hmf, "SetMetaFileBitsEx should fail\n"); ok(GetLastError() == 0xdeadbeef /* XP SP1 */, "wrong error %d\n", GetLastError()); - /* Now with zeroed out or faked some header fields */ + /* Now with zeroed out header fields */ assert(sizeof(buf) >= sizeof(MF_GRAPHICS_BITS)); memcpy(buf, MF_GRAPHICS_BITS, sizeof(MF_GRAPHICS_BITS)); mh = (METAHEADER *)buf; @@ -1516,6 +1519,7 @@ static void test_SetMetaFileBits(void) mh->mtHeaderSize = 0; SetLastError(0xdeadbeef); hmf = SetMetaFileBitsEx(sizeof(MF_GRAPHICS_BITS), buf); + trace("hmf %p\n", hmf); ok(!hmf, "SetMetaFileBitsEx should fail\n"); ok(GetLastError() == ERROR_INVALID_DATA || broken(GetLastError() == ERROR_INVALID_PARAMETER), /* Win9x */ @@ -1527,6 +1531,7 @@ static void test_SetMetaFileBits(void) /* corruption of mtSize doesn't lead to a failure */ mh->mtSize *= 2; hmf = SetMetaFileBitsEx(sizeof(MF_GRAPHICS_BITS), buf); + trace("hmf %p\n", hmf); ok(hmf != 0, "SetMetaFileBitsEx error %d\n", GetLastError()); if (compare_mf_bits(hmf, MF_GRAPHICS_BITS, sizeof(MF_GRAPHICS_BITS), "mf_Graphics") != 0) @@ -1544,6 +1549,7 @@ static void test_SetMetaFileBits(void) /* zeroing mtSize doesn't lead to a failure */ mh->mtSize = 0; hmf = SetMetaFileBitsEx(sizeof(MF_GRAPHICS_BITS), buf); + trace("hmf %p\n", hmf); ok(hmf != 0, "SetMetaFileBitsEx error %d\n", GetLastError()); if (compare_mf_bits(hmf, MF_GRAPHICS_BITS, sizeof(MF_GRAPHICS_BITS), "mf_Graphics") != 0)

1 0

Huw Davies : gdi32: Add tests for the map mode and window size records.
by Alexandre Julliard July 2, 2009

July 2, 2009

Module: wine Branch: master Commit: 12adc3e1fb0edb50ecab29d6cc31d5cf7b699efa URL: http://source.winehq.org/git/wine.git/?a=commit;h=12adc3e1fb0edb50ecab29d6c… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jul 2 11:56:29 2009 +0100 gdi32: Add tests for the map mode and window size records. --- dlls/gdi32/tests/metafile.c | 78 +++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 75 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 2b695d8..4aa177b 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -2302,20 +2302,26 @@ static void test_SetWinMetaFileBits(void) HeapFree(GetProcessHeap(), 0, buffer); } -static void test_GetWinMetaFileBits(void) +static void getwinmetafilebits(UINT mode, int scale) { HENHMETAFILE emf; HDC display_dc, emf_dc; RECT rc; ENHMETAHEADER *enh_header; - UINT size, emf_size, i, mode; + UINT size, emf_size, i; WORD check = 0; DWORD rec_num = 0; METAHEADER *mh; METARECORD *rec; + INT horz_res, vert_res, horz_size, vert_size; display_dc = GetDC(NULL); + horz_res = GetDeviceCaps(display_dc, HORZRES); + vert_res = GetDeviceCaps(display_dc, VERTRES); + horz_size = GetDeviceCaps(display_dc, HORZSIZE); + vert_size = GetDeviceCaps(display_dc, VERTSIZE); + SetRect(&rc, 1000, 2000, 3000, 6000); emf_dc = CreateEnhMetaFileA(display_dc, NULL, &rc, NULL); for(i = 0; i < 3000; i++) /* This is enough to take emf_size > 0xffff */ @@ -2325,9 +2331,14 @@ static void test_GetWinMetaFileBits(void) emf_size = GetEnhMetaFileBits(emf, 0, NULL); enh_header = HeapAlloc(GetProcessHeap(), 0, emf_size); emf_size = GetEnhMetaFileBits(emf, emf_size, (BYTE*)enh_header); + DeleteEnhMetaFile(emf); + /* multiply szlDevice.cx by scale, when scale != 1 the recording and playback dcs + have different resolutions */ + enh_header->szlDevice.cx *= scale; + emf = SetEnhMetaFileBits(emf_size, (BYTE*)enh_header); - mode = MM_ANISOTROPIC; size = GetWinMetaFileBits(emf, 0, NULL, mode, display_dc); + ok(size, "GetWinMetaFileBits returns 0\n"); mh = HeapAlloc(GetProcessHeap(), 0, size); GetWinMetaFileBits(emf, size, (BYTE*)mh, mode, display_dc); @@ -2372,6 +2383,56 @@ static void test_GetWinMetaFileBits(void) ok(!memcmp(rec->rdParm + 19, (char*)enh_header + rec_num * chunk_size, this_chunk_size), "bits mismatch\n"); } + else if(rec_num == mfcomment_chunks) + { + ok(rec->rdFunction == META_SETMAPMODE, "got %04x\n", rec->rdFunction); + ok(rec->rdParm[0] == mode, "got %04x\n", rec->rdParm[0]); + } + else if(rec_num == mfcomment_chunks + 1) + { + POINT pt; + ok(rec->rdFunction == META_SETWINDOWORG, "got %04x\n", rec->rdFunction); + switch(mode) + { + case MM_TEXT: + case MM_ISOTROPIC: + case MM_ANISOTROPIC: + pt.y = MulDiv(rc.top, vert_res, vert_size * 100); + pt.x = MulDiv(rc.left, horz_res, horz_size * 100); + break; + case MM_LOMETRIC: + pt.y = MulDiv(-rc.top, 1, 10) + 1; + pt.x = MulDiv(rc.left, 1, 10); + break; + case MM_HIMETRIC: + pt.y = -rc.top + 1; + pt.x = rc.left; + break; + case MM_LOENGLISH: + pt.y = MulDiv(-rc.top, 10, 254) + 1; + pt.x = MulDiv( rc.left, 10, 254); + break; + case MM_HIENGLISH: + pt.y = MulDiv(-rc.top, 100, 254) + 1; + pt.x = MulDiv( rc.left, 100, 254); + break; + case MM_TWIPS: + pt.y = MulDiv(-rc.top, 72 * 20, 2540) + 1; + pt.x = MulDiv( rc.left, 72 * 20, 2540); + break; + default: + pt.x = pt.y = 0; + } + ok((short)rec->rdParm[0] == pt.y, "got %d expect %d\n", (short)rec->rdParm[0], pt.y); + ok((short)rec->rdParm[1] == pt.x, "got %d expect %d\n", (short)rec->rdParm[1], pt.x); + } + if(rec_num == mfcomment_chunks + 2) + { + ok(rec->rdFunction == META_SETWINDOWEXT, "got %04x\n", rec->rdFunction); + ok((short)rec->rdParm[0] == MulDiv(rc.bottom - rc.top, vert_res, vert_size * 100), "got %d\n", (short)rec->rdParm[0]); + ok((short)rec->rdParm[1] == MulDiv(rc.right - rc.left, horz_res, horz_size * 100), "got %d\n", (short)rec->rdParm[1]); + } + rec_num++; rec = (METARECORD*)((WORD*)rec + rec->rdSize); } @@ -2383,6 +2444,17 @@ static void test_GetWinMetaFileBits(void) ReleaseDC(NULL, display_dc); } +static void test_GetWinMetaFileBits(void) +{ + UINT mode; + + for(mode = MM_MIN; mode <= MM_MAX; mode++) + { + getwinmetafilebits(mode, 1); + getwinmetafilebits(mode, 2); + } +} + static BOOL (WINAPI *pGdiIsMetaPrintDC)(HDC); static BOOL (WINAPI *pGdiIsMetaFileDC)(HDC); static BOOL (WINAPI *pGdiIsPlayMetafileDC)(HDC);

1 0

Alexandre Julliard : makefiles: Remove the no longer used SPEC_SRCS variable from 16-bit makefiles.
by Alexandre Julliard July 2, 2009

July 2, 2009

Module: wine Branch: master Commit: 781f4b838d45349dc7362bdd92feab611f3ad194 URL: http://source.winehq.org/git/wine.git/?a=commit;h=781f4b838d45349dc7362bdd9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 2 14:08:33 2009 +0200 makefiles: Remove the no longer used SPEC_SRCS variable from 16-bit makefiles. --- dlls/avifile.dll16/Makefile.in | 2 -- dlls/comm.drv16/Makefile.in | 2 -- dlls/compobj.dll16/Makefile.in | 2 -- dlls/ctl3d.dll16/Makefile.in | 2 -- dlls/ctl3dv2.dll16/Makefile.in | 2 -- dlls/ddeml.dll16/Makefile.in | 2 -- dlls/dispdib.dll16/Makefile.in | 2 -- dlls/display.drv16/Makefile.in | 2 -- dlls/imm.dll16/Makefile.in | 2 -- dlls/keyboard.drv16/Makefile.in | 2 -- dlls/lzexpand.dll16/Makefile.in | 2 -- dlls/mouse.drv16/Makefile.in | 2 -- dlls/msacm.dll16/Makefile.in | 2 -- dlls/msvideo.dll16/Makefile.in | 2 -- dlls/ole2.dll16/Makefile.in | 2 -- dlls/ole2conv.dll16/Makefile.in | 2 -- dlls/ole2disp.dll16/Makefile.in | 2 -- dlls/ole2nls.dll16/Makefile.in | 2 -- dlls/ole2prox.dll16/Makefile.in | 2 -- dlls/ole2thk.dll16/Makefile.in | 2 -- dlls/olecli.dll16/Makefile.in | 2 -- dlls/olesvr.dll16/Makefile.in | 2 -- dlls/rasapi16.dll16/Makefile.in | 2 -- dlls/shell.dll16/Makefile.in | 2 -- dlls/sound.drv16/Makefile.in | 2 -- dlls/storage.dll16/Makefile.in | 2 -- dlls/stress.dll16/Makefile.in | 2 -- dlls/twain.dll16/Makefile.in | 2 -- dlls/typelib.dll16/Makefile.in | 2 -- dlls/w32sys.dll16/Makefile.in | 2 -- dlls/win32s16.dll16/Makefile.in | 2 -- dlls/win87em.dll16/Makefile.in | 2 -- dlls/winaspi.dll16/Makefile.in | 2 -- dlls/windebug.dll16/Makefile.in | 2 -- dlls/winnls.dll16/Makefile.in | 2 -- dlls/wintab.dll16/Makefile.in | 2 -- 36 files changed, 0 insertions(+), 72 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=781f4b838d45349dc7362…

1 0

Rein Klazes : comdlg32: Don' t call ShowWindow for the custom dialog until all rearrangements of the file dialog have been done .
by Alexandre Julliard July 2, 2009

July 2, 2009

Module: wine Branch: master Commit: f9c8e7e38a7a2d5923c0f9535c4dc8e8707b9ddd URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9c8e7e38a7a2d5923c0f9535… Author: Rein Klazes <wijn(a)online.nl> Date: Thu Jul 2 13:32:28 2009 +0200 comdlg32: Don't call ShowWindow for the custom dialog until all rearrangements of the file dialog have been done. --- dlls/comdlg32/filedlg.c | 9 ++++----- dlls/comdlg32/tests/filedlg.c | 19 +++++++++++++++++++ dlls/comdlg32/tests/rsrc.rc | 2 +- 3 files changed, 24 insertions(+), 6 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index e2d6a30..fd75479 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -789,11 +789,7 @@ static HWND CreateTemplateDialog(FileOpenDlgInfos *fodInfos, HWND hwnd) hChildDlg = CreateDialogIndirectParamA(hinst, template, hwnd, IsHooked(fodInfos) ? (DLGPROC)fodInfos->ofnInfos->lpfnHook : FileOpenDlgProcUserTemplate, (LPARAM)fodInfos->ofnInfos); - if(hChildDlg) - { - ShowWindow(hChildDlg,SW_SHOW); - return hChildDlg; - } + return hChildDlg; } else if( IsHooked(fodInfos)) { @@ -1153,6 +1149,9 @@ INT_PTR CALLBACK FileOpenDlgProc95(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM l FILEDLG95_ResizeControls(hwnd, wParam, lParam); FILEDLG95_FillControls(hwnd, wParam, lParam); + if( fodInfos->DlgInfos.hwndCustomDlg) + ShowWindow( fodInfos->DlgInfos.hwndCustomDlg, SW_SHOW); + if(fodInfos->ofnInfos->Flags & OFN_EXPLORER) SendCustomDlgNotificationMessage(hwnd,CDN_INITDONE); diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index 0b1561e..6272f72 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -296,6 +296,7 @@ static LONG_PTR WINAPI resize_template_hook(HWND dlg, UINT msg, WPARAM wParam, L { static RECT initrc, rc; static int index, count; + static int gotSWP_bottom, gotShowWindow; HWND parent = GetParent( dlg); int resize; switch( msg) @@ -306,6 +307,7 @@ static LONG_PTR WINAPI resize_template_hook(HWND dlg, UINT msg, WPARAM wParam, L index = ((OPENFILENAME*)lParam)->lCustData; count = 0; + gotSWP_bottom = gotShowWindow = 0; /* test style */ style = GetWindowLong( parent, GWL_STYLE); if( resize_testcases[index].flags & OFN_ENABLESIZING) @@ -372,6 +374,23 @@ static LONG_PTR WINAPI resize_template_hook(HWND dlg, UINT msg, WPARAM wParam, L count++; } break; + case WM_WINDOWPOSCHANGING: + { + WINDOWPOS *pwp = (WINDOWPOS *)lParam; + if( !index && pwp->hwndInsertAfter == HWND_BOTTOM){ + gotSWP_bottom = 1; + ok( gotShowWindow == 0, "The WM_WINDOWPOSCHANGING message came after a WM_SHOWWINDOW message\n"); + } + } + break; + case WM_SHOWWINDOW: + { + if( !index){ + gotShowWindow = 1; + ok( gotSWP_bottom == 1, "No WM_WINDOWPOSCHANGING message came before a WM_SHOWWINDOW message\n"); + } + } + break; } return 0; } diff --git a/dlls/comdlg32/tests/rsrc.rc b/dlls/comdlg32/tests/rsrc.rc index 9600d85..ffd30f9 100644 --- a/dlls/comdlg32/tests/rsrc.rc +++ b/dlls/comdlg32/tests/rsrc.rc @@ -39,7 +39,7 @@ FONT 8, "MS Shell Dlg" * This will work with 640x480 pixels */ TEMPLATE_SZ DIALOG LOADONCALL MOVEABLE DISCARDABLE 5, 43, 300, 40 -STYLE WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS +STYLE WS_CHILD | WS_CLIPSIBLINGS FONT 8, "MS Shell Dlg" { LTEXT "Path:",-1,28,4,36,8

1 0

Michael Stefaniuc : cryptui: Build language resource files separately.
by Alexandre Julliard July 2, 2009

July 2, 2009

Module: wine Branch: master Commit: 7460c996bee583d4389e82a5550750e8e34fdf47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7460c996bee583d4389e82a55… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 2 12:32:59 2009 +0200 cryptui: Build language resource files separately. --- dlls/cryptui/Makefile.in | 8 +++++++- dlls/cryptui/cryptui.rc | 11 ----------- dlls/cryptui/cryptui_De.rc | 4 ++-- dlls/cryptui/cryptui_En.rc | 2 ++ dlls/cryptui/cryptui_Fr.rc | 4 ++-- dlls/cryptui/cryptui_Ko.rc | 1 + dlls/cryptui/cryptui_Nl.rc | 2 ++ dlls/cryptui/cryptuires.h | 4 ++++ 8 files changed, 20 insertions(+), 16 deletions(-) diff --git a/dlls/cryptui/Makefile.in b/dlls/cryptui/Makefile.in index ca01d35..cf91d74 100644 --- a/dlls/cryptui/Makefile.in +++ b/dlls/cryptui/Makefile.in @@ -10,7 +10,13 @@ IMPORTLIB = cryptui C_SRCS = \ main.c -RC_SRCS = cryptui.rc +RC_SRCS = \ + cryptui.rc \ + cryptui_De.rc \ + cryptui_En.rc \ + cryptui_Fr.rc \ + cryptui_Ko.rc \ + cryptui_Nl.rc @MAKE_DLL_RULES@ diff --git a/dlls/cryptui/cryptui.rc b/dlls/cryptui/cryptui.rc index 60fe170..00d4902 100644 --- a/dlls/cryptui/cryptui.rc +++ b/dlls/cryptui/cryptui.rc @@ -17,11 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "commctrl.h" -#include "dlgs.h" #include "cryptuires.h" @@ -45,9 +40,3 @@ IDB_CERT_WATERMARK BITMAP LOADONCALL DISCARDABLE certwatermark.bmp /* @makedep: certheader.bmp */ IDB_CERT_HEADER BITMAP LOADONCALL DISCARDABLE certheader.bmp - -#include "cryptui_De.rc" -#include "cryptui_En.rc" -#include "cryptui_Fr.rc" -#include "cryptui_Ko.rc" -#include "cryptui_Nl.rc" diff --git a/dlls/cryptui/cryptui_De.rc b/dlls/cryptui/cryptui_De.rc index dcd7ac8..d34d883 100644 --- a/dlls/cryptui/cryptui_De.rc +++ b/dlls/cryptui/cryptui_De.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "cryptuires.h" + #pragma code_page(65001) LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL @@ -461,5 +463,3 @@ BEGIN LVS_REPORT|LVS_NOCOLUMNHEADER|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 115,67,174,100 END - -#pragma code_page(default) diff --git a/dlls/cryptui/cryptui_En.rc b/dlls/cryptui/cryptui_En.rc index b10e101..1335f0e 100644 --- a/dlls/cryptui/cryptui_En.rc +++ b/dlls/cryptui/cryptui_En.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "cryptuires.h" + LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE diff --git a/dlls/cryptui/cryptui_Fr.rc b/dlls/cryptui/cryptui_Fr.rc index 174f691..22fceda 100644 --- a/dlls/cryptui/cryptui_Fr.rc +++ b/dlls/cryptui/cryptui_Fr.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "cryptuires.h" + /* UTF-8 */ #pragma code_page(65001) @@ -462,5 +464,3 @@ BEGIN LVS_REPORT|LVS_NOCOLUMNHEADER|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 115,67,174,100 END - -#pragma code_page(default) diff --git a/dlls/cryptui/cryptui_Ko.rc b/dlls/cryptui/cryptui_Ko.rc index 57e9138..6cbf6fe 100644 --- a/dlls/cryptui/cryptui_Ko.rc +++ b/dlls/cryptui/cryptui_Ko.rc @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "cryptuires.h" LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT diff --git a/dlls/cryptui/cryptui_Nl.rc b/dlls/cryptui/cryptui_Nl.rc index d046d37..a346083 100644 --- a/dlls/cryptui/cryptui_Nl.rc +++ b/dlls/cryptui/cryptui_Nl.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "cryptuires.h" + LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE diff --git a/dlls/cryptui/cryptuires.h b/dlls/cryptui/cryptuires.h index b46ea4e..716dba5 100644 --- a/dlls/cryptui/cryptuires.h +++ b/dlls/cryptui/cryptuires.h @@ -18,6 +18,10 @@ #ifndef __CRYPTUIRES_H_ #define __CRYPTUIRES_H_ +#include <windef.h> +#include <winuser.h> +#include <commctrl.h> + #define IDS_CERTIFICATE 1000 #define IDS_CERTIFICATEINFORMATION 1001 #define IDS_CERT_INFO_BAD_SIG 1002

1 0

Alexander Scott-Johns : notepad: Fix trying to open non-existent files with the command line.
by Alexandre Julliard July 2, 2009

July 2, 2009

Module: wine Branch: master Commit: 42729bc1c1cc513a82cae4f793dccce52da71ddb URL: http://source.winehq.org/git/wine.git/?a=commit;h=42729bc1c1cc513a82cae4f79… Author: Alexander Scott-Johns <alexander.scott.johns(a)googlemail.com> Date: Tue Jun 30 21:25:02 2009 +0100 notepad: Fix trying to open non-existent files with the command line. --- programs/notepad/dialog.c | 2 +- programs/notepad/dialog.h | 1 + programs/notepad/main.c | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/programs/notepad/dialog.c b/programs/notepad/dialog.c index d7354e7..026fe25 100644 --- a/programs/notepad/dialog.c +++ b/programs/notepad/dialog.c @@ -59,7 +59,7 @@ VOID ShowLastError(void) * Untitled - Notepad if no file is open * filename - Notepad if a file is given */ -static void UpdateWindowCaption(void) +void UpdateWindowCaption(void) { WCHAR szCaption[MAX_STRING_LEN]; WCHAR szNotepad[MAX_STRING_LEN]; diff --git a/programs/notepad/dialog.h b/programs/notepad/dialog.h index d927143..38c20e4 100644 --- a/programs/notepad/dialog.h +++ b/programs/notepad/dialog.h @@ -52,6 +52,7 @@ int DIALOG_StringMsgBox(HWND hParent, int formatId, LPCWSTR szString, DWORD dwFl /* utility functions */ VOID ShowLastError(void); +void UpdateWindowCaption(void); BOOL FileExists(LPCWSTR szFilename); BOOL DoCloseFile(void); void DoOpenFile(LPCWSTR szFileName); diff --git a/programs/notepad/main.c b/programs/notepad/main.c index c195668..7e33372 100644 --- a/programs/notepad/main.c +++ b/programs/notepad/main.c @@ -698,7 +698,8 @@ static void HandleCommandLine(LPWSTR cmdline) { switch (AlertFileDoesNotExist(file_name)) { case IDYES: - DoOpenFile(file_name); + SetFileName(file_name); + UpdateWindowCaption(); break; case IDNO:

1 0

Huw Davies : gdi32: Write the map mode and window size records after the mfcomment.
by Alexandre Julliard July 2, 2009

July 2, 2009

Module: wine Branch: master Commit: 8edbd0639ed9c6586b10e2d7600ae3db4570080a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8edbd0639ed9c6586b10e2d76… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jul 2 11:37:29 2009 +0100 gdi32: Write the map mode and window size records after the mfcomment. --- dlls/gdi32/metafile.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 69 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/metafile.c b/dlls/gdi32/metafile.c index d0c55ce..2e34f37 100644 --- a/dlls/gdi32/metafile.c +++ b/dlls/gdi32/metafile.c @@ -1223,11 +1223,71 @@ end: } /****************************************************************** + * set_window + * + * Helper for GetWinMetaFileBits + * + * Add the SetWindowOrg and SetWindowExt records + */ +static BOOL set_window(HDC hdc, HENHMETAFILE emf, HDC ref_dc, INT map_mode) +{ + ENHMETAHEADER header; + INT horz_res, vert_res, horz_size, vert_size; + POINT pt; + + if(!GetEnhMetaFileHeader(emf, sizeof(header), &header)) return FALSE; + + horz_res = GetDeviceCaps(ref_dc, HORZRES); + vert_res = GetDeviceCaps(ref_dc, VERTRES); + horz_size = GetDeviceCaps(ref_dc, HORZSIZE); + vert_size = GetDeviceCaps(ref_dc, VERTSIZE); + + switch(map_mode) + { + case MM_TEXT: + case MM_ISOTROPIC: + case MM_ANISOTROPIC: + pt.y = MulDiv(header.rclFrame.top, vert_res, vert_size * 100); + pt.x = MulDiv(header.rclFrame.left, horz_res, horz_size * 100); + break; + case MM_LOMETRIC: + pt.y = MulDiv(-header.rclFrame.top, 1, 10) + 1; + pt.x = MulDiv( header.rclFrame.left, 1, 10); + break; + case MM_HIMETRIC: + pt.y = -header.rclFrame.top + 1; + pt.x = header.rclFrame.left; + break; + case MM_LOENGLISH: + pt.y = MulDiv(-header.rclFrame.top, 10, 254) + 1; + pt.x = MulDiv( header.rclFrame.left, 10, 254); + break; + case MM_HIENGLISH: + pt.y = MulDiv(-header.rclFrame.top, 100, 254) + 1; + pt.x = MulDiv( header.rclFrame.left, 100, 254); + break; + case MM_TWIPS: + pt.y = MulDiv(-header.rclFrame.top, 72 * 20, 2540) + 1; + pt.x = MulDiv( header.rclFrame.left, 72 * 20, 2540); + break; + default: + WARN("Unknown map mode %d\n", map_mode); + return FALSE; + } + SetWindowOrgEx(hdc, pt.x, pt.y, NULL); + + pt.x = MulDiv(header.rclFrame.right - header.rclFrame.left, horz_res, horz_size * 100); + pt.y = MulDiv(header.rclFrame.bottom - header.rclFrame.top, vert_res, vert_size * 100); + SetWindowExtEx(hdc, pt.x, pt.y, NULL); + return TRUE; +} + +/****************************************************************** * GetWinMetaFileBits [GDI32.@] */ UINT WINAPI GetWinMetaFileBits(HENHMETAFILE hemf, UINT cbBuffer, LPBYTE lpbBuffer, - INT fnMapMode, HDC hdcRef) + INT map_mode, HDC hdcRef) { HDC hdcmf; HMETAFILE hmf; @@ -1237,11 +1297,14 @@ UINT WINAPI GetWinMetaFileBits(HENHMETAFILE hemf, GetClipBox(hdcRef, &rc); TRACE("(%p,%d,%p,%d,%p) rc=%s\n", hemf, cbBuffer, lpbBuffer, - fnMapMode, hdcRef, wine_dbgstr_rect(&rc)); + map_mode, hdcRef, wine_dbgstr_rect(&rc)); hdcmf = CreateMetaFileW(NULL); add_mf_comment(hdcmf, hemf); + SetMapMode(hdcmf, map_mode); + if(!set_window(hdcmf, hemf, hdcRef, map_mode)) + goto error; PlayEnhMetaFile(hdcmf, hemf, &rc); hmf = CloseMetaFile(hdcmf); @@ -1260,6 +1323,10 @@ UINT WINAPI GetWinMetaFileBits(HENHMETAFILE hemf, comment_rec->rdParm[8] = ~checksum + 1; } return ret; + +error: + DeleteMetaFile(CloseMetaFile(hdcmf)); + return 0; } /******************************************************************

1 0

Dmitry Timoshkov : user32: Add a test for BM_SETSTYLE, make it pass under Wine.
by Alexandre Julliard July 2, 2009

July 2, 2009

Module: wine Branch: master Commit: 87418f0aaac3a16f8c715923f044fe153d6c4da5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87418f0aaac3a16f8c715923f… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Jul 2 19:27:18 2009 +0900 user32: Add a test for BM_SETSTYLE, make it pass under Wine. --- dlls/user32/button.c | 14 ++++++- dlls/user32/tests/msg.c | 86 ++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 83 insertions(+), 17 deletions(-) diff --git a/dlls/user32/button.c b/dlls/user32/button.c index 926563c..a61a4e7 100644 --- a/dlls/user32/button.c +++ b/dlls/user32/button.c @@ -75,6 +75,7 @@ #include "wingdi.h" #include "wine/winuser16.h" #include "controls.h" +#include "win.h" #include "user_private.h" #include "wine/debug.h" @@ -271,6 +272,13 @@ static LRESULT ButtonWndProc_common(HWND hWnd, UINT uMsg, } if (btn_type >= MAX_BTN_TYPE) return -1; /* abort */ + + /* XP turns a BS_USERBUTTON into BS_PUSHBUTTON */ + if (btn_type == BS_USERBUTTON ) + { + style = (style & ~0x0f) | BS_PUSHBUTTON; + WIN_SetStyle( hWnd, style, 0x0f & ~style ); + } set_button_state( hWnd, BUTTON_UNCHECKED ); return 0; @@ -458,11 +466,11 @@ static LRESULT ButtonWndProc_common(HWND hWnd, UINT uMsg, if ((wParam & 0x0f) >= MAX_BTN_TYPE) break; btn_type = wParam & 0x0f; style = (style & ~0x0f) | btn_type; - SetWindowLongW( hWnd, GWL_STYLE, style ); + WIN_SetStyle( hWnd, style, 0x0f & ~style ); /* Only redraw if lParam flag is set.*/ if (lParam) - paint_button( hWnd, btn_type, ODA_DRAWENTIRE ); + InvalidateRect( hWnd, NULL, TRUE ); break; @@ -1105,6 +1113,8 @@ static void UB_Paint( HWND hwnd, HDC hDC, UINT action ) if ((action == ODA_FOCUS) || ((action == ODA_DRAWENTIRE) && (state & BUTTON_HASFOCUS))) DrawFocusRect( hDC, &rc ); + + BUTTON_NOTIFY_PARENT( hwnd, BN_PAINT ); } diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 580582f..0e6ed29 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -5209,6 +5209,49 @@ static const struct message WmSetFontButtonSeq[] = { WM_CTLCOLORBTN, sent|defwinproc }, { 0 } }; +static const struct message WmSetStyleButtonSeq[] = +{ + { BM_SETSTYLE, sent }, + { WM_APP, sent|wparam|lparam, 0, 0 }, + { WM_PAINT, sent }, + { WM_NCPAINT, sent|defwinproc|optional }, /* FIXME: Wine sends it */ + { WM_ERASEBKGND, sent|defwinproc }, + { WM_CTLCOLORBTN, sent|parent }, + { 0 } +}; +static const struct message WmSetStyleStaticSeq[] = +{ + { BM_SETSTYLE, sent }, + { WM_APP, sent|wparam|lparam, 0, 0 }, + { WM_PAINT, sent }, + { WM_NCPAINT, sent|defwinproc|optional }, /* FIXME: Wine sends it */ + { WM_ERASEBKGND, sent|defwinproc }, + { WM_CTLCOLORSTATIC, sent|parent }, + { 0 } +}; +static const struct message WmSetStyleUserSeq[] = +{ + { BM_SETSTYLE, sent }, + { WM_APP, sent|wparam|lparam, 0, 0 }, + { WM_PAINT, sent }, + { WM_NCPAINT, sent|defwinproc|optional }, /* FIXME: Wine sends it */ + { WM_ERASEBKGND, sent|defwinproc }, + { WM_CTLCOLORBTN, sent|parent }, + { WM_COMMAND, sent|wparam|parent, MAKEWPARAM(ID_BUTTON, BN_PAINT) }, + { 0 } +}; +static const struct message WmSetStyleOwnerdrawSeq[] = +{ + { BM_SETSTYLE, sent }, + { WM_APP, sent|wparam|lparam, 0, 0 }, + { WM_PAINT, sent }, + { WM_NCPAINT, sent|optional }, /* FIXME: Wine sends it */ + { WM_ERASEBKGND, sent|defwinproc }, + { WM_CTLCOLORBTN, sent|parent }, + { WM_CTLCOLORBTN, sent|parent }, + { WM_DRAWITEM, sent|wparam|lparam|parent, ID_BUTTON, 0x000010e4 }, + { 0 } +}; static WNDPROC old_button_proc; @@ -5268,29 +5311,30 @@ static void test_button_messages(void) DWORD dlg_code; const struct message *setfocus; const struct message *killfocus; + const struct message *setstyle; } button[] = { { BS_PUSHBUTTON, DLGC_BUTTON | DLGC_UNDEFPUSHBUTTON, - WmSetFocusButtonSeq, WmKillFocusButtonSeq }, + WmSetFocusButtonSeq, WmKillFocusButtonSeq, WmSetStyleButtonSeq }, { BS_DEFPUSHBUTTON, DLGC_BUTTON | DLGC_DEFPUSHBUTTON, - WmSetFocusButtonSeq, WmKillFocusButtonSeq }, + WmSetFocusButtonSeq, WmKillFocusButtonSeq, WmSetStyleButtonSeq }, { BS_CHECKBOX, DLGC_BUTTON, - WmSetFocusStaticSeq, WmKillFocusStaticSeq }, + WmSetFocusStaticSeq, WmKillFocusStaticSeq, WmSetStyleStaticSeq }, { BS_AUTOCHECKBOX, DLGC_BUTTON, - WmSetFocusStaticSeq, WmKillFocusStaticSeq }, + WmSetFocusStaticSeq, WmKillFocusStaticSeq, WmSetStyleStaticSeq }, { BS_RADIOBUTTON, DLGC_BUTTON | DLGC_RADIOBUTTON, - WmSetFocusStaticSeq, WmKillFocusStaticSeq }, + WmSetFocusStaticSeq, WmKillFocusStaticSeq, WmSetStyleStaticSeq }, { BS_3STATE, DLGC_BUTTON, - WmSetFocusStaticSeq, WmKillFocusStaticSeq }, + WmSetFocusStaticSeq, WmKillFocusStaticSeq, WmSetStyleStaticSeq }, { BS_AUTO3STATE, DLGC_BUTTON, - WmSetFocusStaticSeq, WmKillFocusStaticSeq }, + WmSetFocusStaticSeq, WmKillFocusStaticSeq, WmSetStyleStaticSeq }, { BS_GROUPBOX, DLGC_STATIC, - WmSetFocusStaticSeq, WmKillFocusStaticSeq }, + WmSetFocusStaticSeq, WmKillFocusStaticSeq, WmSetStyleStaticSeq }, { BS_USERBUTTON, DLGC_BUTTON | DLGC_UNDEFPUSHBUTTON, - WmSetFocusButtonSeq, WmKillFocusButtonSeq }, + WmSetFocusButtonSeq, WmKillFocusButtonSeq, WmSetStyleUserSeq }, { BS_AUTORADIOBUTTON, DLGC_BUTTON | DLGC_RADIOBUTTON, - WmSetFocusStaticSeq, WmKillFocusStaticSeq }, + WmSetFocusStaticSeq, WmKillFocusStaticSeq, WmSetStyleStaticSeq }, { BS_OWNERDRAW, DLGC_BUTTON, - WmSetFocusOwnerdrawSeq, WmKillFocusOwnerdrawSeq } + WmSetFocusOwnerdrawSeq, WmKillFocusOwnerdrawSeq, WmSetStyleOwnerdrawSeq } }; unsigned int i; HWND hwnd, parent; @@ -5319,6 +5363,8 @@ static void test_button_messages(void) MSG msg; DWORD style; + trace("button style %08x\n", button[i].style); + hwnd = CreateWindowExA(0, "my_button_class", "test", button[i].style | WS_CHILD | BS_NOTIFY, 0, 0, 50, 14, parent, (HMENU)ID_BUTTON, 0, NULL); ok(hwnd != 0, "Failed to create button window\n"); @@ -5327,9 +5373,9 @@ static void test_button_messages(void) style &= ~(WS_CHILD | BS_NOTIFY); /* XP turns a BS_USERBUTTON into BS_PUSHBUTTON */ if (button[i].style == BS_USERBUTTON) - todo_wine ok(style == BS_PUSHBUTTON, "expected style BS_PUSHBUTTON got %x\n", style); + ok(style == BS_PUSHBUTTON, "expected style BS_PUSHBUTTON got %x\n", style); else - ok(style == button[i].style, "expected style %x got %x\n", button[i].style, style); + ok(style == button[i].style, "expected style %x got %x\n", button[i].style, style); dlg_code = SendMessageA(hwnd, WM_GETDLGCODE, 0, 0); ok(dlg_code == button[i].dlg_code, "%u: wrong dlg_code %08x\n", i, dlg_code); @@ -5342,7 +5388,6 @@ static void test_button_messages(void) log_all_parent_messages++; - trace("button style %08x\n", button[i].style); ok(GetFocus() == 0, "expected focus 0, got %p\n", GetFocus()); SetFocus(hwnd); SendMessage(hwnd, WM_APP, 0, 0); /* place a separator mark here */ @@ -5354,9 +5399,20 @@ static void test_button_messages(void) while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessage(&msg); ok_sequence(button[i].killfocus, "SetFocus(0) on a button", FALSE); + ok(GetFocus() == 0, "expected focus 0, got %p\n", GetFocus()); + + SendMessage(hwnd, BM_SETSTYLE, button[i].style | BS_BOTTOM, TRUE); + SendMessage(hwnd, WM_APP, 0, 0); /* place a separator mark here */ + while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessage(&msg); + ok_sequence(button[i].setstyle, "BM_SETSTYLE on a button", FALSE); + + style = GetWindowLongA(hwnd, GWL_STYLE); + style &= ~(WS_VISIBLE | WS_CHILD | BS_NOTIFY); + /* XP doesn't turn a BS_USERBUTTON into BS_PUSHBUTTON here! */ + ok(style == button[i].style, "expected style %x got %x\n", button[i].style, style); + log_all_parent_messages--; - ok(GetFocus() == 0, "expected focus 0, got %p\n", GetFocus()); DestroyWindow(hwnd); }

1 0

Alexander Scott-Johns : notepad: Remember the encoding of files when they are opened, and use the same encoding when saving.
by Alexandre Julliard July 2, 2009

July 2, 2009

Module: wine Branch: master Commit: 080cc909929dc4eb64711120b6544d5f42634ebf URL: http://source.winehq.org/git/wine.git/?a=commit;h=080cc909929dc4eb64711120b… Author: Alexander Scott-Johns <alexander.scott.johns(a)googlemail.com> Date: Mon Jun 29 23:03:53 2009 +0100 notepad: Remember the encoding of files when they are opened, and use the same encoding when saving. --- programs/notepad/dialog.c | 82 +++++++++++++++++++++++++++++++++++--------- programs/notepad/main.c | 11 ++++-- programs/notepad/main.h | 3 +- 3 files changed, 74 insertions(+), 22 deletions(-) diff --git a/programs/notepad/dialog.c b/programs/notepad/dialog.c index 7f2fade..67a21a7 100644 --- a/programs/notepad/dialog.c +++ b/programs/notepad/dialog.c @@ -139,37 +139,82 @@ BOOL FileExists(LPCWSTR szFilename) static VOID DoSaveFile(VOID) { + int lenW; + WCHAR* textW; HANDLE hFile; DWORD dwNumWrite; - LPSTR pTemp; + PVOID pBytes; DWORD size; + /* lenW includes the byte-order mark, but not the \0. */ + lenW = GetWindowTextLengthW(Globals.hEdit) + 1; + textW = HeapAlloc(GetProcessHeap(), 0, (lenW+1) * sizeof(WCHAR)); + if (!textW) + { + ShowLastError(); + return; + } + textW[0] = (WCHAR) 0xfeff; + lenW = GetWindowTextW(Globals.hEdit, textW+1, lenW) + 1; + + switch (Globals.encFile) + { + case ENCODING_UTF16BE: + byteswap_wide_string(textW, lenW); + /* fall through */ + + case ENCODING_UTF16LE: + size = lenW * sizeof(WCHAR); + pBytes = textW; + break; + + case ENCODING_UTF8: + size = WideCharToMultiByte(CP_UTF8, 0, textW, lenW, NULL, 0, NULL, NULL); + pBytes = HeapAlloc(GetProcessHeap(), 0, size); + if (!pBytes) + { + ShowLastError(); + HeapFree(GetProcessHeap(), 0, textW); + return; + } + WideCharToMultiByte(CP_UTF8, 0, textW, lenW, pBytes, size, NULL, NULL); + HeapFree(GetProcessHeap(), 0, textW); + break; + + default: + size = WideCharToMultiByte(CP_ACP, 0, textW+1, lenW-1, NULL, 0, NULL, NULL); + pBytes = HeapAlloc(GetProcessHeap(), 0, size); + if (!pBytes) + { + ShowLastError(); + HeapFree(GetProcessHeap(), 0, textW); + return; + } + WideCharToMultiByte(CP_ACP, 0, textW+1, lenW-1, pBytes, size, NULL, NULL); + HeapFree(GetProcessHeap(), 0, textW); + break; + } + hFile = CreateFileW(Globals.szFileName, GENERIC_WRITE, FILE_SHARE_WRITE, NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); if(hFile == INVALID_HANDLE_VALUE) { ShowLastError(); + HeapFree(GetProcessHeap(), 0, pBytes); return; } - - size = GetWindowTextLengthA(Globals.hEdit) + 1; - pTemp = HeapAlloc(GetProcessHeap(), 0, size); - if (!pTemp) + if (!WriteFile(hFile, pBytes, size, &dwNumWrite, NULL)) { - CloseHandle(hFile); ShowLastError(); + CloseHandle(hFile); + HeapFree(GetProcessHeap(), 0, pBytes); return; } - size = GetWindowTextA(Globals.hEdit, pTemp, size); - - if (!WriteFile(hFile, pTemp, size, &dwNumWrite, NULL)) - ShowLastError(); - else - SendMessageW(Globals.hEdit, EM_SETMODIFY, FALSE, 0); - SetEndOfFile(hFile); CloseHandle(hFile); - HeapFree(GetProcessHeap(), 0, pTemp); + HeapFree(GetProcessHeap(), 0, pBytes); + + SendMessageW(Globals.hEdit, EM_SETMODIFY, FALSE, 0); } /** @@ -197,7 +242,7 @@ BOOL DoCloseFile(void) } /* switch */ } /* if */ - SetFileName(empty_strW); + SetFileNameAndEncoding(empty_strW, ENCODING_ANSI); UpdateWindowCaption(); return(TRUE); @@ -304,6 +349,9 @@ void DoOpenFile(LPCWSTR szFileName) { case ENCODING_UTF16BE: byteswap_wide_string((WCHAR*) pTemp, size/sizeof(WCHAR)); + /* Forget whether the file is BE or LE, like native Notepad. */ + enc = ENCODING_UTF16LE; + /* fall through */ case ENCODING_UTF16LE: @@ -349,7 +397,7 @@ void DoOpenFile(LPCWSTR szFileName) SendMessageW(Globals.hEdit, EM_REPLACESEL, TRUE, (LPARAM)lfW); } - SetFileName(szFileName); + SetFileNameAndEncoding(szFileName, enc); UpdateWindowCaption(); } @@ -429,7 +477,7 @@ BOOL DIALOG_FileSaveAs(VOID) saveas.lpstrDefExt = szDefaultExt; if (GetSaveFileNameW(&saveas)) { - SetFileName(szPath); + SetFileNameAndEncoding(szPath, Globals.encFile); UpdateWindowCaption(); DoSaveFile(); return TRUE; diff --git a/programs/notepad/main.c b/programs/notepad/main.c index 7e33372..98eec96 100644 --- a/programs/notepad/main.c +++ b/programs/notepad/main.c @@ -64,15 +64,18 @@ static const WCHAR value_szFooter[] = {'s','z','T','r','a','i','l','e',' /*********************************************************************** * - * SetFileName + * SetFileNameAndEncoding * - * Sets Global File Name. + * Sets global file name and encoding (which is used to preselect original + * encoding in Save As dialog, and when saving without using the Save As + * dialog). */ -VOID SetFileName(LPCWSTR szFileName) +VOID SetFileNameAndEncoding(LPCWSTR szFileName, ENCODING enc) { lstrcpyW(Globals.szFileName, szFileName); Globals.szFileTitle[0] = 0; GetFileTitleW(szFileName, Globals.szFileTitle, sizeof(Globals.szFileTitle)); + Globals.encFile = enc; } /****************************************************************************** @@ -698,7 +701,7 @@ static void HandleCommandLine(LPWSTR cmdline) { switch (AlertFileDoesNotExist(file_name)) { case IDYES: - SetFileName(file_name); + SetFileNameAndEncoding(file_name, ENCODING_ANSI); UpdateWindowCaption(); break; diff --git a/programs/notepad/main.h b/programs/notepad/main.h index bb9b7cc..ac8b6ca 100644 --- a/programs/notepad/main.h +++ b/programs/notepad/main.h @@ -46,6 +46,7 @@ typedef struct WCHAR szReplaceText[MAX_PATH]; WCHAR szFileName[MAX_PATH]; WCHAR szFileTitle[MAX_PATH]; + ENCODING encFile; WCHAR szFilter[2 * MAX_STRING_LEN + 100]; INT iMarginTop; INT iMarginBottom; @@ -62,6 +63,6 @@ typedef struct extern NOTEPAD_GLOBALS Globals; -VOID SetFileName(LPCWSTR szFileName); +VOID SetFileNameAndEncoding(LPCWSTR szFileName, ENCODING enc); void NOTEPAD_DoFind(FINDREPLACEW *fr); DWORD get_dpi(void);

1 0

Alexander Scott-Johns : notepad: Improve encoding detection when opening files.
by Alexandre Julliard July 2, 2009

July 2, 2009

Module: wine Branch: master Commit: 8b6b7b2c39d77f7cd29657ecc3956955e5aa75c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b6b7b2c39d77f7cd29657ecc… Author: Alexander Scott-Johns <alexander.scott.johns(a)googlemail.com> Date: Mon Jun 29 22:24:59 2009 +0100 notepad: Improve encoding detection when opening files. --- programs/notepad/dialog.c | 97 +++++++++++++++++++++++++++++++++++++++++--- programs/notepad/main.h | 8 ++++ 2 files changed, 98 insertions(+), 7 deletions(-) diff --git a/programs/notepad/dialog.c b/programs/notepad/dialog.c index 026fe25..7f2fade 100644 --- a/programs/notepad/dialog.c +++ b/programs/notepad/dialog.c @@ -26,6 +26,7 @@ #include <windows.h> #include <commdlg.h> #include <shlwapi.h> +#include <winternl.h> #include "main.h" #include "dialog.h" @@ -37,6 +38,13 @@ static const WCHAR helpfileW[] = { 'n','o','t','e','p','a','d','.','h','l','p',0 static INT_PTR WINAPI DIALOG_PAGESETUP_DlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam); +/* Swap bytes of WCHAR buffer (big-endian <-> little-endian). */ +static inline void byteswap_wide_string(LPWSTR str, UINT num) +{ + UINT i; + for (i = 0; i < num; i++) str[i] = RtlUshortByteSwap(str[i]); +} + VOID ShowLastError(void) { DWORD error = GetLastError(); @@ -195,6 +203,43 @@ BOOL DoCloseFile(void) return(TRUE); } +static inline ENCODING detect_encoding_of_buffer(const void* buffer, int size) +{ + static const char bom_utf8[] = { 0xef, 0xbb, 0xbf }; + if (size >= sizeof(bom_utf8) && !memcmp(buffer, bom_utf8, sizeof(bom_utf8))) + return ENCODING_UTF8; + else + { + int flags = IS_TEXT_UNICODE_SIGNATURE | + IS_TEXT_UNICODE_REVERSE_SIGNATURE | + IS_TEXT_UNICODE_ODD_LENGTH; + IsTextUnicode(buffer, size, &flags); + if (flags & IS_TEXT_UNICODE_SIGNATURE) + return ENCODING_UTF16LE; + else if (flags & IS_TEXT_UNICODE_REVERSE_SIGNATURE) + return ENCODING_UTF16BE; + else + return ENCODING_ANSI; + } +} + +/* Similar to SetWindowTextA, but uses a CP_UTF8 encoded input, not CP_ACP. + * lpTextInUtf8 should be NUL-terminated and not include the BOM. + * + * Returns FALSE on failure, TRUE on success, like SetWindowTextA/W. + */ +static BOOL SetWindowTextUtf8(HWND hwnd, LPCSTR lpTextInUtf8) +{ + BOOL ret; + int lenW = MultiByteToWideChar(CP_UTF8, 0, lpTextInUtf8, -1, NULL, 0); + LPWSTR textW = HeapAlloc(GetProcessHeap(), 0, lenW * sizeof(WCHAR)); + if (!textW) + return FALSE; + MultiByteToWideChar(CP_UTF8, 0, lpTextInUtf8, -1, textW, lenW); + ret = SetWindowTextW(hwnd, textW); + HeapFree(GetProcessHeap(), 0, textW); + return ret; +} void DoOpenFile(LPCWSTR szFileName) { @@ -203,6 +248,8 @@ void DoOpenFile(LPCWSTR szFileName) LPSTR pTemp; DWORD size; DWORD dwNumRead; + ENCODING enc; + BOOL succeeded; WCHAR log[5]; /* Close any files and prompt to save changes */ @@ -224,9 +271,9 @@ void DoOpenFile(LPCWSTR szFileName) ShowLastError(); return; } - size++; - pTemp = HeapAlloc(GetProcessHeap(), 0, size); + /* Extra memory for (WCHAR)'\0'-termination. */ + pTemp = HeapAlloc(GetProcessHeap(), 0, size+2); if (!pTemp) { CloseHandle(hFile); @@ -243,12 +290,48 @@ void DoOpenFile(LPCWSTR szFileName) } CloseHandle(hFile); - pTemp[dwNumRead] = 0; - if((size -1) >= 2 && (BYTE)pTemp[0] == 0xff && (BYTE)pTemp[1] == 0xfe) - SetWindowTextW(Globals.hEdit, (LPWSTR)pTemp + 1); - else - SetWindowTextA(Globals.hEdit, pTemp); + size = dwNumRead; + pTemp[size] = 0; /* make sure it's (char)'\0'-terminated */ + pTemp[size+1] = 0; /* make sure it's (WCHAR)'\0'-terminated */ + + enc = detect_encoding_of_buffer(pTemp, size); + + /* SetWindowTextUtf8 and SetWindowTextA try to allocate memory, so we + * check if they succeed. + */ + switch (enc) + { + case ENCODING_UTF16BE: + byteswap_wide_string((WCHAR*) pTemp, size/sizeof(WCHAR)); + /* fall through */ + + case ENCODING_UTF16LE: + if (size >= 2 && (BYTE)pTemp[0] == 0xff && (BYTE)pTemp[1] == 0xfe) + succeeded = SetWindowTextW(Globals.hEdit, (LPWSTR)pTemp + 1); + else + succeeded = SetWindowTextW(Globals.hEdit, (LPWSTR)pTemp); + break; + + case ENCODING_UTF8: + if (size >= 3 && (BYTE)pTemp[0] == 0xef && (BYTE)pTemp[1] == 0xbb && + (BYTE)pTemp[2] == 0xbf) + succeeded = SetWindowTextUtf8(Globals.hEdit, pTemp+3); + else + succeeded = SetWindowTextUtf8(Globals.hEdit, pTemp); + break; + + default: + succeeded = SetWindowTextA(Globals.hEdit, pTemp); + break; + } + + if (!succeeded) + { + ShowLastError(); + HeapFree(GetProcessHeap(), 0, pTemp); + return; + } HeapFree(GetProcessHeap(), 0, pTemp); diff --git a/programs/notepad/main.h b/programs/notepad/main.h index f81c437..bb9b7cc 100644 --- a/programs/notepad/main.h +++ b/programs/notepad/main.h @@ -25,6 +25,14 @@ #define MAX_STRING_LEN 255 +typedef enum +{ + ENCODING_ANSI, + ENCODING_UTF16LE, + ENCODING_UTF16BE, + ENCODING_UTF8 +} ENCODING; + typedef struct { HANDLE hInstance;

1 0

Alexander Scott-Johns : notepad: Detect if saving will lose information.
by Alexandre Julliard July 2, 2009

July 2, 2009

Module: wine Branch: master Commit: 84fd1c84f8f2393290438f452adaeb24ff9fba92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84fd1c84f8f2393290438f452… Author: Alexander Scott-Johns <alexander.scott.johns(a)googlemail.com> Date: Tue Jun 30 00:24:18 2009 +0100 notepad: Detect if saving will lose information. --- programs/notepad/En.rc | 7 +++ programs/notepad/dialog.c | 97 +++++++++++++++++++++++++++++++++------- programs/notepad/notepad_res.h | 2 + 3 files changed, 89 insertions(+), 17 deletions(-) diff --git a/programs/notepad/En.rc b/programs/notepad/En.rc index dea29c2..3c4d052 100644 --- a/programs/notepad/En.rc +++ b/programs/notepad/En.rc @@ -131,4 +131,11 @@ memory." STRING_UNICODE_LE, "Unicode (UTF-16)" STRING_UNICODE_BE, "Unicode (UTF-16 big-endian)" + +STRING_LOSS_OF_UNICODE_CHARACTERS, "%s\n\ +This file contains Unicode characters which will be lost if \n\ +you save this file in the %s encoding. \n\ +To keep these characters, click Cancel, and then select \n\ +one of the Unicode options in the Encoding drop down list. \n\ +Continue?" } diff --git a/programs/notepad/dialog.c b/programs/notepad/dialog.c index cef0dce..c1dbb6d 100644 --- a/programs/notepad/dialog.c +++ b/programs/notepad/dialog.c @@ -142,6 +142,23 @@ static int AlertFileNotSaved(LPCWSTR szFileName) MB_ICONQUESTION|MB_YESNOCANCEL); } +static int AlertUnicodeCharactersLost(LPCWSTR szFileName) +{ + WCHAR szMsgFormat[MAX_STRING_LEN]; + WCHAR szEnc[MAX_STRING_LEN]; + WCHAR szMsg[ARRAY_SIZE(szMsgFormat) + MAX_PATH + ARRAY_SIZE(szEnc)]; + WCHAR szCaption[MAX_STRING_LEN]; + + LoadStringW(Globals.hInstance, STRING_LOSS_OF_UNICODE_CHARACTERS, + szMsgFormat, ARRAY_SIZE(szMsgFormat)); + load_encoding_name(ENCODING_ANSI, szEnc, ARRAY_SIZE(szEnc)); + wnsprintfW(szMsg, ARRAY_SIZE(szMsg), szMsgFormat, szFileName, szEnc); + LoadStringW(Globals.hInstance, STRING_NOTEPAD, szCaption, + ARRAY_SIZE(szCaption)); + return MessageBoxW(Globals.hMainWnd, szMsg, szCaption, + MB_OKCANCEL|MB_ICONEXCLAMATION); +} + /** * Returns: * TRUE - if file exists @@ -158,8 +175,30 @@ BOOL FileExists(LPCWSTR szFilename) return (hFile != INVALID_HANDLE_VALUE); } +static inline BOOL is_conversion_to_ansi_lossy(LPCWSTR textW, int lenW) +{ + BOOL ret = FALSE; + WideCharToMultiByte(CP_ACP, WC_NO_BEST_FIT_CHARS, textW, lenW, NULL, 0, + NULL, &ret); + return ret; +} -static VOID DoSaveFile(VOID) +typedef enum +{ + SAVED_OK, + SAVE_FAILED, + SHOW_SAVEAS_DIALOG +} SAVE_STATUS; + +/* szFileName is the filename to save under; enc is the encoding to use. + * + * If the function succeeds, it returns SAVED_OK. + * If the function fails, it returns SAVE_FAILED. + * If Unicode data could be lost due to conversion to a non-Unicode character + * set, a warning is displayed. The user can continue (and the function carries + * on), or cancel (and the function returns SHOW_SAVEAS_DIALOG). + */ +static SAVE_STATUS DoSaveFile(LPCWSTR szFileName, ENCODING enc) { int lenW; WCHAR* textW; @@ -174,12 +213,12 @@ static VOID DoSaveFile(VOID) if (!textW) { ShowLastError(); - return; + return SAVE_FAILED; } textW[0] = (WCHAR) 0xfeff; lenW = GetWindowTextW(Globals.hEdit, textW+1, lenW) + 1; - switch (Globals.encFile) + switch (enc) { case ENCODING_UTF16BE: byteswap_wide_string(textW, lenW); @@ -197,46 +236,54 @@ static VOID DoSaveFile(VOID) { ShowLastError(); HeapFree(GetProcessHeap(), 0, textW); - return; + return SAVE_FAILED; } WideCharToMultiByte(CP_UTF8, 0, textW, lenW, pBytes, size, NULL, NULL); HeapFree(GetProcessHeap(), 0, textW); break; default: + if (is_conversion_to_ansi_lossy(textW+1, lenW-1) + && AlertUnicodeCharactersLost(szFileName) == IDCANCEL) + { + HeapFree(GetProcessHeap(), 0, textW); + return SHOW_SAVEAS_DIALOG; + } + size = WideCharToMultiByte(CP_ACP, 0, textW+1, lenW-1, NULL, 0, NULL, NULL); pBytes = HeapAlloc(GetProcessHeap(), 0, size); if (!pBytes) { ShowLastError(); HeapFree(GetProcessHeap(), 0, textW); - return; + return SAVE_FAILED; } WideCharToMultiByte(CP_ACP, 0, textW+1, lenW-1, pBytes, size, NULL, NULL); HeapFree(GetProcessHeap(), 0, textW); break; } - hFile = CreateFileW(Globals.szFileName, GENERIC_WRITE, FILE_SHARE_WRITE, + hFile = CreateFileW(szFileName, GENERIC_WRITE, FILE_SHARE_WRITE, NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); if(hFile == INVALID_HANDLE_VALUE) { ShowLastError(); HeapFree(GetProcessHeap(), 0, pBytes); - return; + return SAVE_FAILED; } if (!WriteFile(hFile, pBytes, size, &dwNumWrite, NULL)) { ShowLastError(); CloseHandle(hFile); HeapFree(GetProcessHeap(), 0, pBytes); - return; + return SAVE_FAILED; } SetEndOfFile(hFile); CloseHandle(hFile); HeapFree(GetProcessHeap(), 0, pBytes); SendMessageW(Globals.hEdit, EM_SETMODIFY, FALSE, 0); + return SAVED_OK; } /** @@ -570,14 +617,20 @@ VOID DIALOG_FileOpen(VOID) DoOpenFile(openfilename.lpstrFile, Globals.encOfnCombo); } - +/* Return FALSE to cancel close */ BOOL DIALOG_FileSave(VOID) { if (Globals.szFileName[0] == '\0') return DIALOG_FileSaveAs(); else - DoSaveFile(); - return TRUE; + { + switch (DoSaveFile(Globals.szFileName, Globals.encFile)) + { + case SAVED_OK: return TRUE; + case SHOW_SAVEAS_DIALOG: return DIALOG_FileSaveAs(); + default: return FALSE; + } + } } BOOL DIALOG_FileSaveAs(VOID) @@ -611,13 +664,23 @@ BOOL DIALOG_FileSaveAs(VOID) Globals.encOfnCombo = Globals.encFile; Globals.bOfnIsOpenDialog = FALSE; - if (GetSaveFileNameW(&saveas)) { - SetFileNameAndEncoding(szPath, Globals.encOfnCombo); - UpdateWindowCaption(); - DoSaveFile(); - return TRUE; +retry: + if (!GetSaveFileNameW(&saveas)) + return FALSE; + + switch (DoSaveFile(szPath, Globals.encOfnCombo)) + { + case SAVED_OK: + SetFileNameAndEncoding(szPath, Globals.encOfnCombo); + UpdateWindowCaption(); + return TRUE; + + case SHOW_SAVEAS_DIALOG: + goto retry; + + default: + return FALSE; } - return FALSE; } typedef struct { diff --git a/programs/notepad/notepad_res.h b/programs/notepad/notepad_res.h index 7ea7f00..5428c0d 100644 --- a/programs/notepad/notepad_res.h +++ b/programs/notepad/notepad_res.h @@ -88,6 +88,8 @@ #define STRING_UNICODE_LE 0x180 #define STRING_UNICODE_BE 0x181 +#define STRING_LOSS_OF_UNICODE_CHARACTERS 0x182 + /* Open/Save As dialog template */ #define IDD_OFN_TEMPLATE 0x190 #define IDC_OFN_ENCCOMBO 0x191

1 0

Paul Vriens : oleaut32/tests: Fix test failures and crash on Win9x/WinME.
by Alexandre Julliard July 2, 2009

July 2, 2009

Module: wine Branch: master Commit: f57c603798b238df4c236c7f698f4113271aa033 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f57c603798b238df4c236c7f6… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Jul 2 08:52:25 2009 +0200 oleaut32/tests: Fix test failures and crash on Win9x/WinME. --- dlls/oleaut32/tests/usrmarshal.c | 96 ++++++++++++++++++++----------------- 1 files changed, 52 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f57c603798b238df4c236…

1 0

Alexander Scott-Johns : notepad: Allow user to choose which encoding to open and save files in.
by Alexandre Julliard July 2, 2009

July 2, 2009

Module: wine Branch: master Commit: 67766392bf735c6c9007213bd14b64bdeeee389a URL: http://source.winehq.org/git/wine.git/?a=commit;h=67766392bf735c6c9007213bd… Author: Alexander Scott-Johns <alexander.scott.johns(a)googlemail.com> Date: Mon Jun 29 23:50:39 2009 +0100 notepad: Allow user to choose which encoding to open and save files in. --- programs/notepad/En.rc | 10 +++ programs/notepad/dialog.c | 153 +++++++++++++++++++++++++++++++++++++--- programs/notepad/dialog.h | 2 +- programs/notepad/main.c | 4 +- programs/notepad/main.h | 15 +++- programs/notepad/notepad_res.h | 7 ++ 6 files changed, 175 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=67766392bf735c6c90072…

1 0

Henri Verbeet : wined3d: Get rid of the silly refcount for the "fake" GL context.
by Alexandre Julliard July 2, 2009

July 2, 2009

Module: wine Branch: master Commit: db6ea72201bed5f51ede902e08e37fdc3742ab22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db6ea72201bed5f51ede902e0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 2 10:01:38 2009 +0200 wined3d: Get rid of the silly refcount for the "fake" GL context. --- dlls/wined3d/directx.c | 35 +++++++++++++---------------------- 1 files changed, 13 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 13651e6..87f6e89 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -197,7 +197,6 @@ glMultiTexCoordFunc multi_texcoord_funcs[WINED3D_FFP_EMIT_COUNT]; * function query some info from GL. */ -static int wined3d_fake_gl_context_ref = 0; static BOOL wined3d_fake_gl_context_available = FALSE; static HDC wined3d_fake_gl_context_hdc = NULL; static HWND wined3d_fake_gl_context_hwnd = NULL; @@ -224,26 +223,22 @@ static void WineD3D_ReleaseFakeGLContext(void) { } glCtx = pwglGetCurrentContext(); - - TRACE_(d3d_caps)("decrementing ref from %i\n", wined3d_fake_gl_context_ref); - if (0 == (--wined3d_fake_gl_context_ref) ) { - if (glCtx) + if (glCtx) + { + TRACE_(d3d_caps)("destroying fake GL context\n"); + if (!pwglMakeCurrent(NULL, NULL)) { - TRACE_(d3d_caps)("destroying fake GL context\n"); - if (!pwglMakeCurrent(NULL, NULL)) - { - ERR("Failed to disable fake GL context.\n"); - } - pwglDeleteContext(glCtx); + ERR("Failed to disable fake GL context.\n"); } - if(wined3d_fake_gl_context_hdc) - ReleaseDC(wined3d_fake_gl_context_hwnd, wined3d_fake_gl_context_hdc); - wined3d_fake_gl_context_hdc = NULL; /* Make sure we don't think that it is still around */ - if(wined3d_fake_gl_context_hwnd) - DestroyWindow(wined3d_fake_gl_context_hwnd); - wined3d_fake_gl_context_hwnd = NULL; - wined3d_fake_gl_context_available = FALSE; + pwglDeleteContext(glCtx); } + if (wined3d_fake_gl_context_hdc) + ReleaseDC(wined3d_fake_gl_context_hwnd, wined3d_fake_gl_context_hdc); + wined3d_fake_gl_context_hdc = NULL; /* Make sure we don't think that it is still around */ + if (wined3d_fake_gl_context_hwnd) + DestroyWindow(wined3d_fake_gl_context_hwnd); + wined3d_fake_gl_context_hwnd = NULL; + wined3d_fake_gl_context_available = FALSE; LeaveCriticalSection(&wined3d_fake_gl_context_cs); } @@ -256,7 +251,6 @@ static BOOL WineD3D_CreateFakeGLContext(void) { EnterCriticalSection(&wined3d_fake_gl_context_cs); TRACE("getting context...\n"); - if(wined3d_fake_gl_context_ref > 0) goto ret; /* We need a fake window as a hdc retrieved using GetDC(0) can't be used for much GL purposes. */ wined3d_fake_gl_context_hwnd = CreateWindowA(WINED3D_OPENGL_WINDOW_CLASS_NAME, "WineD3D fake window", @@ -309,9 +303,6 @@ static BOOL WineD3D_CreateFakeGLContext(void) { } context_set_last_device(NULL); - ret: - TRACE("incrementing ref from %i\n", wined3d_fake_gl_context_ref); - wined3d_fake_gl_context_ref++; wined3d_fake_gl_context_available = TRUE; LeaveCriticalSection(&wined3d_fake_gl_context_cs); return TRUE;

1 0

Tobias Jakobi : wined3d: Force NP2 constant reload in shader_arb_select.
by Alexandre Julliard July 2, 2009

July 2, 2009

Module: wine Branch: master Commit: 0caebe5f514e1e34f646197bc2d909cc5e7697eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=0caebe5f514e1e34f646197bc… Author: Tobias Jakobi <liquid.acid(a)gmx.net> Date: Wed Jul 1 18:36:50 2009 +0200 wined3d: Force NP2 constant reload in shader_arb_select. --- dlls/wined3d/arb_program_shader.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 75f05c8..cdc5b10 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4248,6 +4248,9 @@ static void shader_arb_select(IWineD3DDevice *iface, BOOL usePS, BOOL useVS) { { shader_arb_ps_local_constants(This); } + + /* Force constant reloading for the NP2 fixup (see comment in shader_glsl_select for more info) */ + if (compiled->np2fixup_info.super.active) This->shader_backend->shader_load_np2fixup_constants(iface, usePS, useVS); } else if(GL_SUPPORT(ARB_FRAGMENT_PROGRAM) && !priv->use_arbfp_fixed_func) { /* Disable only if we're not using arbfp fixed function fragment processing. If this is used, * keep GL_FRAGMENT_PROGRAM_ARB enabled, and the fixed function pipeline will bind the fixed function

1 0

Tobias Jakobi : wined3d: Fix comments about NP2 fixup.
by Alexandre Julliard July 2, 2009

July 2, 2009

Module: wine Branch: master Commit: 05c4d0a8b0a98c5b16a7ccf36d94aabf57abb87f URL: http://source.winehq.org/git/wine.git/?a=commit;h=05c4d0a8b0a98c5b16a7ccf36… Author: Tobias Jakobi <liquid.acid(a)gmx.net> Date: Wed Jul 1 18:36:51 2009 +0200 wined3d: Fix comments about NP2 fixup. --- dlls/wined3d/state.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 855bb59..8d441b7 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3035,8 +3035,8 @@ static void transform_texture(DWORD state, IWineD3DStateBlockImpl *stateblock, W if(generated) { FIXME("Non-power2 texture being used with generated texture coords\n"); } - /* NP2 texcoord fixup is implemented for pixelshaders (currently only in GLSL backend) so - only enable the fixed-function-pipeline fixup via pow2Matrix when no PS is used. */ + /* NP2 texcoord fixup is implemented for pixelshaders so only enable the + fixed-function-pipeline fixup via pow2Matrix when no PS is used. */ if (!use_ps(stateblock)) { TRACE("Non power two matrix multiply fixup\n"); glMultMatrixf(((IWineD3DTextureImpl *) stateblock->textures[texUnit])->baseTexture.pow2Matrix); @@ -3379,8 +3379,7 @@ static void sampler(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DCont } } - /* Trigger shader constant reloading (for NP2 texcoord fixup) - * Only do this if pshaders are used (note: fixup is currently only implemented in GLSL). */ + /* Trigger shader constant reloading (for NP2 texcoord fixup) */ if (!tex_impl->baseTexture.pow2Matrix_identity) { IWineD3DDeviceImpl* d3ddevice = stateblock->wineD3DDevice; d3ddevice->shader_backend->shader_load_np2fixup_constants(

1 0

Nikolay Sivov : comctl32/listview: Fix select rectangle calculation for empty text items.
by Alexandre Julliard July 2, 2009

July 2, 2009

Module: wine Branch: master Commit: 216ca479f2d18cbcd916525155b62f5a3bc34164 URL: http://source.winehq.org/git/wine.git/?a=commit;h=216ca479f2d18cbcd91652515… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Jul 2 02:42:43 2009 +0400 comctl32/listview: Fix select rectangle calculation for empty text items. --- dlls/comctl32/listview.c | 12 ++++++++++-- dlls/comctl32/tests/listview.c | 4 ++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index d7a5f97..2a66152 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -360,6 +360,8 @@ typedef struct tagLISTVIEW_INFO /* default label width for items in list and small icon display modes */ #define DEFAULT_LABEL_WIDTH 40 +/* maximum select rectangle width for empty text item in LV_VIEW_DETAILS */ +#define MAX_EMPTYTEXT_SELECT_WIDTH 80 /* default column width for items in list display mode */ #define DEFAULT_COLUMN_WIDTH 128 @@ -2235,7 +2237,9 @@ static void LISTVIEW_GetItemMetrics(const LISTVIEW_INFO *infoPtr, const LVITEMW DrawTextW (hdc, lpLVItem->pszText, -1, &rcText, uFormat | DT_CALCRECT); - labelSize.cx = min(rcText.right - rcText.left + TRAILING_LABEL_PADDING, infoPtr->nItemWidth); + if (rcText.right != rcText.left) + labelSize.cx = min(rcText.right - rcText.left + TRAILING_LABEL_PADDING, infoPtr->nItemWidth); + labelSize.cy = rcText.bottom - rcText.top; SelectObject(hdc, hOldFont); @@ -2288,7 +2292,11 @@ calc_label: SelectBox.left = Icon.left; SelectBox.top = Box.top; SelectBox.bottom = Box.bottom; - SelectBox.right = min(Label.left + labelSize.cx, Label.right); + + if (labelSize.cx) + SelectBox.right = min(Label.left + labelSize.cx, Label.right); + else + SelectBox.right = min(Label.left + MAX_EMPTYTEXT_SELECT_WIDTH, Label.right); } else { diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index d11d9de..d5bcbf5 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -3067,7 +3067,7 @@ static void test_getitemrect(void) expect(TRUE, r); /* padding, column width */ expect(2, rect.left); - todo_wine expect(50, rect.right); + expect(50, rect.right); /* try with indentation */ item.mask = LVIF_INDENT; @@ -3093,7 +3093,7 @@ static void test_getitemrect(void) expect(TRUE, r); /* padding + 1 icon width, column width */ expect(2 + 16, rect.left); - todo_wine expect(50, rect.right); + expect(50, rect.right); /* label bounds */ rect.left = LVIR_LABEL;

1 0

Tobias Jakobi : wined3d: Add NP2 fixup code to shader_hw_sample (ARB).
by Alexandre Julliard July 2, 2009

July 2, 2009

Module: wine Branch: master Commit: e29babbf6d2e90fc0166ec5672e4c5d5f6449d23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e29babbf6d2e90fc0166ec567… Author: Tobias Jakobi <liquid.acid(a)gmx.net> Date: Wed Jul 1 18:36:48 2009 +0200 wined3d: Add NP2 fixup code to shader_hw_sample (ARB). --- dlls/wined3d/arb_program_shader.c | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 87b74b2..2c0c767 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1142,6 +1142,7 @@ static void shader_hw_sample(const struct wined3d_shader_instruction *ins, DWORD SHADER_BUFFER *buffer = ins->ctx->buffer; DWORD sampler_type = ins->ctx->reg_maps->sampler_type[sampler_idx]; const char *tex_type; + BOOL np2_fixup = FALSE; IWineD3DBaseShaderImpl *This = (IWineD3DBaseShaderImpl *)ins->ctx->shader; IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *) This->baseShader.device; struct shader_arb_ctx_priv *priv = ins->ctx->backend_data; @@ -1165,9 +1166,10 @@ static void shader_hw_sample(const struct wined3d_shader_instruction *ins, DWORD } if (shader_is_pshader_version(ins->ctx->reg_maps->shader_version.type)) { - if(priv->cur_ps_args->super.np2_fixup & (1 << sampler_idx)) + if (priv->cur_np2fixup_info->super.active & (1 << sampler_idx)) { - FIXME("NP2 texcoord fixup is currently not implemented in ARB mode (use GLSL instead).\n"); + if (flags) FIXME("Only ordinary sampling from NP2 textures is supported.\n"); + else np2_fixup = TRUE; } } break; @@ -1224,7 +1226,16 @@ static void shader_hw_sample(const struct wined3d_shader_instruction *ins, DWORD } else { - shader_addline(buffer, "TEX%s %s, %s, texture[%u], %s;\n", mod, dst_str, coord_reg, sampler_idx, tex_type); + if (np2_fixup) + { + const unsigned char idx = priv->cur_np2fixup_info->super.idx[sampler_idx]; + shader_addline(buffer, "MUL TA, np2fixup[%u].%s, %s;\n", idx >> 1, + (idx % 2) ? "zwxy" : "xyzw", coord_reg); + + shader_addline(buffer, "TEX%s %s, TA, texture[%u], %s;\n", mod, dst_str, sampler_idx, tex_type); + } + else + shader_addline(buffer, "TEX%s %s, %s, texture[%u], %s;\n", mod, dst_str, coord_reg, sampler_idx, tex_type); } if (pshader)

1 0

Henri Verbeet : wined3d: Check if formats support blending when attached to an FBO.
by Alexandre Julliard July 2, 2009

July 2, 2009

Module: wine Branch: master Commit: 670d9ad90bf5af9bcb2e4c82d37391acbac83210 URL: http://source.winehq.org/git/wine.git/?a=commit;h=670d9ad90bf5af9bcb2e4c82d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 2 10:01:35 2009 +0200 wined3d: Check if formats support blending when attached to an FBO. Remove the post-pixelshader blending flag if the format doesn't. Note that the patch doesn't enforce this restriction yet, it only adjusts the reported format capabilities. --- dlls/wined3d/utils.c | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 1d9f70c..91e19f6 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -570,6 +570,7 @@ static void check_fbo_compat(const WineD3D_GL_Info *gl_info, struct GlPixelForma ENTER_GL(); while(glGetError()); + glDisable(GL_BLEND); glGenTextures(1, &tex); glBindTexture(GL_TEXTURE_2D, tex); @@ -639,6 +640,42 @@ static void check_fbo_compat(const WineD3D_GL_Info *gl_info, struct GlPixelForma } } + if (status == GL_FRAMEBUFFER_COMPLETE_EXT && format_desc->Flags & WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING) + { + GLuint rb; + + if (GL_SUPPORT(EXT_PACKED_DEPTH_STENCIL)) + { + GL_EXTCALL(glGenRenderbuffersEXT(1, &rb)); + GL_EXTCALL(glBindRenderbufferEXT(GL_RENDERBUFFER_EXT, rb)); + GL_EXTCALL(glRenderbufferStorageEXT(GL_RENDERBUFFER_EXT, GL_DEPTH24_STENCIL8_EXT, 16, 16)); + GL_EXTCALL(glFramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, + GL_RENDERBUFFER_EXT, rb)); + GL_EXTCALL(glFramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT, GL_STENCIL_ATTACHMENT_EXT, + GL_RENDERBUFFER_EXT, rb)); + checkGLcall("RB attachment"); + } + + glEnable(GL_BLEND); + glClear(GL_COLOR_BUFFER_BIT); + if (glGetError() == GL_INVALID_FRAMEBUFFER_OPERATION_EXT) + { + while(glGetError()); + TRACE("Format doesn't support post-pixelshader blending.\n"); + format_desc->Flags &= ~WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING; + } + + if (GL_SUPPORT(EXT_PACKED_DEPTH_STENCIL)) + { + GL_EXTCALL(glFramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, + GL_RENDERBUFFER_EXT, 0)); + GL_EXTCALL(glFramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT, GL_STENCIL_ATTACHMENT_EXT, + GL_RENDERBUFFER_EXT, 0)); + GL_EXTCALL(glDeleteRenderbuffersEXT(1, &rb)); + checkGLcall("RB cleanup"); + } + } + glDeleteTextures(1, &tex); LEAVE_GL();

1 0

Henri Verbeet : wined3d: Don' t reuse random GL contexts during initialization.
by Alexandre Julliard July 2, 2009

July 2, 2009

Module: wine Branch: master Commit: b5da7f49d332ed5d64be1256e14035af74a7efa2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5da7f49d332ed5d64be1256e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 2 10:01:37 2009 +0200 wined3d: Don't reuse random GL contexts during initialization. Obviously there's no guarantee about the state of such a context. The specific problem is that it might have GL_UNPACK_CLIENT_STORAGE_APPLE enabled, causing some glTexImage2D() calls to fail, but it's a bad idea in general. --- dlls/wined3d/directx.c | 99 ++++++++++++++++++++++++------------------------ 1 files changed, 49 insertions(+), 50 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 9e50b0d..13651e6 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -198,7 +198,6 @@ glMultiTexCoordFunc multi_texcoord_funcs[WINED3D_FFP_EMIT_COUNT]; */ static int wined3d_fake_gl_context_ref = 0; -static BOOL wined3d_fake_gl_context_foreign; static BOOL wined3d_fake_gl_context_available = FALSE; static HDC wined3d_fake_gl_context_hdc = NULL; static HWND wined3d_fake_gl_context_hwnd = NULL; @@ -228,7 +227,8 @@ static void WineD3D_ReleaseFakeGLContext(void) { TRACE_(d3d_caps)("decrementing ref from %i\n", wined3d_fake_gl_context_ref); if (0 == (--wined3d_fake_gl_context_ref) ) { - if(!wined3d_fake_gl_context_foreign && glCtx) { + if (glCtx) + { TRACE_(d3d_caps)("destroying fake GL context\n"); if (!pwglMakeCurrent(NULL, NULL)) { @@ -249,64 +249,63 @@ static void WineD3D_ReleaseFakeGLContext(void) { } static BOOL WineD3D_CreateFakeGLContext(void) { + PIXELFORMATDESCRIPTOR pfd; HGLRC glCtx = NULL; + int iPixelFormat; EnterCriticalSection(&wined3d_fake_gl_context_cs); TRACE("getting context...\n"); if(wined3d_fake_gl_context_ref > 0) goto ret; - wined3d_fake_gl_context_foreign = TRUE; - - glCtx = pwglGetCurrentContext(); - if (!glCtx) { - PIXELFORMATDESCRIPTOR pfd; - int iPixelFormat; + /* We need a fake window as a hdc retrieved using GetDC(0) can't be used for much GL purposes. */ + wined3d_fake_gl_context_hwnd = CreateWindowA(WINED3D_OPENGL_WINDOW_CLASS_NAME, "WineD3D fake window", + WS_OVERLAPPEDWINDOW, 10, 10, 10, 10, NULL, NULL, NULL, NULL); + if (!wined3d_fake_gl_context_hwnd) + { + ERR("HWND creation failed!\n"); + goto fail; + } - wined3d_fake_gl_context_foreign = FALSE; + wined3d_fake_gl_context_hdc = GetDC(wined3d_fake_gl_context_hwnd); + if (!wined3d_fake_gl_context_hdc) + { + ERR("GetDC failed!\n"); + goto fail; + } - /* We need a fake window as a hdc retrieved using GetDC(0) can't be used for much GL purposes */ - wined3d_fake_gl_context_hwnd = CreateWindowA(WINED3D_OPENGL_WINDOW_CLASS_NAME, "WineD3D fake window", WS_OVERLAPPEDWINDOW, 10, 10, 10, 10, NULL, NULL, NULL, NULL); - if(!wined3d_fake_gl_context_hwnd) { - ERR("HWND creation failed!\n"); - goto fail; - } - wined3d_fake_gl_context_hdc = GetDC(wined3d_fake_gl_context_hwnd); - if(!wined3d_fake_gl_context_hdc) { - ERR("GetDC failed!\n"); - goto fail; - } + /* PixelFormat selection */ + ZeroMemory(&pfd, sizeof(pfd)); + pfd.nSize = sizeof(pfd); + pfd.nVersion = 1; + pfd.dwFlags = PFD_SUPPORT_OPENGL | PFD_DOUBLEBUFFER | PFD_DRAW_TO_WINDOW; /* PFD_GENERIC_ACCELERATED */ + pfd.iPixelType = PFD_TYPE_RGBA; + pfd.cColorBits = 32; + pfd.iLayerType = PFD_MAIN_PLANE; + + iPixelFormat = ChoosePixelFormat(wined3d_fake_gl_context_hdc, &pfd); + if (!iPixelFormat) + { + /* If this happens something is very wrong as ChoosePixelFormat barely fails. */ + ERR("Can't find a suitable iPixelFormat.\n"); + goto fail; + } + DescribePixelFormat(wined3d_fake_gl_context_hdc, iPixelFormat, sizeof(pfd), &pfd); + SetPixelFormat(wined3d_fake_gl_context_hdc, iPixelFormat, &pfd); - /* PixelFormat selection */ - ZeroMemory(&pfd, sizeof(pfd)); - pfd.nSize = sizeof(pfd); - pfd.nVersion = 1; - pfd.dwFlags = PFD_SUPPORT_OPENGL | PFD_DOUBLEBUFFER | PFD_DRAW_TO_WINDOW;/*PFD_GENERIC_ACCELERATED*/ - pfd.iPixelType = PFD_TYPE_RGBA; - pfd.cColorBits = 32; - pfd.iLayerType = PFD_MAIN_PLANE; - - iPixelFormat = ChoosePixelFormat(wined3d_fake_gl_context_hdc, &pfd); - if(!iPixelFormat) { - /* If this happens something is very wrong as ChoosePixelFormat barely fails */ - ERR("Can't find a suitable iPixelFormat\n"); - goto fail; - } - DescribePixelFormat(wined3d_fake_gl_context_hdc, iPixelFormat, sizeof(pfd), &pfd); - SetPixelFormat(wined3d_fake_gl_context_hdc, iPixelFormat, &pfd); - - /* Create a GL context */ - glCtx = pwglCreateContext(wined3d_fake_gl_context_hdc); - if (!glCtx) { - WARN_(d3d_caps)("Error creating default context for capabilities initialization\n"); - goto fail; - } + /* Create a GL context. */ + glCtx = pwglCreateContext(wined3d_fake_gl_context_hdc); + if (!glCtx) + { + WARN_(d3d_caps)("Error creating default context for capabilities initialization.\n"); + goto fail; + } - /* Make it the current GL context */ - if (!pwglMakeCurrent(wined3d_fake_gl_context_hdc, glCtx)) { - ERR_(d3d_caps)("Failed to make fake GL context current.\n"); - goto fail; - } + /* Make it the current GL context. */ + if (!pwglMakeCurrent(wined3d_fake_gl_context_hdc, glCtx)) + { + ERR_(d3d_caps)("Failed to make fake GL context current.\n"); + goto fail; } context_set_last_device(NULL);

1 0

Tobias Jakobi : wined3d: Add NP2 fixup code to shader_arb_generate_pshader.
by Alexandre Julliard July 2, 2009

July 2, 2009

Module: wine Branch: master Commit: 034fa4268c4c717377a1654be3f1d76edcc72fef URL: http://source.winehq.org/git/wine.git/?a=commit;h=034fa4268c4c717377a1654be… Author: Tobias Jakobi <liquid.acid(a)gmx.net> Date: Wed Jul 1 18:36:47 2009 +0200 wined3d: Add NP2 fixup code to shader_arb_generate_pshader. --- dlls/wined3d/arb_program_shader.c | 38 +++++++++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index b9e5e82..87b74b2 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -3377,6 +3377,44 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShaderImpl *This, compiled->ycorrection = WINED3D_CONST_NUM_UNUSED; } + /* Load constants to fixup NP2 texcoords if there are still free constants left: + * Constants (texture dimensions) for the NP2 fixup are loaded as local program parameters. This will consume + * at most 8 (MAX_FRAGMENT_SAMPLERS / 2) parameters, which is highly unlikely, since the application had to + * use 16 NP2 textures at the same time. In case that we run out of constants the fixup is simply not + * applied / activated. This will probably result in wrong rendering of the texture, but will save us from + * shader compilation errors and the subsequent errors when drawing with this shader. */ + if (priv_ctx.cur_ps_args->super.np2_fixup) { + + struct arb_ps_np2fixup_info* const fixup = priv_ctx.cur_np2fixup_info; + const WORD map = priv_ctx.cur_ps_args->super.np2_fixup; + const UINT max_lconsts = gl_info->ps_arb_max_local_constants; + + fixup->offset = next_local; + fixup->super.active = 0; + + cur = 0; + for (i = 0; i < MAX_FRAGMENT_SAMPLERS; ++i) { + if (!(map & (1 << i))) continue; + + if (fixup->offset + (cur >> 1) < max_lconsts) { + fixup->super.active |= (1 << i); + fixup->super.idx[i] = cur++; + } else { + FIXME("No free constant found to load NP2 fixup data into shader. " + "Sampling from this texture will probably look wrong.\n"); + break; + } + } + + fixup->super.num_consts = (cur + 1) >> 1; + if (fixup->super.num_consts) { + shader_addline(buffer, "PARAM np2fixup[%u] = { program.env[%u..%u] };\n", + fixup->super.num_consts, fixup->offset, fixup->super.num_consts + fixup->offset - 1); + } + + next_local += fixup->super.num_consts; + } + if(shader_priv->clipplane_emulation) { shader_addline(buffer, "KIL fragment.texcoord[%u];\n", shader_priv->clipplane_emulation - 1);

1 0

Tobias Jakobi : wined3d: Implement shader_arb_load_np2fixup_constants.
by Alexandre Julliard July 2, 2009

July 2, 2009

Module: wine Branch: master Commit: ef280280c2763cf4e65bb5101978fc8804cefa18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef280280c2763cf4e65bb5101… Author: Tobias Jakobi <liquid.acid(a)gmx.net> Date: Wed Jul 1 18:36:49 2009 +0200 wined3d: Implement shader_arb_load_np2fixup_constants. --- dlls/wined3d/arb_program_shader.c | 42 ++++++++++++++++++++++++++++++++++++- 1 files changed, 41 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 2c0c767..75f05c8 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -378,7 +378,47 @@ static void shader_arb_load_np2fixup_constants( IWineD3DDevice* device, char usePixelShader, char useVertexShader) { - /* not implemented */ + + IWineD3DDeviceImpl* deviceImpl = (IWineD3DDeviceImpl *) device; + const struct shader_arb_priv* const priv = (const struct shader_arb_priv *) deviceImpl->shader_priv; + IWineD3DStateBlockImpl* stateBlock = deviceImpl->stateBlock; + const WineD3D_GL_Info *gl_info = &deviceImpl->adapter->gl_info; + + if (!usePixelShader) { + /* NP2 texcoord fixup is (currently) only done for pixelshaders. */ + return; + } + + if (priv->compiled_fprog && priv->compiled_fprog->np2fixup_info.super.active) { + const struct arb_ps_np2fixup_info* const fixup = &priv->compiled_fprog->np2fixup_info; + UINT i; + WORD active = fixup->super.active; + GLfloat np2fixup_constants[4 * MAX_FRAGMENT_SAMPLERS]; + + for (i = 0; active; active >>= 1, ++i) { + const unsigned char idx = fixup->super.idx[i]; + const IWineD3DTextureImpl* const tex = (const IWineD3DTextureImpl*) stateBlock->textures[i]; + GLfloat* tex_dim = &np2fixup_constants[(idx >> 1) * 4]; + + if (!(active & 1)) continue; + + if (!tex) { + FIXME("Nonexistent texture is flagged for NP2 texcoord fixup\n"); + continue; + } + + if (idx % 2) { + tex_dim[2] = tex->baseTexture.pow2Matrix[0]; tex_dim[3] = tex->baseTexture.pow2Matrix[5]; + } else { + tex_dim[0] = tex->baseTexture.pow2Matrix[0]; tex_dim[1] = tex->baseTexture.pow2Matrix[5]; + } + } + + for (i = 0; i < fixup->super.num_consts; ++i) { + GL_EXTCALL(glProgramEnvParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, + fixup->offset + i, &np2fixup_constants[i * 4])); + } + } } /* GL locking is done by the caller. */

1 0

Henri Verbeet : wined3d: Clear the last device in WineD3D_CreateFakeGLContext().
by Alexandre Julliard July 2, 2009

July 2, 2009

Module: wine Branch: master Commit: 50e9ad66e2d6b170d47b0e79cc4e04fb219a1455 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50e9ad66e2d6b170d47b0e79c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 2 10:01:36 2009 +0200 wined3d: Clear the last device in WineD3D_CreateFakeGLContext(). --- dlls/wined3d/context.c | 11 ++++++++--- dlls/wined3d/directx.c | 1 + dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 6be40c7..8fa9786 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -36,6 +36,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); */ static IWineD3DDeviceImpl *last_device; +void context_set_last_device(IWineD3DDeviceImpl *device) +{ + last_device = device; +} + /* FBO helper functions */ /* GL locking is done by the caller */ @@ -1078,7 +1083,7 @@ WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *tar ERR("Failed to make previous GL context %p current.\n", oldCtx); } } else { - last_device = This; + context_set_last_device(This); } This->frag_pipe->enable_extension((IWineD3DDevice *) This, TRUE); @@ -1167,7 +1172,7 @@ void DestroyContext(IWineD3DDeviceImpl *This, WineD3DContext *context) { /* The correct GL context needs to be active to cleanup the GL resources below */ has_glctx = pwglMakeCurrent(context->hdc, context->glCtx); - last_device = NULL; + context_set_last_device(NULL); if (!has_glctx) WARN("Failed to activate context. Window already destroyed?\n"); @@ -1750,7 +1755,7 @@ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextU sizeof(*This->activeContext->pshader_const_dirty) * GL_LIMITS(pshader_constantsF)); } This->activeContext = context; - last_device = This; + context_set_last_device(This); } switch (usage) { diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 4d16957..9e50b0d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -308,6 +308,7 @@ static BOOL WineD3D_CreateFakeGLContext(void) { goto fail; } } + context_set_last_device(NULL); ret: TRACE("incrementing ref from %i\n", wined3d_fake_gl_context_ref); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7af5719..c5ba435 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1256,6 +1256,7 @@ void context_resource_released(IWineD3DDevice *iface, IWineD3DResource *resource void context_bind_fbo(IWineD3DDevice *iface, GLenum target, GLuint *fbo); void context_attach_depth_stencil_fbo(IWineD3DDeviceImpl *This, GLenum fbo_target, IWineD3DSurface *depth_stencil, BOOL use_render_buffer); void context_attach_surface_fbo(IWineD3DDeviceImpl *This, GLenum fbo_target, DWORD idx, IWineD3DSurface *surface); +void context_set_last_device(IWineD3DDeviceImpl *device); void delete_opengl_contexts(IWineD3DDevice *iface, IWineD3DSwapChain *swapchain); HRESULT create_primary_opengl_context(IWineD3DDevice *iface, IWineD3DSwapChain *swapchain);

1 0

Henri Verbeet : wined3d: Make sure the rtInternal format is supported.
by Alexandre Julliard July 2, 2009

July 2, 2009

Module: wine Branch: master Commit: 6feb7c62ca0a6be17055b1cb804bb68a371ef069 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6feb7c62ca0a6be17055b1cb8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 2 10:01:34 2009 +0200 wined3d: Make sure the rtInternal format is supported. --- dlls/wined3d/utils.c | 106 +++++++++++++++++++++++++++++++------------------ 1 files changed, 67 insertions(+), 39 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 7baf1d3..1d9f70c 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -558,30 +558,90 @@ static BOOL init_format_compression_info(WineD3D_GL_Info *gl_info) #define GLINFO_LOCATION (*gl_info) /* Context activation is done by the caller. */ -static BOOL check_fbo_compat(const WineD3D_GL_Info *gl_info, GLint internal_format, GLenum format, GLenum type) +static void check_fbo_compat(const WineD3D_GL_Info *gl_info, struct GlPixelFormatDesc *format_desc) { + /* Check if the default internal format is supported as a frame buffer + * target, otherwise fall back to the render target internal. + * + * Try to stick to the standard format if possible, this limits precision differences. */ GLenum status; GLuint tex; ENTER_GL(); while(glGetError()); + glGenTextures(1, &tex); glBindTexture(GL_TEXTURE_2D, tex); - glTexImage2D(GL_TEXTURE_2D, 0, internal_format, 16, 16, 0, format, type, NULL); + + glTexImage2D(GL_TEXTURE_2D, 0, format_desc->glInternal, 16, 16, 0, + format_desc->glFormat, format_desc->glType, NULL); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); GL_EXTCALL(glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_2D, tex, 0)); status = GL_EXTCALL(glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT)); - glDeleteTextures(1, &tex); - checkGLcall("Framebuffer format check"); - LEAVE_GL(); + if (status == GL_FRAMEBUFFER_COMPLETE_EXT) + { + TRACE("Format %s is supported as FBO color attachment\n", debug_d3dformat(format_desc->format)); + format_desc->Flags |= WINED3DFMT_FLAG_FBO_ATTACHABLE; + format_desc->rtInternal = format_desc->glInternal; + } + else + { + if (!format_desc->rtInternal) + { + if (format_desc->Flags & WINED3DFMT_FLAG_RENDERTARGET) + { + FIXME("Format %s with rendertarget flag is not supported as FBO color attachment," + " and no fallback specified.\n", debug_d3dformat(format_desc->format)); + format_desc->Flags &= ~WINED3DFMT_FLAG_RENDERTARGET; + } + else + { + TRACE("Format %s is not supported as FBO color attachment.\n", debug_d3dformat(format_desc->format)); + } + format_desc->rtInternal = format_desc->glInternal; + } + else + { + TRACE("Format %s is not supported as FBO color attachment, trying rtInternal format as fallback.\n", + debug_d3dformat(format_desc->format)); - return status == GL_FRAMEBUFFER_COMPLETE_EXT; + while(glGetError()); + + GL_EXTCALL(glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_2D, 0, 0)); + + glTexImage2D(GL_TEXTURE_2D, 0, format_desc->rtInternal, 16, 16, 0, + format_desc->glFormat, format_desc->glType, NULL); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); + + GL_EXTCALL(glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_2D, tex, 0)); + + status = GL_EXTCALL(glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT)); + checkGLcall("Framebuffer format check"); + + if (status == GL_FRAMEBUFFER_COMPLETE_EXT) + { + TRACE("Format %s rtInternal format is supported as FBO color attachment\n", + debug_d3dformat(format_desc->format)); + } + else + { + FIXME("Format %s rtInternal format is not supported as FBO color attachment.\n", + debug_d3dformat(format_desc->format)); + format_desc->Flags &= ~WINED3DFMT_FLAG_RENDERTARGET; + } + } + } + + glDeleteTextures(1, &tex); + + LEAVE_GL(); } /* Context activation is done by the caller. */ @@ -623,39 +683,7 @@ static void init_format_fbo_compat_info(WineD3D_GL_Info *gl_info) if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { TRACE("Checking if format %s is supported as FBO color attachment...\n", debug_d3dformat(desc->format)); - - /* Check if the default internal format is supported as a frame buffer target, otherwise - * fall back to the render target internal. - * - * Try to stick to the standard format if possible, this limits precision differences. */ - if (check_fbo_compat(gl_info, desc->glInternal, desc->glFormat, desc->glType)) - { - TRACE("Format %s is supported as FBO color attachment\n", debug_d3dformat(desc->format)); - desc->Flags |= WINED3DFMT_FLAG_FBO_ATTACHABLE; - desc->rtInternal = desc->glInternal; - } - else - { - if (!desc->rtInternal) - { - if (desc->Flags & WINED3DFMT_FLAG_RENDERTARGET) - { - FIXME("Format %s with rendertarget flag is not supported as FBO color attachment," - " and no fallback specified.\n", debug_d3dformat(desc->format)); - desc->Flags &= ~WINED3DFMT_FLAG_RENDERTARGET; - } - else - { - TRACE("Format %s is not supported as FBO color attachment.\n", debug_d3dformat(desc->format)); - } - desc->rtInternal = desc->glInternal; - } - else - { - TRACE("Format %s is not supported as FBO color attachment, using rtInternal format as fallback.\n", - debug_d3dformat(desc->format)); - } - } + check_fbo_compat(gl_info, desc); } else {

1 0

Tobias Jakobi : wined3d: Add arb_ps_np2fixup_info structure and improve structure packing for arb_ps_compiled_shader .
by Alexandre Julliard July 2, 2009

July 2, 2009

Module: wine Branch: master Commit: ec30e9a85e17b87f8d6c3f3df9421a22ba3bdbe0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec30e9a85e17b87f8d6c3f3df… Author: Tobias Jakobi <liquid.acid(a)gmx.net> Date: Wed Jul 1 18:36:46 2009 +0200 wined3d: Add arb_ps_np2fixup_info structure and improve structure packing for arb_ps_compiled_shader. --- dlls/wined3d/arb_program_shader.c | 19 ++++++++++++++++--- 1 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 66a7634..b9e5e82 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -115,6 +115,16 @@ struct control_frame BOOL had_else; }; +struct arb_ps_np2fixup_info +{ + struct ps_np2fixup_info super; + /* For ARB we need a offset value: + * With both GLSL and ARB mode the NP2 fixup information (the texture dimensions) are stored in a + * consecutive way (GLSL uses a uniform array). Since ARB doesn't know the notion of a "standalone" + * array we need an offset to the index inside the program local parameter array. */ + UINT offset; +}; + struct arb_ps_compile_args { struct ps_compile_args super; @@ -131,13 +141,14 @@ struct stb_const_desc struct arb_ps_compiled_shader { struct arb_ps_compile_args args; - GLuint prgId; + struct arb_ps_np2fixup_info np2fixup_info; struct stb_const_desc bumpenvmatconst[MAX_TEXTURES]; - unsigned char numbumpenvmatconsts; struct stb_const_desc luminanceconst[MAX_TEXTURES]; UINT int_consts[MAX_CONST_I]; - char num_int_consts; + GLuint prgId; UINT ycorrection; + unsigned char numbumpenvmatconsts; + char num_int_consts; }; struct arb_vs_compile_args @@ -194,6 +205,7 @@ struct shader_arb_ctx_priv const struct arb_ps_compile_args *cur_ps_args; const struct arb_ps_compiled_shader *compiled_fprog; const struct arb_vs_compiled_shader *compiled_vprog; + struct arb_ps_np2fixup_info *cur_np2fixup_info; struct list control_frames; struct list record; BOOL recording; @@ -3191,6 +3203,7 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShaderImpl *This, memset(&priv_ctx, 0, sizeof(priv_ctx)); priv_ctx.cur_ps_args = args; priv_ctx.compiled_fprog = compiled; + priv_ctx.cur_np2fixup_info = &compiled->np2fixup_info; init_ps_input(This, args, &priv_ctx); list_init(&priv_ctx.control_frames);

1 0

Michael Stefaniuc : comctl32: Build language resource files separately.
by Alexandre Julliard July 2, 2009

July 2, 2009

Module: wine Branch: master Commit: 4796550808bb96eba43fc63d748c7d00e119861c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4796550808bb96eba43fc63d7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 2 00:33:18 2009 +0200 comctl32: Build language resource files separately. Do not include them from an other rc file. --- dlls/comctl32/Makefile.in | 29 ++++++++++++++++++++++++++++- dlls/comctl32/comctl_Bg.rc | 2 ++ dlls/comctl32/comctl_Cs.rc | 2 ++ dlls/comctl32/comctl_De.rc | 2 ++ dlls/comctl32/comctl_El.rc | 2 ++ dlls/comctl32/comctl_En.rc | 2 ++ dlls/comctl32/comctl_Eo.rc | 2 ++ dlls/comctl32/comctl_Es.rc | 2 ++ dlls/comctl32/comctl_Fr.rc | 2 ++ dlls/comctl32/comctl_Hu.rc | 2 ++ dlls/comctl32/comctl_It.rc | 2 ++ dlls/comctl32/comctl_Ja.rc | 4 ++-- dlls/comctl32/comctl_Ko.rc | 2 ++ dlls/comctl32/comctl_Lt.rc | 4 ++-- dlls/comctl32/comctl_Nl.rc | 2 ++ dlls/comctl32/comctl_No.rc | 2 ++ dlls/comctl32/comctl_Pl.rc | 2 ++ dlls/comctl32/comctl_Pt.rc | 2 ++ dlls/comctl32/comctl_Ro.rc | 4 ++-- dlls/comctl32/comctl_Ru.rc | 2 ++ dlls/comctl32/comctl_Si.rc | 4 ++-- dlls/comctl32/comctl_Sk.rc | 2 ++ dlls/comctl32/comctl_Sv.rc | 2 ++ dlls/comctl32/comctl_Th.rc | 2 ++ dlls/comctl32/comctl_Tr.rc | 2 ++ dlls/comctl32/comctl_Uk.rc | 2 ++ dlls/comctl32/comctl_Zh.rc | 4 ++-- dlls/comctl32/rsrc.rc | 40 ---------------------------------------- 28 files changed, 80 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4796550808bb96eba43fc…

1 0

Michael Stefaniuc : shlwapi: Build language resource files separately.
by Alexandre Julliard July 2, 2009

July 2, 2009

Module: wine Branch: master Commit: 5b9a7edaaf5cab7e85a99d19ba3f055f31652c64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b9a7edaaf5cab7e85a99d19b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 2 00:34:14 2009 +0200 shlwapi: Build language resource files separately. Do not include them from an other rc file. --- dlls/shlwapi/Makefile.in | 26 +++++++++++++++++++++- dlls/shlwapi/resource.h | 3 ++ dlls/shlwapi/shlwapi.rc | 51 -------------------------------------------- dlls/shlwapi/shlwapi_Da.rc | 2 + dlls/shlwapi/shlwapi_De.rc | 2 + dlls/shlwapi/shlwapi_En.rc | 2 + dlls/shlwapi/shlwapi_Eo.rc | 2 + dlls/shlwapi/shlwapi_Es.rc | 2 + dlls/shlwapi/shlwapi_Fi.rc | 2 + dlls/shlwapi/shlwapi_Fr.rc | 2 + dlls/shlwapi/shlwapi_Hu.rc | 2 + dlls/shlwapi/shlwapi_It.rc | 2 + dlls/shlwapi/shlwapi_Ja.rc | 4 +- dlls/shlwapi/shlwapi_Ko.rc | 2 + dlls/shlwapi/shlwapi_Lt.rc | 4 +- dlls/shlwapi/shlwapi_Nl.rc | 2 + dlls/shlwapi/shlwapi_No.rc | 2 + dlls/shlwapi/shlwapi_Pl.rc | 2 + dlls/shlwapi/shlwapi_Pt.rc | 2 + dlls/shlwapi/shlwapi_Ro.rc | 4 +- dlls/shlwapi/shlwapi_Ru.rc | 2 + dlls/shlwapi/shlwapi_Si.rc | 4 +- dlls/shlwapi/shlwapi_Sk.rc | 2 + dlls/shlwapi/shlwapi_Sv.rc | 2 + dlls/shlwapi/shlwapi_Tr.rc | 2 + dlls/shlwapi/shlwapi_Uk.rc | 2 + dlls/shlwapi/shlwapi_Zh.rc | 4 +- 27 files changed, 76 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5b9a7edaaf5cab7e85a99…

1 0

Tobias Jakobi : wined3d: Add ps_arb_max_local_constants.
by Alexandre Julliard July 2, 2009

July 2, 2009

Module: wine Branch: master Commit: 2d532a1597f3fc2830a3c627ea6451f4680919c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d532a1597f3fc2830a3c627e… Author: Tobias Jakobi <liquid.acid(a)gmx.net> Date: Wed Jul 1 18:36:45 2009 +0200 wined3d: Add ps_arb_max_local_constants. --- dlls/wined3d/directx.c | 4 ++++ dlls/wined3d/wined3d_gl.h | 1 + 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 523528f..4d16957 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -719,6 +719,7 @@ static BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { gl_info->ps_glsl_constantsF = 0; gl_info->vs_arb_constantsF = 0; gl_info->ps_arb_constantsF = 0; + gl_info->ps_arb_max_local_constants = 0; /* Retrieve opengl defaults */ glGetIntegerv(GL_MAX_CLIP_PLANES, &gl_max); @@ -931,6 +932,9 @@ static BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { GL_EXTCALL(glGetProgramivARB(GL_FRAGMENT_PROGRAM_ARB, GL_MAX_PROGRAM_ENV_PARAMETERS_ARB, &gl_max)); gl_info->ps_arb_constantsF = gl_max; TRACE_(d3d_caps)("Max ARB_FRAGMENT_PROGRAM float constants: %d\n", gl_info->ps_arb_constantsF); + GL_EXTCALL(glGetProgramivARB(GL_FRAGMENT_PROGRAM_ARB, GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB, &gl_max)); + gl_info->ps_arb_max_local_constants = gl_max; + TRACE_(d3d_caps)("Max ARB_FRAGMENT_PROGRAM local float constants: %d\n", gl_info->ps_arb_max_local_constants); GL_EXTCALL(glGetProgramivARB(GL_FRAGMENT_PROGRAM_ARB, GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB, &gl_max)); gl_info->ps_arb_max_temps = gl_max; TRACE_(d3d_caps)("Max ARB_FRAGMENT_PROGRAM native temporaries: %d\n", gl_info->ps_arb_max_temps); diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index da35319..0c5cae5 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -3988,6 +3988,7 @@ typedef struct _WineD3D_GL_Info { unsigned vs_arb_max_instructions; unsigned vs_arb_max_temps; unsigned ps_arb_constantsF; + unsigned ps_arb_max_local_constants; unsigned ps_arb_max_instructions; unsigned ps_arb_max_temps; unsigned vs_glsl_constantsF;

1 0

Michael Stefaniuc : notepad: Build language resource files separately.
by Alexandre Julliard July 2, 2009

July 2, 2009

Module: wine Branch: master Commit: 8e2f63684bdfc59c835bfe9e071ae7633aa9dba9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e2f63684bdfc59c835bfe9e0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 2 00:29:04 2009 +0200 notepad: Build language resource files separately. Do not include them from an other rc file. --- programs/notepad/Bg.rc | 2 ++ programs/notepad/Cs.rc | 2 ++ programs/notepad/Da.rc | 2 ++ programs/notepad/De.rc | 2 ++ programs/notepad/En.rc | 2 ++ programs/notepad/Eo.rc | 2 ++ programs/notepad/Es.rc | 2 ++ programs/notepad/Fi.rc | 2 ++ programs/notepad/Fr.rc | 2 ++ programs/notepad/Hu.rc | 2 ++ programs/notepad/It.rc | 2 ++ programs/notepad/Ja.rc | 4 ++-- programs/notepad/Ko.rc | 2 ++ programs/notepad/Lt.rc | 3 ++- programs/notepad/Makefile.in | 29 ++++++++++++++++++++++++++++- programs/notepad/Nl.rc | 2 ++ programs/notepad/No.rc | 2 ++ programs/notepad/Pl.rc | 2 ++ programs/notepad/Pt.rc | 2 ++ programs/notepad/Ro.rc | 4 ++-- programs/notepad/Ru.rc | 2 ++ programs/notepad/Si.rc | 4 ++-- programs/notepad/Sv.rc | 2 ++ programs/notepad/Th.rc | 2 ++ programs/notepad/Tr.rc | 2 ++ programs/notepad/Wa.rc | 2 ++ programs/notepad/Zh.rc | 4 ++-- programs/notepad/notepad_res.h | 3 +++ programs/notepad/rsrc.rc | 33 --------------------------------- 29 files changed, 83 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8e2f63684bdfc59c835bf…

1 0

Michael Stefaniuc : msvfw32: Build language resource files separately.
by Alexandre Julliard July 2, 2009

July 2, 2009

Module: wine Branch: master Commit: 4149385b93385d5b8167ec69463890b7aef2550f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4149385b93385d5b8167ec694… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 2 00:27:22 2009 +0200 msvfw32: Build language resource files separately. Do not include them from an other rc file. --- dlls/msvfw32/Makefile.in | 19 ++++++++++++++++++- dlls/msvfw32/msvfw32_Da.rc | 2 ++ dlls/msvfw32/msvfw32_De.rc | 2 ++ dlls/msvfw32/msvfw32_En.rc | 2 ++ dlls/msvfw32/msvfw32_Es.rc | 2 ++ dlls/msvfw32/msvfw32_Fr.rc | 2 ++ dlls/msvfw32/msvfw32_Hu.rc | 2 ++ dlls/msvfw32/msvfw32_Ko.rc | 2 ++ dlls/msvfw32/msvfw32_Lt.rc | 4 ++-- dlls/msvfw32/msvfw32_Nl.rc | 2 ++ dlls/msvfw32/msvfw32_No.rc | 2 ++ dlls/msvfw32/msvfw32_Pl.rc | 2 ++ dlls/msvfw32/msvfw32_Pt.rc | 2 ++ dlls/msvfw32/msvfw32_Ru.rc | 2 ++ dlls/msvfw32/msvfw32_Si.rc | 4 ++-- dlls/msvfw32/msvfw32_Sv.rc | 2 ++ dlls/msvfw32/msvfw32_Tr.rc | 2 ++ dlls/msvfw32/msvfw32_Zh.rc | 4 ++-- dlls/msvfw32/msvideo_private.h | 3 +++ dlls/msvfw32/rsrc.rc | 39 --------------------------------------- 20 files changed, 55 insertions(+), 46 deletions(-) diff --git a/dlls/msvfw32/Makefile.in b/dlls/msvfw32/Makefile.in index 8347fe8..4eb3b10 100644 --- a/dlls/msvfw32/Makefile.in +++ b/dlls/msvfw32/Makefile.in @@ -11,7 +11,24 @@ C_SRCS = \ msvideo_main.c \ drawdib.c -RC_SRCS = rsrc.rc +RC_SRCS = \ + msvfw32_Da.rc \ + msvfw32_De.rc \ + msvfw32_En.rc \ + msvfw32_Es.rc \ + msvfw32_Fr.rc \ + msvfw32_Hu.rc \ + msvfw32_Ko.rc \ + msvfw32_Lt.rc \ + msvfw32_Nl.rc \ + msvfw32_No.rc \ + msvfw32_Pl.rc \ + msvfw32_Pt.rc \ + msvfw32_Ru.rc \ + msvfw32_Si.rc \ + msvfw32_Sv.rc \ + msvfw32_Tr.rc \ + msvfw32_Zh.rc @MAKE_DLL_RULES@ diff --git a/dlls/msvfw32/msvfw32_Da.rc b/dlls/msvfw32/msvfw32_Da.rc index 32b5489..20d60e2 100644 --- a/dlls/msvfw32/msvfw32_Da.rc +++ b/dlls/msvfw32/msvfw32_Da.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvideo_private.h" + LANGUAGE LANG_DANISH, SUBLANG_DEFAULT ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 187, 95 diff --git a/dlls/msvfw32/msvfw32_De.rc b/dlls/msvfw32/msvfw32_De.rc index 29b5f4b..ff822dd 100644 --- a/dlls/msvfw32/msvfw32_De.rc +++ b/dlls/msvfw32/msvfw32_De.rc @@ -17,6 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvideo_private.h" + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 187, 95 diff --git a/dlls/msvfw32/msvfw32_En.rc b/dlls/msvfw32/msvfw32_En.rc index 1a563dd..f3ee735 100644 --- a/dlls/msvfw32/msvfw32_En.rc +++ b/dlls/msvfw32/msvfw32_En.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvideo_private.h" + LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 187, 95 diff --git a/dlls/msvfw32/msvfw32_Es.rc b/dlls/msvfw32/msvfw32_Es.rc index aa4d3f0..2745361 100644 --- a/dlls/msvfw32/msvfw32_Es.rc +++ b/dlls/msvfw32/msvfw32_Es.rc @@ -17,6 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvideo_private.h" + LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 187, 95 diff --git a/dlls/msvfw32/msvfw32_Fr.rc b/dlls/msvfw32/msvfw32_Fr.rc index 9318ee4..cd2c056 100644 --- a/dlls/msvfw32/msvfw32_Fr.rc +++ b/dlls/msvfw32/msvfw32_Fr.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvideo_private.h" + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 187, 95 diff --git a/dlls/msvfw32/msvfw32_Hu.rc b/dlls/msvfw32/msvfw32_Hu.rc index aa0eefc..e77b67f 100644 --- a/dlls/msvfw32/msvfw32_Hu.rc +++ b/dlls/msvfw32/msvfw32_Hu.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvideo_private.h" + LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 187, 95 diff --git a/dlls/msvfw32/msvfw32_Ko.rc b/dlls/msvfw32/msvfw32_Ko.rc index 4d6527e..72e999d 100644 --- a/dlls/msvfw32/msvfw32_Ko.rc +++ b/dlls/msvfw32/msvfw32_Ko.rc @@ -17,6 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvideo_private.h" + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 187, 95 diff --git a/dlls/msvfw32/msvfw32_Lt.rc b/dlls/msvfw32/msvfw32_Lt.rc index 21b9902..c7432d3 100644 --- a/dlls/msvfw32/msvfw32_Lt.rc +++ b/dlls/msvfw32/msvfw32_Lt.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvideo_private.h" + /* UTF-8 */ #pragma code_page(65001) @@ -52,5 +54,3 @@ STRINGTABLE DISCARDABLE { IDS_FULLFRAMES "Pilni kadrai (neglaudinti)" } - -#pragma code_page(default) diff --git a/dlls/msvfw32/msvfw32_Nl.rc b/dlls/msvfw32/msvfw32_Nl.rc index e1236f7..d82f860 100644 --- a/dlls/msvfw32/msvfw32_Nl.rc +++ b/dlls/msvfw32/msvfw32_Nl.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvideo_private.h" + LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 187, 95 diff --git a/dlls/msvfw32/msvfw32_No.rc b/dlls/msvfw32/msvfw32_No.rc index 41a24e3..eb07aed 100644 --- a/dlls/msvfw32/msvfw32_No.rc +++ b/dlls/msvfw32/msvfw32_No.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvideo_private.h" + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 187, 95 diff --git a/dlls/msvfw32/msvfw32_Pl.rc b/dlls/msvfw32/msvfw32_Pl.rc index 53ee33c..cb5a9eb 100644 --- a/dlls/msvfw32/msvfw32_Pl.rc +++ b/dlls/msvfw32/msvfw32_Pl.rc @@ -17,6 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvideo_private.h" + LANGUAGE LANG_POLISH, SUBLANG_DEFAULT ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 207, 95 diff --git a/dlls/msvfw32/msvfw32_Pt.rc b/dlls/msvfw32/msvfw32_Pt.rc index 0640870..efd3119 100644 --- a/dlls/msvfw32/msvfw32_Pt.rc +++ b/dlls/msvfw32/msvfw32_Pt.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvideo_private.h" + LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 187, 95 diff --git a/dlls/msvfw32/msvfw32_Ru.rc b/dlls/msvfw32/msvfw32_Ru.rc index 96c8a81..5b42d19 100644 --- a/dlls/msvfw32/msvfw32_Ru.rc +++ b/dlls/msvfw32/msvfw32_Ru.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvideo_private.h" + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 187, 95 diff --git a/dlls/msvfw32/msvfw32_Si.rc b/dlls/msvfw32/msvfw32_Si.rc index 05d1ba5..93fb175 100644 --- a/dlls/msvfw32/msvfw32_Si.rc +++ b/dlls/msvfw32/msvfw32_Si.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvideo_private.h" + #pragma code_page(65001) LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT @@ -51,5 +53,3 @@ STRINGTABLE DISCARDABLE { IDS_FULLFRAMES "Polne slike (nestisnjeno)" } - -#pragma code_page(default) diff --git a/dlls/msvfw32/msvfw32_Sv.rc b/dlls/msvfw32/msvfw32_Sv.rc index 68f5167..2461fce 100644 --- a/dlls/msvfw32/msvfw32_Sv.rc +++ b/dlls/msvfw32/msvfw32_Sv.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvideo_private.h" + LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 187, 95 diff --git a/dlls/msvfw32/msvfw32_Tr.rc b/dlls/msvfw32/msvfw32_Tr.rc index b9da7c2..0963509 100644 --- a/dlls/msvfw32/msvfw32_Tr.rc +++ b/dlls/msvfw32/msvfw32_Tr.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvideo_private.h" + LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 187, 95 diff --git a/dlls/msvfw32/msvfw32_Zh.rc b/dlls/msvfw32/msvfw32_Zh.rc index 334fd69..3ff0fc0 100644 --- a/dlls/msvfw32/msvfw32_Zh.rc +++ b/dlls/msvfw32/msvfw32_Zh.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvideo_private.h" + /* Chinese text is encoded in UTF-8 */ #pragma code_page(65001) @@ -88,5 +90,3 @@ STRINGTABLE DISCARDABLE { IDS_FULLFRAMES "全幀(未壓縮)" } - -#pragma code_page(default) diff --git a/dlls/msvfw32/msvideo_private.h b/dlls/msvfw32/msvideo_private.h index d6b2d19..ea0566b 100644 --- a/dlls/msvfw32/msvideo_private.h +++ b/dlls/msvfw32/msvideo_private.h @@ -19,6 +19,9 @@ #ifndef __WINE_MSVIDEO_PRIVATE_H #define __WINE_MSVIDEO_PRIVATE_H +#include <windef.h> +#include <winuser.h> + #define ICM_CHOOSE_COMPRESSOR 1 #define IDC_COMP_LIST 880 #define IDS_FULLFRAMES 901 diff --git a/dlls/msvfw32/rsrc.rc b/dlls/msvfw32/rsrc.rc deleted file mode 100644 index a24ab3c..0000000 --- a/dlls/msvfw32/rsrc.rc +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright 2005 Dmitry Timoshkov - * - * 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 - */ - -#include "windef.h" -#include "winuser.h" -#include "msvideo_private.h" - -#include "msvfw32_Da.rc" -#include "msvfw32_De.rc" -#include "msvfw32_En.rc" -#include "msvfw32_Es.rc" -#include "msvfw32_Fr.rc" -#include "msvfw32_Hu.rc" -#include "msvfw32_Ko.rc" -#include "msvfw32_Lt.rc" -#include "msvfw32_Nl.rc" -#include "msvfw32_No.rc" -#include "msvfw32_Pl.rc" -#include "msvfw32_Pt.rc" -#include "msvfw32_Ru.rc" -#include "msvfw32_Si.rc" -#include "msvfw32_Sv.rc" -#include "msvfw32_Tr.rc" -#include "msvfw32_Zh.rc"

1 0

Michael Stefaniuc : winemine: Build language resource files separately.
by Alexandre Julliard July 2, 2009

July 2, 2009

Module: wine Branch: master Commit: 6667ef13414a477e1f9d9c3e082a08297e93894f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6667ef13414a477e1f9d9c3e0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 2 00:31:35 2009 +0200 winemine: Build language resource files separately. Do not include them from an other rc file. --- programs/winemine/Cs.rc | 2 ++ programs/winemine/Da.rc | 2 ++ programs/winemine/De.rc | 2 ++ programs/winemine/En.rc | 2 ++ programs/winemine/Es.rc | 2 ++ programs/winemine/Fi.rc | 2 ++ programs/winemine/Fr.rc | 2 ++ programs/winemine/It.rc | 2 ++ programs/winemine/Ja.rc | 4 ++-- programs/winemine/Ko.rc | 2 ++ programs/winemine/Lt.rc | 4 ++-- programs/winemine/Makefile.in | 23 ++++++++++++++++++++++- programs/winemine/Nl.rc | 2 ++ programs/winemine/No.rc | 2 ++ programs/winemine/Pl.rc | 2 ++ programs/winemine/Pt.rc | 2 ++ programs/winemine/Ro.rc | 4 ++-- programs/winemine/Ru.rc | 2 ++ programs/winemine/Si.rc | 4 ++-- programs/winemine/Tr.rc | 2 ++ programs/winemine/Zh.rc | 4 ++-- programs/winemine/resource.h | 2 ++ programs/winemine/rsrc.rc | 24 ------------------------ 23 files changed, 64 insertions(+), 35 deletions(-) diff --git a/programs/winemine/Cs.rc b/programs/winemine/Cs.rc index c4f3cc3..bfe9770 100644 --- a/programs/winemine/Cs.rc +++ b/programs/winemine/Cs.rc @@ -22,6 +22,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_CZECH, SUBLANG_DEFAULT /* Czech strings in CP1250 */ diff --git a/programs/winemine/Da.rc b/programs/winemine/Da.rc index 3e5631f..2027e76 100644 --- a/programs/winemine/Da.rc +++ b/programs/winemine/Da.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_DANISH, SUBLANG_DEFAULT STRINGTABLE { diff --git a/programs/winemine/De.rc b/programs/winemine/De.rc index d1066f9..a60dcc2 100644 --- a/programs/winemine/De.rc +++ b/programs/winemine/De.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE { diff --git a/programs/winemine/En.rc b/programs/winemine/En.rc index c0f2550..634a3e8 100644 --- a/programs/winemine/En.rc +++ b/programs/winemine/En.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE { diff --git a/programs/winemine/Es.rc b/programs/winemine/Es.rc index c36b522..0b08162 100644 --- a/programs/winemine/Es.rc +++ b/programs/winemine/Es.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL STRINGTABLE { diff --git a/programs/winemine/Fi.rc b/programs/winemine/Fi.rc index ceee603..6252d2c 100644 --- a/programs/winemine/Fi.rc +++ b/programs/winemine/Fi.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT STRINGTABLE { diff --git a/programs/winemine/Fr.rc b/programs/winemine/Fr.rc index e2a9372..fa7d5ec 100644 --- a/programs/winemine/Fr.rc +++ b/programs/winemine/Fr.rc @@ -22,6 +22,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE { diff --git a/programs/winemine/It.rc b/programs/winemine/It.rc index 3291bea..a799fa4 100644 --- a/programs/winemine/It.rc +++ b/programs/winemine/It.rc @@ -21,6 +21,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL STRINGTABLE { diff --git a/programs/winemine/Ja.rc b/programs/winemine/Ja.rc index 28530ac..d4edbcb 100644 --- a/programs/winemine/Ja.rc +++ b/programs/winemine/Ja.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + /* UTF-8 */ #pragma code_page(65001) @@ -93,5 +95,3 @@ CAPTION "盤面の変更" DEFPUSHBUTTON "OK", IDOK, 40, 30, 50, 15 PUSHBUTTON "Cancel", IDCANCEL, 40, 50, 50, 15 } - -#pragma code_page(default) diff --git a/programs/winemine/Ko.rc b/programs/winemine/Ko.rc index c27d6e3..bc532e9 100644 --- a/programs/winemine/Ko.rc +++ b/programs/winemine/Ko.rc @@ -21,6 +21,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT STRINGTABLE { diff --git a/programs/winemine/Lt.rc b/programs/winemine/Lt.rc index 692717d..de09a45 100644 --- a/programs/winemine/Lt.rc +++ b/programs/winemine/Lt.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + /* UTF-8 */ #pragma code_page(65001) @@ -92,5 +94,3 @@ CAPTION "Pasirinktas žaidimas" DEFPUSHBUTTON "Gerai", IDOK, 40, 30, 50, 15 PUSHBUTTON "Atsisakyti", IDCANCEL, 40, 50, 50, 15 } - -#pragma code_page(default) diff --git a/programs/winemine/Makefile.in b/programs/winemine/Makefile.in index 64f8599..09adf9e 100644 --- a/programs/winemine/Makefile.in +++ b/programs/winemine/Makefile.in @@ -11,7 +11,28 @@ C_SRCS = \ dialog.c \ main.c -RC_SRCS = rsrc.rc +RC_SRCS = \ + Cs.rc \ + Da.rc \ + De.rc \ + En.rc \ + Es.rc \ + Fi.rc \ + Fr.rc \ + It.rc \ + Ja.rc \ + Ko.rc \ + Lt.rc \ + Nl.rc \ + No.rc \ + Pl.rc \ + Pt.rc \ + Ro.rc \ + Ru.rc \ + Si.rc \ + Tr.rc \ + Zh.rc \ + rsrc.rc SVG_SRCS = winemine.svg diff --git a/programs/winemine/Nl.rc b/programs/winemine/Nl.rc index 6d0cf3c..18bbda6 100644 --- a/programs/winemine/Nl.rc +++ b/programs/winemine/Nl.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL STRINGTABLE { diff --git a/programs/winemine/No.rc b/programs/winemine/No.rc index c3ab3d1..7e06eef 100644 --- a/programs/winemine/No.rc +++ b/programs/winemine/No.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL STRINGTABLE { diff --git a/programs/winemine/Pl.rc b/programs/winemine/Pl.rc index 2d924c5..7830eab 100644 --- a/programs/winemine/Pl.rc +++ b/programs/winemine/Pl.rc @@ -21,6 +21,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_POLISH, SUBLANG_DEFAULT STRINGTABLE { diff --git a/programs/winemine/Pt.rc b/programs/winemine/Pt.rc index a8f581a..9c20abb 100644 --- a/programs/winemine/Pt.rc +++ b/programs/winemine/Pt.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN STRINGTABLE { diff --git a/programs/winemine/Ro.rc b/programs/winemine/Ro.rc index 9d601ae..af0ea37 100644 --- a/programs/winemine/Ro.rc +++ b/programs/winemine/Ro.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL #pragma code_page(65001) @@ -91,5 +93,3 @@ CAPTION "Joc personalizat" DEFPUSHBUTTON "OK", IDOK, 40, 30, 50, 15 PUSHBUTTON "Renunţă", IDCANCEL, 40, 50, 50, 15 } - -#pragma code_page(default) diff --git a/programs/winemine/Ru.rc b/programs/winemine/Ru.rc index f13fd7e..e323e24 100644 --- a/programs/winemine/Ru.rc +++ b/programs/winemine/Ru.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE { diff --git a/programs/winemine/Si.rc b/programs/winemine/Si.rc index 77148c5..dab867a 100644 --- a/programs/winemine/Si.rc +++ b/programs/winemine/Si.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + #pragma code_page(65001) LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT @@ -91,5 +93,3 @@ CAPTION "Poljubna igra" DEFPUSHBUTTON "V redu", IDOK, 40, 30, 50, 15 PUSHBUTTON "Prekliči", IDCANCEL, 40, 50, 50, 15 } - -#pragma code_page(default) diff --git a/programs/winemine/Tr.rc b/programs/winemine/Tr.rc index b09f77d..174fbda 100644 --- a/programs/winemine/Tr.rc +++ b/programs/winemine/Tr.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT STRINGTABLE { diff --git a/programs/winemine/Zh.rc b/programs/winemine/Zh.rc index 99777c2..e28a204 100644 --- a/programs/winemine/Zh.rc +++ b/programs/winemine/Zh.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + /* Chinese text is encoded in UTF-8 */ #pragma code_page(65001) @@ -162,5 +164,3 @@ CAPTION "自定義遊戲" DEFPUSHBUTTON "確定", IDOK, 40, 30, 50, 15 PUSHBUTTON "取消", IDCANCEL, 40, 50, 50, 15 } - -#pragma code_page(default) diff --git a/programs/winemine/resource.h b/programs/winemine/resource.h index 982c516..c3272a2 100644 --- a/programs/winemine/resource.h +++ b/programs/winemine/resource.h @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <windef.h> +#include <winuser.h> #define ID_TIMER 1000 diff --git a/programs/winemine/rsrc.rc b/programs/winemine/rsrc.rc index 09f5cd3..ce5bcf9 100644 --- a/programs/winemine/rsrc.rc +++ b/programs/winemine/rsrc.rc @@ -19,32 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <windef.h> -#include <winuser.h> - #include "resource.h" -#include "Cs.rc" -#include "Da.rc" -#include "De.rc" -#include "En.rc" -#include "Es.rc" -#include "Fi.rc" -#include "Fr.rc" -#include "It.rc" -#include "Ja.rc" -#include "Ko.rc" -#include "Lt.rc" -#include "Nl.rc" -#include "No.rc" -#include "Pl.rc" -#include "Pt.rc" -#include "Ro.rc" -#include "Ru.rc" -#include "Si.rc" -#include "Tr.rc" -#include "Zh.rc" - LANGUAGE LANG_NEUTRAL,SUBLANG_NEUTRAL IDA_WINEMINE ACCELERATORS DISCARDABLE

1 0

Michael Stefaniuc : msi: Build language resource files separately.
by Alexandre Julliard July 2, 2009

July 2, 2009

Module: wine Branch: master Commit: 5234f1fd0a258171f7c734ccfb402866e1615e71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5234f1fd0a258171f7c734ccf… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 2 00:33:53 2009 +0200 msi: Build language resource files separately. Do not include them from an other rc file. --- dlls/msi/Makefile.in | 26 +++++++++++++++++++++++++- dlls/msi/msi.rc | 32 -------------------------------- dlls/msi/msi_Bg.rc | 2 ++ dlls/msi/msi_Da.rc | 2 ++ dlls/msi/msi_De.rc | 4 ++-- dlls/msi/msi_En.rc | 2 ++ dlls/msi/msi_Eo.rc | 2 ++ dlls/msi/msi_Es.rc | 2 ++ dlls/msi/msi_Fi.rc | 2 ++ dlls/msi/msi_Fr.rc | 2 ++ dlls/msi/msi_Hu.rc | 2 ++ dlls/msi/msi_It.rc | 2 ++ dlls/msi/msi_Ko.rc | 2 ++ dlls/msi/msi_Lt.rc | 4 ++-- dlls/msi/msi_Nl.rc | 2 ++ dlls/msi/msi_No.rc | 2 ++ dlls/msi/msi_Pl.rc | 2 ++ dlls/msi/msi_Pt.rc | 2 ++ dlls/msi/msi_Ro.rc | 4 ++-- dlls/msi/msi_Ru.rc | 2 ++ dlls/msi/msi_Si.rc | 4 ++-- dlls/msi/msi_Sv.rc | 2 ++ dlls/msi/msi_Tr.rc | 2 ++ dlls/msi/msi_Zh.rc | 4 ++-- 24 files changed, 69 insertions(+), 43 deletions(-) diff --git a/dlls/msi/Makefile.in b/dlls/msi/Makefile.in index a3ae579..c259360 100644 --- a/dlls/msi/Makefile.in +++ b/dlls/msi/Makefile.in @@ -59,7 +59,31 @@ BISON_SRCS = \ cond.y \ sql.y -RC_SRCS = msi.rc +RC_SRCS = \ + msi.rc \ + msi_Bg.rc \ + msi_Da.rc \ + msi_De.rc \ + msi_En.rc \ + msi_Eo.rc \ + msi_Es.rc \ + msi_Fi.rc \ + msi_Fr.rc \ + msi_Hu.rc \ + msi_It.rc \ + msi_Ko.rc \ + msi_Lt.rc \ + msi_Nl.rc \ + msi_No.rc \ + msi_Pl.rc \ + msi_Pt.rc \ + msi_Ro.rc \ + msi_Ru.rc \ + msi_Si.rc \ + msi_Sv.rc \ + msi_Tr.rc \ + msi_Zh.rc \ + version.rc @MAKE_DLL_RULES@ diff --git a/dlls/msi/msi.rc b/dlls/msi/msi.rc index 89d524c..466269a 100644 --- a/dlls/msi/msi.rc +++ b/dlls/msi/msi.rc @@ -19,38 +19,6 @@ */ #include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winnls.h" - -LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL - -#include "version.rc" - -#include "msi_Bg.rc" -#include "msi_Da.rc" -#include "msi_De.rc" -#include "msi_En.rc" -#include "msi_Eo.rc" -#include "msi_Es.rc" -#include "msi_Fi.rc" -#include "msi_Fr.rc" -#include "msi_Hu.rc" -#include "msi_It.rc" -#include "msi_Ko.rc" -#include "msi_Lt.rc" -#include "msi_Nl.rc" -#include "msi_No.rc" -#include "msi_Pl.rc" -#include "msi_Pt.rc" -#include "msi_Ro.rc" -#include "msi_Ru.rc" -#include "msi_Si.rc" -#include "msi_Sv.rc" -#include "msi_Tr.rc" -#include "msi_Zh.rc" - -LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL /* @makedep: msiserver.tlb */ 1 TYPELIB LOADONCALL DISCARDABLE msiserver.tlb diff --git a/dlls/msi/msi_Bg.rc b/dlls/msi/msi_Bg.rc index 3f2b34a..d3b8ca8 100644 --- a/dlls/msi/msi_Bg.rc +++ b/dlls/msi/msi_Bg.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" + LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE diff --git a/dlls/msi/msi_Da.rc b/dlls/msi/msi_Da.rc index 0fd1af0..beee427 100644 --- a/dlls/msi/msi_Da.rc +++ b/dlls/msi/msi_Da.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" + LANGUAGE LANG_DANISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE diff --git a/dlls/msi/msi_De.rc b/dlls/msi/msi_De.rc index 00649b6..e0cccf0 100644 --- a/dlls/msi/msi_De.rc +++ b/dlls/msi/msi_De.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL #pragma code_page(65001) @@ -34,5 +36,3 @@ STRINGTABLE DISCARDABLE 14 "Feature von:" 15 "Wählen Sie das Verzeichnis aus, dass %s enthält." } - -#pragma code_page(default) diff --git a/dlls/msi/msi_En.rc b/dlls/msi/msi_En.rc index 55a6b22..74fc5c1 100644 --- a/dlls/msi/msi_En.rc +++ b/dlls/msi/msi_En.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" + LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE diff --git a/dlls/msi/msi_Eo.rc b/dlls/msi/msi_Eo.rc index e7ed2fa..7579bdc 100644 --- a/dlls/msi/msi_Eo.rc +++ b/dlls/msi/msi_Eo.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" + LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE diff --git a/dlls/msi/msi_Es.rc b/dlls/msi/msi_Es.rc index 94bfaf5..781be07 100644 --- a/dlls/msi/msi_Es.rc +++ b/dlls/msi/msi_Es.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" + LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE diff --git a/dlls/msi/msi_Fi.rc b/dlls/msi/msi_Fi.rc index 87ce328..17721aa 100644 --- a/dlls/msi/msi_Fi.rc +++ b/dlls/msi/msi_Fi.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" + LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE diff --git a/dlls/msi/msi_Fr.rc b/dlls/msi/msi_Fr.rc index 8b4b83f..a4cd0bc 100644 --- a/dlls/msi/msi_Fr.rc +++ b/dlls/msi/msi_Fr.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE diff --git a/dlls/msi/msi_Hu.rc b/dlls/msi/msi_Hu.rc index ccefef7..21ba5cf 100644 --- a/dlls/msi/msi_Hu.rc +++ b/dlls/msi/msi_Hu.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" + LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE diff --git a/dlls/msi/msi_It.rc b/dlls/msi/msi_It.rc index 9e95245..9864806 100644 --- a/dlls/msi/msi_It.rc +++ b/dlls/msi/msi_It.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" + LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE diff --git a/dlls/msi/msi_Ko.rc b/dlls/msi/msi_Ko.rc index 2bca718..ca14253 100644 --- a/dlls/msi/msi_Ko.rc +++ b/dlls/msi/msi_Ko.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE diff --git a/dlls/msi/msi_Lt.rc b/dlls/msi/msi_Lt.rc index 769d2c0..1cf1c52 100644 --- a/dlls/msi/msi_Lt.rc +++ b/dlls/msi/msi_Lt.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" + /* UTF-8 */ #pragma code_page(65001) @@ -35,5 +37,3 @@ STRINGTABLE DISCARDABLE 14 "komponentas iš:" 15 "parinkite aplanką, kuris turi %s" } - -#pragma code_page(default) diff --git a/dlls/msi/msi_Nl.rc b/dlls/msi/msi_Nl.rc index 123b1c6..da30430 100644 --- a/dlls/msi/msi_Nl.rc +++ b/dlls/msi/msi_Nl.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" + LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE diff --git a/dlls/msi/msi_No.rc b/dlls/msi/msi_No.rc index 3ab58bc..e885f5a 100644 --- a/dlls/msi/msi_No.rc +++ b/dlls/msi/msi_No.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL STRINGTABLE DISCARDABLE diff --git a/dlls/msi/msi_Pl.rc b/dlls/msi/msi_Pl.rc index 00eb535..c31311e 100644 --- a/dlls/msi/msi_Pl.rc +++ b/dlls/msi/msi_Pl.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" + LANGUAGE LANG_POLISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE diff --git a/dlls/msi/msi_Pt.rc b/dlls/msi/msi_Pt.rc index 3d90f71..64ab163 100644 --- a/dlls/msi/msi_Pt.rc +++ b/dlls/msi/msi_Pt.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" + LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN STRINGTABLE DISCARDABLE diff --git a/dlls/msi/msi_Ro.rc b/dlls/msi/msi_Ro.rc index a167d05..b877b42 100644 --- a/dlls/msi/msi_Ro.rc +++ b/dlls/msi/msi_Ro.rc @@ -17,6 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" + LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL #pragma code_page(65001) @@ -33,5 +35,3 @@ STRINGTABLE DISCARDABLE 14 "caracteristică de la:" 15 "selectați fișierul care conține %s" } - -#pragma code_page(default) diff --git a/dlls/msi/msi_Ru.rc b/dlls/msi/msi_Ru.rc index 2646573..d63593e 100644 --- a/dlls/msi/msi_Ru.rc +++ b/dlls/msi/msi_Ru.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE diff --git a/dlls/msi/msi_Si.rc b/dlls/msi/msi_Si.rc index bf92697..7582339 100644 --- a/dlls/msi/msi_Si.rc +++ b/dlls/msi/msi_Si.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" + #pragma code_page(65001) LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT @@ -34,5 +36,3 @@ STRINGTABLE DISCARDABLE 14 "funkcija z:" 15 "izberite mapo, ki vsebuje %s" } - -#pragma code_page(default) diff --git a/dlls/msi/msi_Sv.rc b/dlls/msi/msi_Sv.rc index dc1f2ed..47bf09b 100644 --- a/dlls/msi/msi_Sv.rc +++ b/dlls/msi/msi_Sv.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" + LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE diff --git a/dlls/msi/msi_Tr.rc b/dlls/msi/msi_Tr.rc index becd913..a8e0f36 100644 --- a/dlls/msi/msi_Tr.rc +++ b/dlls/msi/msi_Tr.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" + LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE diff --git a/dlls/msi/msi_Zh.rc b/dlls/msi/msi_Zh.rc index 86620db..a6d5cd1 100644 --- a/dlls/msi/msi_Zh.rc +++ b/dlls/msi/msi_Zh.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" + /* Chinese text is encoded in UTF-8 */ #pragma code_page(65001) @@ -50,5 +52,3 @@ STRINGTABLE DISCARDABLE 14 "功能來自:" 15 "選擇包含 %s 的檔案夾" } - -#pragma code_page(default)

1 0

Michael Stefaniuc : credui: Build language resource files separately.
by Alexandre Julliard July 2, 2009

July 2, 2009

Module: wine Branch: master Commit: 6b6ff6afa4eae2df37b349c9244bc4abc60988e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b6ff6afa4eae2df37b349c92… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 2 00:33:27 2009 +0200 credui: Build language resource files separately. Do not include them from an other rc file. --- dlls/credui/Makefile.in | 19 ++++++++++++++++++- dlls/credui/credui.rc | 21 --------------------- dlls/credui/credui_Da.rc | 2 ++ dlls/credui/credui_De.rc | 2 ++ dlls/credui/credui_En.rc | 2 ++ dlls/credui/credui_Es.rc | 5 +++-- dlls/credui/credui_Fr.rc | 5 +++-- dlls/credui/credui_Ko.rc | 2 ++ dlls/credui/credui_Lt.rc | 4 ++-- dlls/credui/credui_Nl.rc | 2 ++ dlls/credui/credui_No.rc | 2 ++ dlls/credui/credui_Pl.rc | 2 ++ dlls/credui/credui_Pt.rc | 2 ++ dlls/credui/credui_Ro.rc | 4 ++-- dlls/credui/credui_Ru.rc | 2 ++ dlls/credui/credui_Si.rc | 4 ++-- dlls/credui/credui_Sv.rc | 2 ++ dlls/credui/credui_Zh.rc | 4 ++-- dlls/credui/credui_resources.h | 3 +++ 19 files changed, 55 insertions(+), 34 deletions(-) diff --git a/dlls/credui/Makefile.in b/dlls/credui/Makefile.in index c9d574f..f29278c 100644 --- a/dlls/credui/Makefile.in +++ b/dlls/credui/Makefile.in @@ -9,7 +9,24 @@ IMPORTS = comctl32 user32 advapi32 kernel32 C_SRCS = \ credui_main.c -RC_SRCS = credui.rc +RC_SRCS = \ + credui.rc \ + credui_Da.rc \ + credui_De.rc \ + credui_En.rc \ + credui_Es.rc \ + credui_Fr.rc \ + credui_Ko.rc \ + credui_Lt.rc \ + credui_Nl.rc \ + credui_No.rc \ + credui_Pl.rc \ + credui_Pt.rc \ + credui_Ro.rc \ + credui_Ru.rc \ + credui_Si.rc \ + credui_Sv.rc \ + credui_Zh.rc @MAKE_DLL_RULES@ diff --git a/dlls/credui/credui.rc b/dlls/credui/credui.rc index f66a942..0f16f00 100644 --- a/dlls/credui/credui.rc +++ b/dlls/credui/credui.rc @@ -18,28 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winnls.h" #include "credui_resources.h" /* @makedep: banner.bmp */ IDB_BANNER BITMAP LOADONCALL DISCARDABLE banner.bmp - -#include "credui_Da.rc" -#include "credui_De.rc" -#include "credui_En.rc" -#include "credui_Es.rc" -#include "credui_Fr.rc" -#include "credui_Ko.rc" -#include "credui_Lt.rc" -#include "credui_Nl.rc" -#include "credui_No.rc" -#include "credui_Pl.rc" -#include "credui_Pt.rc" -#include "credui_Ro.rc" -#include "credui_Ru.rc" -#include "credui_Si.rc" -#include "credui_Sv.rc" -#include "credui_Zh.rc" diff --git a/dlls/credui/credui_Da.rc b/dlls/credui/credui_Da.rc index d5e7608..26ef991 100644 --- a/dlls/credui/credui_Da.rc +++ b/dlls/credui/credui_Da.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "credui_resources.h" + LANGUAGE LANG_DANISH, SUBLANG_DEFAULT IDD_CREDDIALOG DIALOG DISCARDABLE 0, 0, 213, 149 diff --git a/dlls/credui/credui_De.rc b/dlls/credui/credui_De.rc index 7c197d6..9e72698 100644 --- a/dlls/credui/credui_De.rc +++ b/dlls/credui/credui_De.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "credui_resources.h" + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL IDD_CREDDIALOG DIALOG DISCARDABLE 0, 0, 213, 149 diff --git a/dlls/credui/credui_En.rc b/dlls/credui/credui_En.rc index 8e475bb..feb4afc 100644 --- a/dlls/credui/credui_En.rc +++ b/dlls/credui/credui_En.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "credui_resources.h" + LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT IDD_CREDDIALOG DIALOG DISCARDABLE 0, 0, 213, 149 diff --git a/dlls/credui/credui_Es.rc b/dlls/credui/credui_Es.rc index 0a48b3f..8f71d5f 100644 --- a/dlls/credui/credui_Es.rc +++ b/dlls/credui/credui_Es.rc @@ -18,6 +18,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "credui_resources.h" + #pragma code_page(65001) LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL @@ -50,5 +53,3 @@ STRINGTABLE DISCARDABLE IDS_CAPSLOCKONTITLE "Bloq Mayus está activado" IDS_CAPSLOCKON "El Bloq Mayus activado puede hacer que entre su contraseña incorrectamente.\n\nPulse la tecla Bloq Mayus de su teclado para desactivar Bloq Mayus antes\n de introducir su contraseña." } - -#pragma code_page(default) diff --git a/dlls/credui/credui_Fr.rc b/dlls/credui/credui_Fr.rc index fb7cd12..387a86d 100644 --- a/dlls/credui/credui_Fr.rc +++ b/dlls/credui/credui_Fr.rc @@ -17,6 +17,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "credui_resources.h" + #pragma code_page(65001) LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL @@ -49,5 +52,3 @@ STRINGTABLE DISCARDABLE IDS_CAPSLOCKONTITLE "VERR.MAJ est activé" IDS_CAPSLOCKON "Le verrouillage majuscule étant activé, cela pourrait provoquer une erreur lors de la saisie de votre mot de passe.\n\nAppuyez sur la touche VERR.MAJ de votre clavier afin de désactiver le verrouilage majuscule avant\nde saisir votre mot de passe." } - -#pragma code_page(default) diff --git a/dlls/credui/credui_Ko.rc b/dlls/credui/credui_Ko.rc index 62bd135..ab1f1ec 100644 --- a/dlls/credui/credui_Ko.rc +++ b/dlls/credui/credui_Ko.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "credui_resources.h" + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT IDD_CREDDIALOG DIALOG DISCARDABLE 0, 0, 213, 149 diff --git a/dlls/credui/credui_Lt.rc b/dlls/credui/credui_Lt.rc index 9ad3e4b..4eb6eba 100644 --- a/dlls/credui/credui_Lt.rc +++ b/dlls/credui/credui_Lt.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "credui_resources.h" + /* UTF-8 */ #pragma code_page(65001) @@ -51,5 +53,3 @@ STRINGTABLE DISCARDABLE IDS_CAPSLOCKONTITLE "Didžiųjų raidžių būsena įjungta" IDS_CAPSLOCKON "Kai įjungta didžiųjų raidžių būsena, savo slaptažodį galite įvesti neteisingai.\n\nPaspauskite didžiųjų raidžių klaviatūros klavišą didžiųjų raidžių būsenai išjungti\nprieš rinkdami savo slaptažodį." } - -#pragma code_page(default) diff --git a/dlls/credui/credui_Nl.rc b/dlls/credui/credui_Nl.rc index ed5c41e..575496c 100644 --- a/dlls/credui/credui_Nl.rc +++ b/dlls/credui/credui_Nl.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "credui_resources.h" + LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL IDD_CREDDIALOG DIALOG DISCARDABLE 0, 0, 213, 149 diff --git a/dlls/credui/credui_No.rc b/dlls/credui/credui_No.rc index cc09cd8..c47fec1 100644 --- a/dlls/credui/credui_No.rc +++ b/dlls/credui/credui_No.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "credui_resources.h" + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL IDD_CREDDIALOG DIALOG DISCARDABLE 0, 0, 213, 149 diff --git a/dlls/credui/credui_Pl.rc b/dlls/credui/credui_Pl.rc index 902ced6..e2fab5c 100644 --- a/dlls/credui/credui_Pl.rc +++ b/dlls/credui/credui_Pl.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "credui_resources.h" + LANGUAGE LANG_POLISH, SUBLANG_DEFAULT IDD_CREDDIALOG DIALOG DISCARDABLE 0, 0, 213, 149 diff --git a/dlls/credui/credui_Pt.rc b/dlls/credui/credui_Pt.rc index 930fb43..2283e43 100644 --- a/dlls/credui/credui_Pt.rc +++ b/dlls/credui/credui_Pt.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "credui_resources.h" + LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL IDD_CREDDIALOG DIALOG DISCARDABLE 0, 0, 213, 149 diff --git a/dlls/credui/credui_Ro.rc b/dlls/credui/credui_Ro.rc index 3d3367e..29e9899 100644 --- a/dlls/credui/credui_Ro.rc +++ b/dlls/credui/credui_Ro.rc @@ -17,6 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "credui_resources.h" + LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL #pragma code_page(65001) @@ -49,5 +51,3 @@ STRINGTABLE DISCARDABLE IDS_CAPSLOCKONTITLE "Tasta Caps Lock este activată" IDS_CAPSLOCKON "Cu tasta Caps Lock activată este foarte probabil că veți introduce parola greșit.\n\nInainte de a introduce parola apăsați tasta Caps Lock pentru a dezactiva scrierea cu majuscule." } - -#pragma code_page(default) diff --git a/dlls/credui/credui_Ru.rc b/dlls/credui/credui_Ru.rc index fce2c5f..a990525 100644 --- a/dlls/credui/credui_Ru.rc +++ b/dlls/credui/credui_Ru.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "credui_resources.h" + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT IDD_CREDDIALOG DIALOG DISCARDABLE 0, 0, 213, 149 diff --git a/dlls/credui/credui_Si.rc b/dlls/credui/credui_Si.rc index d2152ad..34915e6 100644 --- a/dlls/credui/credui_Si.rc +++ b/dlls/credui/credui_Si.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "credui_resources.h" + #pragma code_page(65001) LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT @@ -50,5 +52,3 @@ STRINGTABLE DISCARDABLE IDS_CAPSLOCKONTITLE "Caps Lock je vključen" IDS_CAPSLOCKON "Vključen Caps Lock je lahko vzrok nepravilnega vnosa gesla.\n\nPritisnite tipko Caps Lock, s čimer ga izklopite\nin ponovno vnesite geslo." } - -#pragma code_page(default) diff --git a/dlls/credui/credui_Sv.rc b/dlls/credui/credui_Sv.rc index 453b7a3..a43c216 100644 --- a/dlls/credui/credui_Sv.rc +++ b/dlls/credui/credui_Sv.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "credui_resources.h" + LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL IDD_CREDDIALOG DIALOG DISCARDABLE 0, 0, 213, 149 diff --git a/dlls/credui/credui_Zh.rc b/dlls/credui/credui_Zh.rc index 99294c7..041aecd 100644 --- a/dlls/credui/credui_Zh.rc +++ b/dlls/credui/credui_Zh.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "credui_resources.h" + /* Chinese text is encoded in UTF-8 */ #pragma code_page(65001) @@ -82,5 +84,3 @@ STRINGTABLE DISCARDABLE IDS_CAPSLOCKONTITLE "大寫鎖定開著" IDS_CAPSLOCKON "開著大寫鎖定可能導致你輸入錯誤的密碼." } - -#pragma code_page(default) diff --git a/dlls/credui/credui_resources.h b/dlls/credui/credui_resources.h index e5bd8ee..0a6ab72 100644 --- a/dlls/credui/credui_resources.h +++ b/dlls/credui/credui_resources.h @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <windef.h> +#include <winuser.h> + #define IDD_CREDDIALOG 100 #define IDC_USERNAME 101 #define IDC_PASSWORD 102

1 0

Michael Stefaniuc : shell32: Build language resource files separately.
by Alexandre Julliard July 2, 2009

July 2, 2009

Module: wine Branch: master Commit: ee8c98c05cadf8d8fabb77e40ba3dabf1f69feb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee8c98c05cadf8d8fabb77e40… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 2 00:28:19 2009 +0200 shell32: Build language resource files separately. Do not include them from an other rc file. --- dlls/shell32/Makefile.in | 32 +++++++++++++++++++++++++++++- dlls/shell32/shell32_Bg.rc | 2 + dlls/shell32/shell32_Ca.rc | 2 + dlls/shell32/shell32_Cs.rc | 2 + dlls/shell32/shell32_Da.rc | 2 + dlls/shell32/shell32_De.rc | 2 + dlls/shell32/shell32_En.rc | 2 + dlls/shell32/shell32_Eo.rc | 2 + dlls/shell32/shell32_Es.rc | 2 + dlls/shell32/shell32_Fi.rc | 2 + dlls/shell32/shell32_Fr.rc | 4 +- dlls/shell32/shell32_Hu.rc | 2 + dlls/shell32/shell32_It.rc | 2 + dlls/shell32/shell32_Ja.rc | 4 +- dlls/shell32/shell32_Ko.rc | 2 + dlls/shell32/shell32_Lt.rc | 4 +- dlls/shell32/shell32_Nl.rc | 2 + dlls/shell32/shell32_No.rc | 2 + dlls/shell32/shell32_Pl.rc | 2 + dlls/shell32/shell32_Pt.rc | 2 + dlls/shell32/shell32_Ro.rc | 4 +- dlls/shell32/shell32_Ru.rc | 2 + dlls/shell32/shell32_Si.rc | 5 +-- dlls/shell32/shell32_Sk.rc | 2 + dlls/shell32/shell32_Sv.rc | 2 + dlls/shell32/shell32_Tr.rc | 2 + dlls/shell32/shell32_Uk.rc | 2 + dlls/shell32/shell32_Wa.rc | 2 + dlls/shell32/shell32_Zh.rc | 4 +- dlls/shell32/shres.rc | 46 -------------------------------------------- dlls/shell32/shresdef.h | 7 ++++++ 31 files changed, 94 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ee8c98c05cadf8d8fabb7…

1 0

Michael Stefaniuc : oledlg: Build language resource files separately.
by Alexandre Julliard July 2, 2009

July 2, 2009

Module: wine Branch: master Commit: 2d170ae85092d1a4a6b6f284a23cfbbbf3d2edbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d170ae85092d1a4a6b6f284a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 2 00:34:01 2009 +0200 oledlg: Build language resource files separately. Do not include them from an other rc file. --- dlls/oledlg/Makefile.in | 22 +++++++++++++++++- dlls/oledlg/oledlg_Cs.rc | 2 + dlls/oledlg/oledlg_Da.rc | 2 + dlls/oledlg/oledlg_De.rc | 2 + dlls/oledlg/oledlg_En.rc | 2 + dlls/oledlg/oledlg_Es.rc | 2 + dlls/oledlg/oledlg_Fr.rc | 1 + dlls/oledlg/oledlg_Hu.rc | 2 + dlls/oledlg/oledlg_It.rc | 2 + dlls/oledlg/oledlg_Ja.rc | 4 +- dlls/oledlg/oledlg_Ko.rc | 2 + dlls/oledlg/oledlg_Lt.rc | 4 +- dlls/oledlg/oledlg_Nl.rc | 2 + dlls/oledlg/oledlg_No.rc | 2 + dlls/oledlg/oledlg_Pl.rc | 2 + dlls/oledlg/oledlg_Pt.rc | 2 + dlls/oledlg/oledlg_Ru.rc | 2 + dlls/oledlg/oledlg_Si.rc | 4 +- dlls/oledlg/oledlg_Sv.rc | 2 + dlls/oledlg/oledlg_Tr.rc | 2 + dlls/oledlg/oledlg_Zh.rc | 4 +- dlls/oledlg/resource.h | 2 + dlls/oledlg/rsrc.rc | 55 ---------------------------------------------- 23 files changed, 62 insertions(+), 64 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2d170ae85092d1a4a6b6f…

1 0

Michael Stefaniuc : view: Build language resource files separately.
by Alexandre Julliard July 2, 2009

July 2, 2009

Module: wine Branch: master Commit: c135e063c431aafdeb5a6f57ddf0d12341b3c74e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c135e063c431aafdeb5a6f57d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 2 00:30:31 2009 +0200 view: Build language resource files separately. Do not include them from an other rc file. --- programs/view/Cs.rc | 2 + programs/view/Da.rc | 2 + programs/view/De.rc | 2 + programs/view/En.rc | 2 + programs/view/Eo.rc | 2 + programs/view/Es.rc | 2 + programs/view/Fr.rc | 2 + programs/view/It.rc | 2 + programs/view/Ja.rc | 4 +- programs/view/Ko.rc | 2 + programs/view/Lt.rc | 4 +- programs/view/Makefile.in | 23 ++++++++++++++++++++- programs/view/Nl.rc | 2 + programs/view/No.rc | 2 + programs/view/Pl.rc | 2 + programs/view/Pt.rc | 2 + programs/view/Ro.rc | 4 +- programs/view/Ru.rc | 2 + programs/view/Si.rc | 4 +- programs/view/Sv.rc | 2 + programs/view/Tr.rc | 2 + programs/view/Zh.rc | 4 +- programs/view/resource.h | 2 + programs/view/viewrc.rc | 49 --------------------------------------------- 24 files changed, 66 insertions(+), 60 deletions(-) diff --git a/programs/view/Cs.rc b/programs/view/Cs.rc index ca34121..58ee9ca 100644 --- a/programs/view/Cs.rc +++ b/programs/view/Cs.rc @@ -22,6 +22,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_CZECH, SUBLANG_DEFAULT /* Czech strings in CP1250 */ diff --git a/programs/view/Da.rc b/programs/view/Da.rc index 91fd214..8996cf8 100644 --- a/programs/view/Da.rc +++ b/programs/view/Da.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_DANISH, SUBLANG_DEFAULT /* diff --git a/programs/view/De.rc b/programs/view/De.rc index 5e7cf31..b77fc82 100644 --- a/programs/view/De.rc +++ b/programs/view/De.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL /* diff --git a/programs/view/En.rc b/programs/view/En.rc index 042f303..b201290 100644 --- a/programs/view/En.rc +++ b/programs/view/En.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT /* diff --git a/programs/view/Eo.rc b/programs/view/Eo.rc index bcdeba7..bc61a8d 100644 --- a/programs/view/Eo.rc +++ b/programs/view/Eo.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT /* diff --git a/programs/view/Es.rc b/programs/view/Es.rc index f1b897d..e0f53f3 100644 --- a/programs/view/Es.rc +++ b/programs/view/Es.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL /* diff --git a/programs/view/Fr.rc b/programs/view/Fr.rc index b2ab0a4..786a63d 100644 --- a/programs/view/Fr.rc +++ b/programs/view/Fr.rc @@ -21,6 +21,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL /* diff --git a/programs/view/It.rc b/programs/view/It.rc index 37747ce..0839c44 100644 --- a/programs/view/It.rc +++ b/programs/view/It.rc @@ -21,6 +21,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL /* diff --git a/programs/view/Ja.rc b/programs/view/Ja.rc index 46c8e11..0b69216 100644 --- a/programs/view/Ja.rc +++ b/programs/view/Ja.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + /* UTF-8 */ #pragma code_page(65001) @@ -72,5 +74,3 @@ STRINGTABLE DISCARDABLE BEGIN IDS_DESCRIPTION "標準メタファイルビュアー" END - -#pragma code_page(default) diff --git a/programs/view/Ko.rc b/programs/view/Ko.rc index 5df207b..3451626 100644 --- a/programs/view/Ko.rc +++ b/programs/view/Ko.rc @@ -21,6 +21,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT /* diff --git a/programs/view/Lt.rc b/programs/view/Lt.rc index cbce3bb..fdcf731 100644 --- a/programs/view/Lt.rc +++ b/programs/view/Lt.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + /* UTF-8 */ #pragma code_page(65001) @@ -71,5 +73,3 @@ STRINGTABLE DISCARDABLE BEGIN IDS_DESCRIPTION "Įprastinė metafailų žiūryklė" END - -#pragma code_page(default) diff --git a/programs/view/Makefile.in b/programs/view/Makefile.in index 134a2b4..ff34532 100644 --- a/programs/view/Makefile.in +++ b/programs/view/Makefile.in @@ -11,7 +11,28 @@ C_SRCS = \ view.c \ winmain.c -RC_SRCS = viewrc.rc +RC_SRCS = \ + Cs.rc \ + Da.rc \ + De.rc \ + En.rc \ + Eo.rc \ + Es.rc \ + Fr.rc \ + It.rc \ + Ja.rc \ + Ko.rc \ + Lt.rc \ + Nl.rc \ + No.rc \ + Pl.rc \ + Pt.rc \ + Ro.rc \ + Ru.rc \ + Si.rc \ + Sv.rc \ + Tr.rc \ + Zh.rc @MAKE_PROG_RULES@ diff --git a/programs/view/Nl.rc b/programs/view/Nl.rc index 34a9d4f..623506b 100644 --- a/programs/view/Nl.rc +++ b/programs/view/Nl.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL /* diff --git a/programs/view/No.rc b/programs/view/No.rc index e728966..4a18853 100644 --- a/programs/view/No.rc +++ b/programs/view/No.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL /* diff --git a/programs/view/Pl.rc b/programs/view/Pl.rc index 3f3e937..28828d8 100644 --- a/programs/view/Pl.rc +++ b/programs/view/Pl.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_POLISH, SUBLANG_DEFAULT /* diff --git a/programs/view/Pt.rc b/programs/view/Pt.rc index 47aab01..3003080 100644 --- a/programs/view/Pt.rc +++ b/programs/view/Pt.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + /* * * Menu diff --git a/programs/view/Ro.rc b/programs/view/Ro.rc index b03fe31..8c05f06 100644 --- a/programs/view/Ro.rc +++ b/programs/view/Ro.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL #pragma code_page(65001) @@ -69,5 +71,3 @@ STRINGTABLE DISCARDABLE BEGIN IDS_DESCRIPTION "Vizualizator de fișiere metafile normale" END - -#pragma code_page(default) diff --git a/programs/view/Ru.rc b/programs/view/Ru.rc index cbdc28e..9d4d39e 100644 --- a/programs/view/Ru.rc +++ b/programs/view/Ru.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT /* diff --git a/programs/view/Si.rc b/programs/view/Si.rc index 8cb4988..8e6a0f2 100644 --- a/programs/view/Si.rc +++ b/programs/view/Si.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + #pragma code_page(65001) LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT @@ -70,5 +72,3 @@ STRINGTABLE DISCARDABLE BEGIN IDS_DESCRIPTION "Program za ogled Metafile slik" END - -#pragma code_page(default) diff --git a/programs/view/Sv.rc b/programs/view/Sv.rc index b1bb50d..2f7eea3 100644 --- a/programs/view/Sv.rc +++ b/programs/view/Sv.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL /* diff --git a/programs/view/Tr.rc b/programs/view/Tr.rc index 38ed849..3e6ea6f 100644 --- a/programs/view/Tr.rc +++ b/programs/view/Tr.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT /* diff --git a/programs/view/Zh.rc b/programs/view/Zh.rc index 84bd638..05067f8 100644 --- a/programs/view/Zh.rc +++ b/programs/view/Zh.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + /* Chinese text is encoded in UTF-8 */ #pragma code_page(65001) @@ -120,5 +122,3 @@ STRINGTABLE DISCARDABLE BEGIN IDS_DESCRIPTION "普通 Metafile 閱讀器" END - -#pragma code_page(default) diff --git a/programs/view/resource.h b/programs/view/resource.h index 619da49..7932687 100644 --- a/programs/view/resource.h +++ b/programs/view/resource.h @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <windef.h> + #define IDS_DESCRIPTION 2 #define IDI_APPICON 101 #define IDM_EXIT 1000 diff --git a/programs/view/viewrc.rc b/programs/view/viewrc.rc deleted file mode 100644 index 6217cf6..0000000 --- a/programs/view/viewrc.rc +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright 1998 Douglas Ridgway - * - * 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 - */ - -#include <windef.h> - -#include "resource.h" - -#include "Cs.rc" -#include "Da.rc" -#include "De.rc" -#include "En.rc" -#include "Eo.rc" -#include "Es.rc" -#include "Fr.rc" -#include "It.rc" -#include "Ja.rc" -#include "Ko.rc" -#include "Lt.rc" -#include "Nl.rc" -#include "No.rc" -#include "Pl.rc" -#include "Pt.rc" -#include "Ro.rc" -#include "Ru.rc" -#include "Si.rc" -#include "Sv.rc" -#include "Tr.rc" -#include "Zh.rc" - -/* - * Icon - */ - -/*IDI_APPICON ICON DISCARDABLE "view.ico"*/

1 0

Michael Stefaniuc : winhlp32: Build language resource files separately.
by Alexandre Julliard July 2, 2009

July 2, 2009

Module: wine Branch: master Commit: 99e179445c28d66eef37dea2317680bec7f42da2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99e179445c28d66eef37dea23… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 2 00:31:44 2009 +0200 winhlp32: Build language resource files separately. Do not include them from an other rc file. --- programs/winhlp32/Bg.rc | 2 ++ programs/winhlp32/Cs.rc | 2 ++ programs/winhlp32/Da.rc | 2 ++ programs/winhlp32/De.rc | 2 ++ programs/winhlp32/En.rc | 2 ++ programs/winhlp32/Eo.rc | 2 ++ programs/winhlp32/Es.rc | 2 ++ programs/winhlp32/Fi.rc | 2 ++ programs/winhlp32/Fr.rc | 2 ++ programs/winhlp32/Hu.rc | 2 ++ programs/winhlp32/It.rc | 2 ++ programs/winhlp32/Ja.rc | 4 ++-- programs/winhlp32/Ko.rc | 2 ++ programs/winhlp32/Lt.rc | 4 ++-- programs/winhlp32/Makefile.in | 29 ++++++++++++++++++++++++++++- programs/winhlp32/Nl.rc | 2 ++ programs/winhlp32/No.rc | 2 ++ programs/winhlp32/Pl.rc | 2 ++ programs/winhlp32/Pt.rc | 2 ++ programs/winhlp32/Rm.rc | 2 ++ programs/winhlp32/Ru.rc | 2 ++ programs/winhlp32/Si.rc | 4 ++-- programs/winhlp32/Sk.rc | 2 ++ programs/winhlp32/Sv.rc | 2 ++ programs/winhlp32/Tr.rc | 2 ++ programs/winhlp32/Wa.rc | 2 ++ programs/winhlp32/Zh.rc | 4 ++-- programs/winhlp32/rsrc.rc | 31 ------------------------------- programs/winhlp32/winhelp_res.h | 3 +++ 29 files changed, 83 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=99e179445c28d66eef37d…

1 0

Michael Stefaniuc : wordpad: Build language resource files separately.
by Alexandre Julliard July 2, 2009

July 2, 2009

Module: wine Branch: master Commit: eaa31f33d6c837a3cfea24d3b2bfb852640d692f URL: http://source.winehq.org/git/wine.git/?a=commit;h=eaa31f33d6c837a3cfea24d3b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 2 00:31:53 2009 +0200 wordpad: Build language resource files separately. Do not include them from an other rc file. --- programs/wordpad/Da.rc | 2 ++ programs/wordpad/De.rc | 4 ++-- programs/wordpad/En.rc | 2 ++ programs/wordpad/Fr.rc | 2 ++ programs/wordpad/Hu.rc | 2 ++ programs/wordpad/Ja.rc | 4 ++-- programs/wordpad/Ko.rc | 1 + programs/wordpad/Lt.rc | 4 ++-- programs/wordpad/Makefile.in | 20 +++++++++++++++++++- programs/wordpad/Nl.rc | 2 ++ programs/wordpad/No.rc | 2 ++ programs/wordpad/Pl.rc | 2 ++ programs/wordpad/Pt.rc | 2 ++ programs/wordpad/Ru.rc | 2 ++ programs/wordpad/Si.rc | 4 ++-- programs/wordpad/Sv.rc | 4 ++-- programs/wordpad/Tr.rc | 2 ++ programs/wordpad/Zh.rc | 4 ++-- programs/wordpad/rsrc.rc | 21 --------------------- programs/wordpad/wordpad.h | 3 +++ 20 files changed, 55 insertions(+), 34 deletions(-) diff --git a/programs/wordpad/Da.rc b/programs/wordpad/Da.rc index d09e90f..3478946 100644 --- a/programs/wordpad/Da.rc +++ b/programs/wordpad/Da.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wordpad.h" + LANGUAGE LANG_DANISH, SUBLANG_DEFAULT IDM_MAINMENU MENU DISCARDABLE diff --git a/programs/wordpad/De.rc b/programs/wordpad/De.rc index a2fcceb..18181b2 100644 --- a/programs/wordpad/De.rc +++ b/programs/wordpad/De.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wordpad.h" + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL #pragma code_page(65001) @@ -244,5 +246,3 @@ BEGIN STRING_PRINTING_NOT_IMPLEMENTED, "Drucken ist nicht implementiert" STRING_MAX_TAB_STOPS, "Es können nur maximal 32 Tabstopps definiert werden." END - -#pragma code_page(default) diff --git a/programs/wordpad/En.rc b/programs/wordpad/En.rc index dd099e1..3f8070c 100644 --- a/programs/wordpad/En.rc +++ b/programs/wordpad/En.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wordpad.h" + LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT IDM_MAINMENU MENU DISCARDABLE diff --git a/programs/wordpad/Fr.rc b/programs/wordpad/Fr.rc index 72f7c70..29c7758 100644 --- a/programs/wordpad/Fr.rc +++ b/programs/wordpad/Fr.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wordpad.h" + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL IDM_MAINMENU MENU DISCARDABLE diff --git a/programs/wordpad/Hu.rc b/programs/wordpad/Hu.rc index 94ceda5..74926e1 100644 --- a/programs/wordpad/Hu.rc +++ b/programs/wordpad/Hu.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wordpad.h" + LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT IDM_MAINMENU MENU DISCARDABLE diff --git a/programs/wordpad/Ja.rc b/programs/wordpad/Ja.rc index 3049d8b..fc21c5a 100644 --- a/programs/wordpad/Ja.rc +++ b/programs/wordpad/Ja.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wordpad.h" + /* UTF-8 */ #pragma code_page(65001) @@ -245,5 +247,3 @@ BEGIN STRING_PRINTING_NOT_IMPLEMENTED, "プリントが実装されていません。" STRING_MAX_TAB_STOPS, "32以上なタブを追加できません。" END - -#pragma code_page(default) diff --git a/programs/wordpad/Ko.rc b/programs/wordpad/Ko.rc index 7bfaf00..5823585 100644 --- a/programs/wordpad/Ko.rc +++ b/programs/wordpad/Ko.rc @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wordpad.h" LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT diff --git a/programs/wordpad/Lt.rc b/programs/wordpad/Lt.rc index b95017f..91fbfca 100644 --- a/programs/wordpad/Lt.rc +++ b/programs/wordpad/Lt.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wordpad.h" + /* UTF-8 */ #pragma code_page(65001) @@ -245,5 +247,3 @@ BEGIN STRING_PRINTING_NOT_IMPLEMENTED, "Spausdinimas nerealizuotas" STRING_MAX_TAB_STOPS, "Negalima pridėti daugiau negu 32-jų tabuliavimo pozicijų." END - -#pragma code_page(default) diff --git a/programs/wordpad/Makefile.in b/programs/wordpad/Makefile.in index 461da31..e7f5b08 100644 --- a/programs/wordpad/Makefile.in +++ b/programs/wordpad/Makefile.in @@ -14,7 +14,25 @@ C_SRCS = \ registry.c \ wordpad.c -RC_SRCS = rsrc.rc +RC_SRCS = \ + Da.rc \ + De.rc \ + En.rc \ + Fr.rc \ + Hu.rc \ + Ja.rc \ + Ko.rc \ + Lt.rc \ + Nl.rc \ + No.rc \ + Pl.rc \ + Pt.rc \ + Ru.rc \ + Si.rc \ + Sv.rc \ + Tr.rc \ + Zh.rc \ + rsrc.rc SVG_SRCS = wordpad.svg diff --git a/programs/wordpad/Nl.rc b/programs/wordpad/Nl.rc index c91e028..c9ce64a 100644 --- a/programs/wordpad/Nl.rc +++ b/programs/wordpad/Nl.rc @@ -17,6 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wordpad.h" + LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL IDM_MAINMENU MENU DISCARDABLE diff --git a/programs/wordpad/No.rc b/programs/wordpad/No.rc index 6261c6f..392b9d6 100644 --- a/programs/wordpad/No.rc +++ b/programs/wordpad/No.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wordpad.h" + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL IDM_MAINMENU MENU DISCARDABLE diff --git a/programs/wordpad/Pl.rc b/programs/wordpad/Pl.rc index 47ff1bd..ab72104 100644 --- a/programs/wordpad/Pl.rc +++ b/programs/wordpad/Pl.rc @@ -17,6 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wordpad.h" + LANGUAGE LANG_POLISH, SUBLANG_DEFAULT IDM_MAINMENU MENU DISCARDABLE diff --git a/programs/wordpad/Pt.rc b/programs/wordpad/Pt.rc index b246c70..f8d7df2 100644 --- a/programs/wordpad/Pt.rc +++ b/programs/wordpad/Pt.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wordpad.h" + LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL IDM_MAINMENU MENU DISCARDABLE diff --git a/programs/wordpad/Ru.rc b/programs/wordpad/Ru.rc index e437199..6428f7b 100644 --- a/programs/wordpad/Ru.rc +++ b/programs/wordpad/Ru.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wordpad.h" + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT IDM_MAINMENU MENU DISCARDABLE diff --git a/programs/wordpad/Si.rc b/programs/wordpad/Si.rc index 5e34958..1b6d37f 100644 --- a/programs/wordpad/Si.rc +++ b/programs/wordpad/Si.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wordpad.h" + #pragma code_page(65001) LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT @@ -245,5 +247,3 @@ BEGIN STRING_PRINTING_NOT_IMPLEMENTED, "Tiskanje (še) ni na voljo" STRING_MAX_TAB_STOPS, "Ne morem vstaviti več kot 32 položajev tabulatorja." END - -#pragma code_page(default) diff --git a/programs/wordpad/Sv.rc b/programs/wordpad/Sv.rc index 4bb2ae2..d94e6e3 100644 --- a/programs/wordpad/Sv.rc +++ b/programs/wordpad/Sv.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wordpad.h" + LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL #pragma code_page(65001) @@ -244,5 +246,3 @@ BEGIN STRING_PRINTING_NOT_IMPLEMENTED, "Utskrift ej implementerat." STRING_MAX_TAB_STOPS, "Kan ej lägga till mer än 32 tabbstopp." END - -#pragma code_page(default) diff --git a/programs/wordpad/Tr.rc b/programs/wordpad/Tr.rc index 7df9a36..9229037 100644 --- a/programs/wordpad/Tr.rc +++ b/programs/wordpad/Tr.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wordpad.h" + LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT IDM_MAINMENU MENU DISCARDABLE diff --git a/programs/wordpad/Zh.rc b/programs/wordpad/Zh.rc index 5c11ab7..d8ceec4 100644 --- a/programs/wordpad/Zh.rc +++ b/programs/wordpad/Zh.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wordpad.h" + /* Chinese text is encoded in UTF-8 */ #pragma code_page(65001) @@ -469,5 +471,3 @@ BEGIN STRING_OPEN_FAILED, "不能開啟檔案." STRING_OPEN_ACCESS_DENIED, "你沒有開啟檔案的權力." END - -#pragma code_page(default) diff --git a/programs/wordpad/rsrc.rc b/programs/wordpad/rsrc.rc index 1400fa5..ac159da 100644 --- a/programs/wordpad/rsrc.rc +++ b/programs/wordpad/rsrc.rc @@ -17,9 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <windef.h> -#include <winuser.h> - #include "wordpad.h" MAINACCELTABLE ACCELERATORS @@ -63,21 +60,3 @@ IDI_WRI ICON "wri.ico" /* @makedep: txt.ico */ IDI_TXT ICON "txt.ico" - -#include "Da.rc" -#include "De.rc" -#include "En.rc" -#include "Fr.rc" -#include "Hu.rc" -#include "Ja.rc" -#include "Ko.rc" -#include "Lt.rc" -#include "Nl.rc" -#include "No.rc" -#include "Pl.rc" -#include "Pt.rc" -#include "Ru.rc" -#include "Si.rc" -#include "Sv.rc" -#include "Tr.rc" -#include "Zh.rc" diff --git a/programs/wordpad/wordpad.h b/programs/wordpad/wordpad.h index ece183f..6d3e64a 100644 --- a/programs/wordpad/wordpad.h +++ b/programs/wordpad/wordpad.h @@ -17,6 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <windef.h> +#include <winuser.h> + #define MAX_STRING_LEN 255 #define TWIPS_PER_INCH 1440

1 0

Michael Stefaniuc : cmdlgtst: Build language resource files separately.
by Alexandre Julliard July 2, 2009

July 2, 2009

Module: wine Branch: master Commit: 465cf35522ebf7f08433a419ffb7b05b8bd5382d URL: http://source.winehq.org/git/wine.git/?a=commit;h=465cf35522ebf7f08433a419f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 2 00:28:45 2009 +0200 cmdlgtst: Build language resource files separately. Do not include them from an other rc file. --- programs/cmdlgtst/Cs.rc | 2 ++ programs/cmdlgtst/Da.rc | 2 ++ programs/cmdlgtst/De.rc | 2 ++ programs/cmdlgtst/En.rc | 2 ++ programs/cmdlgtst/Es.rc | 2 ++ programs/cmdlgtst/Fr.rc | 2 ++ programs/cmdlgtst/It.rc | 2 ++ programs/cmdlgtst/Ja.rc | 4 ++-- programs/cmdlgtst/Ko.rc | 2 ++ programs/cmdlgtst/Lt.rc | 4 ++-- programs/cmdlgtst/Makefile.in | 21 ++++++++++++++++++++- programs/cmdlgtst/Nl.rc | 2 ++ programs/cmdlgtst/No.rc | 2 ++ programs/cmdlgtst/Pl.rc | 2 ++ programs/cmdlgtst/Pt.rc | 2 ++ programs/cmdlgtst/Ru.rc | 2 ++ programs/cmdlgtst/Si.rc | 4 ++-- programs/cmdlgtst/Sv.rc | 2 ++ programs/cmdlgtst/Tr.rc | 2 ++ programs/cmdlgtst/cmdlgr.rc | 25 ------------------------- programs/cmdlgtst/cmdlgtst.h | 4 ++++ 21 files changed, 60 insertions(+), 32 deletions(-) diff --git a/programs/cmdlgtst/Cs.rc b/programs/cmdlgtst/Cs.rc index d6bb383..6e8ed2f 100644 --- a/programs/cmdlgtst/Cs.rc +++ b/programs/cmdlgtst/Cs.rc @@ -21,6 +21,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "cmdlgtst.h" + LANGUAGE LANG_CZECH, SUBLANG_DEFAULT /* Czech strings in CP1250 */ diff --git a/programs/cmdlgtst/Da.rc b/programs/cmdlgtst/Da.rc index 99bd0fe..9d73888 100644 --- a/programs/cmdlgtst/Da.rc +++ b/programs/cmdlgtst/Da.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "cmdlgtst.h" + LANGUAGE LANG_DANISH, SUBLANG_DEFAULT CmdlgtstMenu MENU diff --git a/programs/cmdlgtst/De.rc b/programs/cmdlgtst/De.rc index f8e7d0e..e22f362 100644 --- a/programs/cmdlgtst/De.rc +++ b/programs/cmdlgtst/De.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "cmdlgtst.h" + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL CmdlgtstMenu MENU diff --git a/programs/cmdlgtst/En.rc b/programs/cmdlgtst/En.rc index 5d73c57..839a917 100644 --- a/programs/cmdlgtst/En.rc +++ b/programs/cmdlgtst/En.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "cmdlgtst.h" + LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT CmdlgtstMenu MENU diff --git a/programs/cmdlgtst/Es.rc b/programs/cmdlgtst/Es.rc index 04ef2bb..94d221c 100644 --- a/programs/cmdlgtst/Es.rc +++ b/programs/cmdlgtst/Es.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "cmdlgtst.h" + LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL CmdlgtstMenu MENU diff --git a/programs/cmdlgtst/Fr.rc b/programs/cmdlgtst/Fr.rc index 680d6a8..e782424 100644 --- a/programs/cmdlgtst/Fr.rc +++ b/programs/cmdlgtst/Fr.rc @@ -21,6 +21,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "cmdlgtst.h" + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL CmdlgtstMenu MENU diff --git a/programs/cmdlgtst/It.rc b/programs/cmdlgtst/It.rc index c5c860c..1bc2e46 100644 --- a/programs/cmdlgtst/It.rc +++ b/programs/cmdlgtst/It.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "cmdlgtst.h" + LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL /* diff --git a/programs/cmdlgtst/Ja.rc b/programs/cmdlgtst/Ja.rc index fb73bfa..92ccddb 100644 --- a/programs/cmdlgtst/Ja.rc +++ b/programs/cmdlgtst/Ja.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "cmdlgtst.h" + /* UTF-8 */ #pragma code_page(65001) @@ -296,5 +298,3 @@ BEGIN PUSHBUTTON "キャンセル", IDCANCEL, 126, 220, 50, 14 PUSHBUTTON "プリンタ(&R)...", psh3, 184, 220, 48, 14 END - -#pragma code_page(default) diff --git a/programs/cmdlgtst/Ko.rc b/programs/cmdlgtst/Ko.rc index 314ba9b..7d099f7 100644 --- a/programs/cmdlgtst/Ko.rc +++ b/programs/cmdlgtst/Ko.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "cmdlgtst.h" + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT CmdlgtstMenu MENU diff --git a/programs/cmdlgtst/Lt.rc b/programs/cmdlgtst/Lt.rc index 9c8ad58..a6d7e83 100644 --- a/programs/cmdlgtst/Lt.rc +++ b/programs/cmdlgtst/Lt.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "cmdlgtst.h" + /* UTF-8 */ #pragma code_page(65001) @@ -296,5 +298,3 @@ BEGIN PUSHBUTTON "Atsisakyti", IDCANCEL, 116, 220, 50, 14 PUSHBUTTON "S&pausdintuvas...", psh3, 171, 220, 61, 14 END - -#pragma code_page(default) diff --git a/programs/cmdlgtst/Makefile.in b/programs/cmdlgtst/Makefile.in index 15409a8..1c6fdce 100644 --- a/programs/cmdlgtst/Makefile.in +++ b/programs/cmdlgtst/Makefile.in @@ -9,7 +9,26 @@ IMPORTS = comdlg32 user32 gdi32 kernel32 C_SRCS = \ cmdlgtst.c -RC_SRCS = cmdlgr.rc +RC_SRCS = \ + Cs.rc \ + Da.rc \ + De.rc \ + En.rc \ + Es.rc \ + Fr.rc \ + It.rc \ + Ja.rc \ + Ko.rc \ + Lt.rc \ + Nl.rc \ + No.rc \ + Pl.rc \ + Pt.rc \ + Ru.rc \ + Si.rc \ + Sv.rc \ + Tr.rc \ + cmdlgr.rc @MAKE_PROG_RULES@ diff --git a/programs/cmdlgtst/Nl.rc b/programs/cmdlgtst/Nl.rc index 0b9d135..245794d 100644 --- a/programs/cmdlgtst/Nl.rc +++ b/programs/cmdlgtst/Nl.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "cmdlgtst.h" + LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL CmdlgtstMenu MENU diff --git a/programs/cmdlgtst/No.rc b/programs/cmdlgtst/No.rc index 7d96a2d..d1e7b3b 100644 --- a/programs/cmdlgtst/No.rc +++ b/programs/cmdlgtst/No.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "cmdlgtst.h" + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL CmdlgtstMenu MENU diff --git a/programs/cmdlgtst/Pl.rc b/programs/cmdlgtst/Pl.rc index 3123c2c..090e1f4 100644 --- a/programs/cmdlgtst/Pl.rc +++ b/programs/cmdlgtst/Pl.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "cmdlgtst.h" + LANGUAGE LANG_POLISH, SUBLANG_DEFAULT CmdlgtstMenu MENU diff --git a/programs/cmdlgtst/Pt.rc b/programs/cmdlgtst/Pt.rc index 38e783e..4bb06f4 100644 --- a/programs/cmdlgtst/Pt.rc +++ b/programs/cmdlgtst/Pt.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "cmdlgtst.h" + LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN CmdlgtstMenu MENU diff --git a/programs/cmdlgtst/Ru.rc b/programs/cmdlgtst/Ru.rc index a438b24..e3d7c2b 100644 --- a/programs/cmdlgtst/Ru.rc +++ b/programs/cmdlgtst/Ru.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "cmdlgtst.h" + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT CmdlgtstMenu MENU diff --git a/programs/cmdlgtst/Si.rc b/programs/cmdlgtst/Si.rc index e080da3..f7c02f3 100644 --- a/programs/cmdlgtst/Si.rc +++ b/programs/cmdlgtst/Si.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "cmdlgtst.h" + #pragma code_page(65001) LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT @@ -295,5 +297,3 @@ BEGIN PUSHBUTTON "Prekliči", IDCANCEL, 126, 220, 50, 14 PUSHBUTTON "&Tiskalnik ...", psh3, 184, 220, 48, 14 END - -#pragma code_page(default) diff --git a/programs/cmdlgtst/Sv.rc b/programs/cmdlgtst/Sv.rc index 3ec66f2..c5c42dd 100644 --- a/programs/cmdlgtst/Sv.rc +++ b/programs/cmdlgtst/Sv.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "cmdlgtst.h" + LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL CmdlgtstMenu MENU diff --git a/programs/cmdlgtst/Tr.rc b/programs/cmdlgtst/Tr.rc index 94b6d50..c892470 100644 --- a/programs/cmdlgtst/Tr.rc +++ b/programs/cmdlgtst/Tr.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "cmdlgtst.h" + /* FIXME: to be completed */ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT diff --git a/programs/cmdlgtst/cmdlgr.rc b/programs/cmdlgtst/cmdlgr.rc index 3f9eecc..bbeabf7 100644 --- a/programs/cmdlgtst/cmdlgr.rc +++ b/programs/cmdlgtst/cmdlgr.rc @@ -18,32 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <windef.h> -#include <winuser.h> -#include <dlgs.h> - #include "cmdlgtst.h" -#include "Cs.rc" -#include "Da.rc" -#include "De.rc" -#include "En.rc" -#include "Es.rc" -#include "Fr.rc" -#include "It.rc" -#include "Ja.rc" -#include "Ko.rc" -#include "Lt.rc" -#include "Nl.rc" -#include "No.rc" -#include "Pl.rc" -#include "Pt.rc" -#include "Ru.rc" -#include "Si.rc" -#include "Sv.rc" -#include "Tr.rc" - -LANGUAGE LANG_NEUTRAL,SUBLANG_NEUTRAL - /* @makedep: about.ico */ AboutIcon ICON about.ico diff --git a/programs/cmdlgtst/cmdlgtst.h b/programs/cmdlgtst/cmdlgtst.h index b096eb9..58b2992 100644 --- a/programs/cmdlgtst/cmdlgtst.h +++ b/programs/cmdlgtst/cmdlgtst.h @@ -16,6 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <windef.h> +#include <winuser.h> +#include <dlgs.h> + #define CM_U_COLOR 105 #define CM_U_SAVE 104 #define CM_U_OPEN 107

1 0

Michael Stefaniuc : start: Build language resource files separately.
by Alexandre Julliard July 2, 2009

July 2, 2009

Module: wine Branch: master Commit: 3b3e1a1ed010c16d766ca3e0cd56decf50d3151c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b3e1a1ed010c16d766ca3e0c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 2 00:30:14 2009 +0200 start: Build language resource files separately. Do not include them from an other rc file. --- programs/start/Cs.rc | 2 ++ programs/start/De.rc | 2 ++ programs/start/En.rc | 2 ++ programs/start/Es.rc | 2 ++ programs/start/Fr.rc | 4 ++-- programs/start/It.rc | 2 ++ programs/start/Ko.rc | 2 ++ programs/start/Lt.rc | 4 ++-- programs/start/Makefile.in | 17 ++++++++++++++++- programs/start/Nl.rc | 2 ++ programs/start/No.rc | 2 ++ programs/start/Pl.rc | 2 ++ programs/start/Pt.rc | 2 ++ programs/start/Ru.rc | 2 ++ programs/start/Si.rc | 4 ++-- programs/start/Tr.rc | 2 ++ programs/start/resources.h | 2 ++ programs/start/rsrc.rc | 39 --------------------------------------- 18 files changed, 48 insertions(+), 46 deletions(-) diff --git a/programs/start/Cs.rc b/programs/start/Cs.rc index 1693f8b..fa00dd0 100644 --- a/programs/start/Cs.rc +++ b/programs/start/Cs.rc @@ -21,6 +21,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resources.h" + LANGUAGE LANG_CZECH, SUBLANG_DEFAULT /* Czech strings in CP1250 */ diff --git a/programs/start/De.rc b/programs/start/De.rc index 4f54a53..ac0cdf5 100644 --- a/programs/start/De.rc +++ b/programs/start/De.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resources.h" + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL diff --git a/programs/start/En.rc b/programs/start/En.rc index 0429fe9..463b6c2 100644 --- a/programs/start/En.rc +++ b/programs/start/En.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resources.h" + LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT diff --git a/programs/start/Es.rc b/programs/start/Es.rc index ac1c6d7..83881c6 100644 --- a/programs/start/Es.rc +++ b/programs/start/Es.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resources.h" + LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE diff --git a/programs/start/Fr.rc b/programs/start/Fr.rc index a2c8fd7..343398e 100644 --- a/programs/start/Fr.rc +++ b/programs/start/Fr.rc @@ -21,6 +21,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resources.h" + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL #pragma code_page(65001) /* UTF-8 */ @@ -69,5 +71,3 @@ STRING_EXECFAIL "Le programme n'a pas pu être lancé, ou il n'y a pas de progra STRING_UNIXFAIL, "Le nom de fichier Unix spécifié n'a pas pu être converti en nom de fichier DOS." } - -#pragma code_page(default) /* Return to default encoding */ diff --git a/programs/start/It.rc b/programs/start/It.rc index 42f59ac..2ba5417 100644 --- a/programs/start/It.rc +++ b/programs/start/It.rc @@ -21,6 +21,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resources.h" + LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE diff --git a/programs/start/Ko.rc b/programs/start/Ko.rc index 871aadc..4435d57 100644 --- a/programs/start/Ko.rc +++ b/programs/start/Ko.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resources.h" + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE diff --git a/programs/start/Lt.rc b/programs/start/Lt.rc index 1717a84..8f0e52b 100644 --- a/programs/start/Lt.rc +++ b/programs/start/Lt.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resources.h" + /* UTF-8 */ #pragma code_page(65001) @@ -69,5 +71,3 @@ STRING_EXECFAIL, "Nepavyko paleisti programos arba nėra programos susietos su n STRING_UNIXFAIL "Nepavyko paversti nurodyto Unix failo pavadinimo į DOS failo pavadinimą." } - -#pragma code_page(default) diff --git a/programs/start/Makefile.in b/programs/start/Makefile.in index 976766f..a96fbce 100644 --- a/programs/start/Makefile.in +++ b/programs/start/Makefile.in @@ -9,7 +9,22 @@ IMPORTS = shell32 user32 kernel32 C_SRCS = start.c -RC_SRCS = rsrc.rc +RC_SRCS = \ + Cs.rc \ + De.rc \ + En.rc \ + Es.rc \ + Fr.rc \ + It.rc \ + Ko.rc \ + Lt.rc \ + Nl.rc \ + No.rc \ + Pl.rc \ + Pt.rc \ + Ru.rc \ + Si.rc \ + Tr.rc @MAKE_PROG_RULES@ diff --git a/programs/start/Nl.rc b/programs/start/Nl.rc index 69012a1..50252fa 100644 --- a/programs/start/Nl.rc +++ b/programs/start/Nl.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resources.h" + LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL diff --git a/programs/start/No.rc b/programs/start/No.rc index 15b4dbc..5d2da44 100644 --- a/programs/start/No.rc +++ b/programs/start/No.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resources.h" + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL STRINGTABLE DISCARDABLE LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL diff --git a/programs/start/Pl.rc b/programs/start/Pl.rc index 09b9f51..d2df6ea 100644 --- a/programs/start/Pl.rc +++ b/programs/start/Pl.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resources.h" + LANGUAGE LANG_POLISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE diff --git a/programs/start/Pt.rc b/programs/start/Pt.rc index 51ff53b..2305509 100644 --- a/programs/start/Pt.rc +++ b/programs/start/Pt.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resources.h" + LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN STRINGTABLE DISCARDABLE diff --git a/programs/start/Ru.rc b/programs/start/Ru.rc index 97e9854..f30af43 100644 --- a/programs/start/Ru.rc +++ b/programs/start/Ru.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resources.h" + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT diff --git a/programs/start/Si.rc b/programs/start/Si.rc index e10ddf7..0ed1ff9 100644 --- a/programs/start/Si.rc +++ b/programs/start/Si.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resources.h" + #pragma code_page(65001) LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT @@ -66,5 +68,3 @@ STRING_EXECFAIL "Programa ni mogoče zagnati ali pa z datoteko te vrste ni povez STRING_UNIXFAIL "Navedenega Unix imena datoteke ni mogoče prevesti v DOS ime datoteke." } - -#pragma code_page(default) diff --git a/programs/start/Tr.rc b/programs/start/Tr.rc index de7a69d..fefc94b 100644 --- a/programs/start/Tr.rc +++ b/programs/start/Tr.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resources.h" + LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT diff --git a/programs/start/resources.h b/programs/start/resources.h index f5abd31..fd8641d 100644 --- a/programs/start/resources.h +++ b/programs/start/resources.h @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <windef.h> + #define STRING_USAGE 101 #define STRING_LICENSE 102 #define STRING_EXECFAIL 103 diff --git a/programs/start/rsrc.rc b/programs/start/rsrc.rc deleted file mode 100644 index abfee94..0000000 --- a/programs/start/rsrc.rc +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright 2003 Dan Kegel - * - * 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 - */ - -#include <windef.h> - -#include "resources.h" - -LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL - -#include "Cs.rc" -#include "De.rc" -#include "En.rc" -#include "Es.rc" -#include "Fr.rc" -#include "It.rc" -#include "Ko.rc" -#include "Lt.rc" -#include "Nl.rc" -#include "No.rc" -#include "Pl.rc" -#include "Pt.rc" -#include "Ru.rc" -#include "Si.rc" -#include "Tr.rc"

1 0

Michael Stefaniuc : taskmgr: Build language resource files separately.
by Alexandre Julliard July 2, 2009

July 2, 2009

Module: wine Branch: master Commit: c02f249888f4eb3743d416302ac5fdac00ba02cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=c02f249888f4eb3743d416302… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 2 00:30:20 2009 +0200 taskmgr: Build language resource files separately. Do not include them from an other rc file. --- programs/taskmgr/Da.rc | 2 ++ programs/taskmgr/De.rc | 2 ++ programs/taskmgr/En.rc | 2 ++ programs/taskmgr/Fr.rc | 2 ++ programs/taskmgr/Ja.rc | 4 ++-- programs/taskmgr/Ko.rc | 2 ++ programs/taskmgr/Lt.rc | 4 ++-- programs/taskmgr/Makefile.in | 19 ++++++++++++++++++- programs/taskmgr/Nl.rc | 2 ++ programs/taskmgr/No.rc | 2 ++ programs/taskmgr/Pl.rc | 2 ++ programs/taskmgr/Pt.rc | 2 ++ programs/taskmgr/Ru.rc | 2 ++ programs/taskmgr/Si.rc | 4 ++-- programs/taskmgr/Sv.rc | 2 ++ programs/taskmgr/Tr.rc | 2 ++ programs/taskmgr/Zh.rc | 4 ++-- programs/taskmgr/resource.h | 5 +++++ programs/taskmgr/taskmgr.rc | 23 ----------------------- 19 files changed, 55 insertions(+), 32 deletions(-) diff --git a/programs/taskmgr/Da.rc b/programs/taskmgr/Da.rc index fb9bab0..fa59e93 100644 --- a/programs/taskmgr/Da.rc +++ b/programs/taskmgr/Da.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_DANISH, SUBLANG_DEFAULT /* diff --git a/programs/taskmgr/De.rc b/programs/taskmgr/De.rc index 8b96bc2..e1d3b19 100644 --- a/programs/taskmgr/De.rc +++ b/programs/taskmgr/De.rc @@ -21,6 +21,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL /* diff --git a/programs/taskmgr/En.rc b/programs/taskmgr/En.rc index ce2bdf5..45aa925 100644 --- a/programs/taskmgr/En.rc +++ b/programs/taskmgr/En.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT /* diff --git a/programs/taskmgr/Fr.rc b/programs/taskmgr/Fr.rc index 617a2bc..0c435cb 100644 --- a/programs/taskmgr/Fr.rc +++ b/programs/taskmgr/Fr.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL /* diff --git a/programs/taskmgr/Ja.rc b/programs/taskmgr/Ja.rc index e45d577..43334f2 100644 --- a/programs/taskmgr/Ja.rc +++ b/programs/taskmgr/Ja.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + /* UTF-8 */ #pragma code_page(65001) @@ -488,5 +490,3 @@ BEGIN "プロセスの優先クラスを通常以下に設定します。" ID_PROCESS_PAGE_SETPRIORITY_LOW "プロセスの優先クラスを低に設定します。" END - -#pragma code_page(default) diff --git a/programs/taskmgr/Ko.rc b/programs/taskmgr/Ko.rc index 390371b..45e0911 100644 --- a/programs/taskmgr/Ko.rc +++ b/programs/taskmgr/Ko.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT /* diff --git a/programs/taskmgr/Lt.rc b/programs/taskmgr/Lt.rc index c58647a..17cde26 100644 --- a/programs/taskmgr/Lt.rc +++ b/programs/taskmgr/Lt.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + /* UTF-8 */ #pragma code_page(65001) @@ -560,5 +562,3 @@ BEGIN IDS_DEBUG_CHANNEL_WARN "Warn (įspėjimas)" IDS_DEBUG_CHANNEL_TRACE "Trace (pėdsakas)" END - -#pragma code_page(default) diff --git a/programs/taskmgr/Makefile.in b/programs/taskmgr/Makefile.in index 153a598..2f2b40a 100644 --- a/programs/taskmgr/Makefile.in +++ b/programs/taskmgr/Makefile.in @@ -29,7 +29,24 @@ C_SRCS = \ taskmgr.c \ trayicon.c -RC_SRCS = taskmgr.rc +RC_SRCS = \ + Da.rc \ + De.rc \ + En.rc \ + Fr.rc \ + Ja.rc \ + Ko.rc \ + Lt.rc \ + Nl.rc \ + No.rc \ + Pl.rc \ + Pt.rc \ + Ru.rc \ + Si.rc \ + Sv.rc \ + Tr.rc \ + Zh.rc \ + taskmgr.rc @MAKE_PROG_RULES@ diff --git a/programs/taskmgr/Nl.rc b/programs/taskmgr/Nl.rc index 5d1860b..468769f 100644 --- a/programs/taskmgr/Nl.rc +++ b/programs/taskmgr/Nl.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL /* diff --git a/programs/taskmgr/No.rc b/programs/taskmgr/No.rc index f25eadc..19b6472 100644 --- a/programs/taskmgr/No.rc +++ b/programs/taskmgr/No.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL /* diff --git a/programs/taskmgr/Pl.rc b/programs/taskmgr/Pl.rc index 1453709..9a38b49 100644 --- a/programs/taskmgr/Pl.rc +++ b/programs/taskmgr/Pl.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_POLISH, SUBLANG_DEFAULT /* diff --git a/programs/taskmgr/Pt.rc b/programs/taskmgr/Pt.rc index 42ece36..a7926e5 100644 --- a/programs/taskmgr/Pt.rc +++ b/programs/taskmgr/Pt.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL /* diff --git a/programs/taskmgr/Ru.rc b/programs/taskmgr/Ru.rc index e9d657b..d709513 100644 --- a/programs/taskmgr/Ru.rc +++ b/programs/taskmgr/Ru.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT /* diff --git a/programs/taskmgr/Si.rc b/programs/taskmgr/Si.rc index 670189b..4cfe73f 100644 --- a/programs/taskmgr/Si.rc +++ b/programs/taskmgr/Si.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + #pragma code_page(65001) LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT @@ -486,5 +488,3 @@ BEGIN "Dodeli proces v PODPOVPREČNI prioritetni razred" ID_PROCESS_PAGE_SETPRIORITY_LOW "Dodeli proces v NIZEK prioritetni razred" END - -#pragma code_page(default) diff --git a/programs/taskmgr/Sv.rc b/programs/taskmgr/Sv.rc index 4e17787..a77eb61 100644 --- a/programs/taskmgr/Sv.rc +++ b/programs/taskmgr/Sv.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL /* diff --git a/programs/taskmgr/Tr.rc b/programs/taskmgr/Tr.rc index ac22a61..1149bb3 100644 --- a/programs/taskmgr/Tr.rc +++ b/programs/taskmgr/Tr.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT /* diff --git a/programs/taskmgr/Zh.rc b/programs/taskmgr/Zh.rc index cd7c061..969a404 100644 --- a/programs/taskmgr/Zh.rc +++ b/programs/taskmgr/Zh.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + /* Chinese text is encoded in UTF-8 */ #pragma code_page(65001) @@ -931,5 +933,3 @@ BEGIN ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "將進程設為中等以下優先級" ID_PROCESS_PAGE_SETPRIORITY_LOW "將進程設為低優先級" END - -#pragma code_page(default) diff --git a/programs/taskmgr/resource.h b/programs/taskmgr/resource.h index 1b98ab0..b735ef4 100644 --- a/programs/taskmgr/resource.h +++ b/programs/taskmgr/resource.h @@ -4,6 +4,11 @@ * Used by taskmgr.rc * */ + +#include <windef.h> +#include <winuser.h> +#include <commctrl.h> + #define IDS_APP_TITLE 103 #define IDC_TASKMGR 109 #define IDS_RUNDLG_CAPTION 110 diff --git a/programs/taskmgr/taskmgr.rc b/programs/taskmgr/taskmgr.rc index d027a1e..ad295f2 100644 --- a/programs/taskmgr/taskmgr.rc +++ b/programs/taskmgr/taskmgr.rc @@ -19,31 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <windef.h> -#include <winuser.h> -#include <commctrl.h> - #include "resource.h" -/* Language resources */ - -#include "Da.rc" -#include "De.rc" -#include "En.rc" -#include "Fr.rc" -#include "Ja.rc" -#include "Ko.rc" -#include "Lt.rc" -#include "Nl.rc" -#include "No.rc" -#include "Pl.rc" -#include "Pt.rc" -#include "Ru.rc" -#include "Si.rc" -#include "Sv.rc" -#include "Tr.rc" -#include "Zh.rc" - LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL /*

1 0

Michael Stefaniuc : localspl: Build language resource files separately.
by Alexandre Julliard July 2, 2009

July 2, 2009

Module: wine Branch: master Commit: c3067a74d55dc14925e16e6b1c818846c590caa2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3067a74d55dc14925e16e6b1… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 2 00:33:39 2009 +0200 localspl: Build language resource files separately. Do not include them from an other rc file. --- dlls/localspl/Makefile.in | 18 +++++++++++++++++- dlls/localspl/localspl.rc | 19 ------------------- dlls/localspl/localspl_private.h | 1 + dlls/localspl/spl_Da.rc | 4 +++- dlls/localspl/spl_De.rc | 2 ++ dlls/localspl/spl_En.rc | 2 ++ dlls/localspl/spl_Fr.rc | 2 ++ dlls/localspl/spl_Ko.rc | 2 ++ dlls/localspl/spl_Lt.rc | 4 ++-- dlls/localspl/spl_Nl.rc | 2 ++ dlls/localspl/spl_No.rc | 2 ++ dlls/localspl/spl_Pl.rc | 2 ++ dlls/localspl/spl_Pt.rc | 2 ++ dlls/localspl/spl_Ro.rc | 2 ++ dlls/localspl/spl_Ru.rc | 2 ++ dlls/localspl/spl_Si.rc | 4 ++-- dlls/localspl/spl_Sv.rc | 2 ++ dlls/localspl/spl_Zh.rc | 4 ++-- 18 files changed, 49 insertions(+), 27 deletions(-) diff --git a/dlls/localspl/Makefile.in b/dlls/localspl/Makefile.in index 4850363..9fa087d 100644 --- a/dlls/localspl/Makefile.in +++ b/dlls/localspl/Makefile.in @@ -10,7 +10,23 @@ C_SRCS = \ localspl_main.c \ provider.c -RC_SRCS = localspl.rc +RC_SRCS = \ + localspl.rc \ + spl_Da.rc \ + spl_De.rc \ + spl_En.rc \ + spl_Fr.rc \ + spl_Ko.rc \ + spl_Lt.rc \ + spl_Nl.rc \ + spl_No.rc \ + spl_Pl.rc \ + spl_Pt.rc \ + spl_Ro.rc \ + spl_Ru.rc \ + spl_Si.rc \ + spl_Sv.rc \ + spl_Zh.rc @MAKE_DLL_RULES@ diff --git a/dlls/localspl/localspl.rc b/dlls/localspl/localspl.rc index 8d0563f..9757afd 100644 --- a/dlls/localspl/localspl.rc +++ b/dlls/localspl/localspl.rc @@ -19,9 +19,6 @@ * */ -#include "windef.h" -#include "winbase.h" -#include "winver.h" #include "localspl_private.h" #define WINE_FILENAME_STR "localspl.dll" @@ -35,19 +32,3 @@ #define WINE_PRODUCTVERSION_STR "5.1.2600.2180" #include "wine/wine_common_ver.rc" - -#include "spl_En.rc" -#include "spl_Da.rc" -#include "spl_De.rc" -#include "spl_Fr.rc" -#include "spl_Ko.rc" -#include "spl_Lt.rc" -#include "spl_Nl.rc" -#include "spl_No.rc" -#include "spl_Pl.rc" -#include "spl_Pt.rc" -#include "spl_Ro.rc" -#include "spl_Ru.rc" -#include "spl_Si.rc" -#include "spl_Sv.rc" -#include "spl_Zh.rc" diff --git a/dlls/localspl/localspl_private.h b/dlls/localspl/localspl_private.h index 5174a1a..952c1f6 100644 --- a/dlls/localspl/localspl_private.h +++ b/dlls/localspl/localspl_private.h @@ -21,6 +21,7 @@ #ifndef __WINE_LOCALSPL_PRIVATE__ #define __WINE_LOCALSPL_PRIVATE__ +#include <windef.h> /* ## DLL-wide Globals ## */ extern HINSTANCE LOCALSPL_hInstance; diff --git a/dlls/localspl/spl_Da.rc b/dlls/localspl/spl_Da.rc index a149cab..cf1f318 100644 --- a/dlls/localspl/spl_Da.rc +++ b/dlls/localspl/spl_Da.rc @@ -18,7 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - LANGUAGE LANG_DANISH, SUBLANG_DEFAULT +#include "localspl_private.h" + +LANGUAGE LANG_DANISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE { diff --git a/dlls/localspl/spl_De.rc b/dlls/localspl/spl_De.rc index 4c95e2b..4e6616e 100644 --- a/dlls/localspl/spl_De.rc +++ b/dlls/localspl/spl_De.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "localspl_private.h" + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE diff --git a/dlls/localspl/spl_En.rc b/dlls/localspl/spl_En.rc index c9d12f4..d189c26 100644 --- a/dlls/localspl/spl_En.rc +++ b/dlls/localspl/spl_En.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "localspl_private.h" + LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE diff --git a/dlls/localspl/spl_Fr.rc b/dlls/localspl/spl_Fr.rc index 9526972..0e93dc8 100644 --- a/dlls/localspl/spl_Fr.rc +++ b/dlls/localspl/spl_Fr.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "localspl_private.h" + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE diff --git a/dlls/localspl/spl_Ko.rc b/dlls/localspl/spl_Ko.rc index fe2d572..86db867 100644 --- a/dlls/localspl/spl_Ko.rc +++ b/dlls/localspl/spl_Ko.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "localspl_private.h" + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE diff --git a/dlls/localspl/spl_Lt.rc b/dlls/localspl/spl_Lt.rc index 321ab06..4c72767 100644 --- a/dlls/localspl/spl_Lt.rc +++ b/dlls/localspl/spl_Lt.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "localspl_private.h" + /* UTF-8 */ #pragma code_page(65001) @@ -28,5 +30,3 @@ STRINGTABLE DISCARDABLE IDS_LOCALPORT "Vietinis prievadas" IDS_LOCALMONITOR "Vietinis monitorius" } - -#pragma code_page(default) diff --git a/dlls/localspl/spl_Nl.rc b/dlls/localspl/spl_Nl.rc index b9d4c5c..bd02446 100644 --- a/dlls/localspl/spl_Nl.rc +++ b/dlls/localspl/spl_Nl.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "localspl_private.h" + LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE diff --git a/dlls/localspl/spl_No.rc b/dlls/localspl/spl_No.rc index 5efa563..b81a7b7 100644 --- a/dlls/localspl/spl_No.rc +++ b/dlls/localspl/spl_No.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "localspl_private.h" + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL STRINGTABLE DISCARDABLE diff --git a/dlls/localspl/spl_Pl.rc b/dlls/localspl/spl_Pl.rc index a080208..cdbb422 100644 --- a/dlls/localspl/spl_Pl.rc +++ b/dlls/localspl/spl_Pl.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "localspl_private.h" + LANGUAGE LANG_POLISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE diff --git a/dlls/localspl/spl_Pt.rc b/dlls/localspl/spl_Pt.rc index 8ec66c5..79506c3 100644 --- a/dlls/localspl/spl_Pt.rc +++ b/dlls/localspl/spl_Pt.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "localspl_private.h" + LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE diff --git a/dlls/localspl/spl_Ro.rc b/dlls/localspl/spl_Ro.rc index 4432195..499d75b 100644 --- a/dlls/localspl/spl_Ro.rc +++ b/dlls/localspl/spl_Ro.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "localspl_private.h" + LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE diff --git a/dlls/localspl/spl_Ru.rc b/dlls/localspl/spl_Ru.rc index 1ee1e2f..fb51446 100644 --- a/dlls/localspl/spl_Ru.rc +++ b/dlls/localspl/spl_Ru.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "localspl_private.h" + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE diff --git a/dlls/localspl/spl_Si.rc b/dlls/localspl/spl_Si.rc index 66ca2c4..11928ab 100644 --- a/dlls/localspl/spl_Si.rc +++ b/dlls/localspl/spl_Si.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "localspl_private.h" + #pragma code_page(65001) LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT @@ -27,5 +29,3 @@ STRINGTABLE DISCARDABLE IDS_LOCALPORT "Lokalna vrata" IDS_LOCALMONITOR "Lokalen monitor" } - -#pragma code_page(default) diff --git a/dlls/localspl/spl_Sv.rc b/dlls/localspl/spl_Sv.rc index fca0d6b..2831da6 100644 --- a/dlls/localspl/spl_Sv.rc +++ b/dlls/localspl/spl_Sv.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "localspl_private.h" + LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE diff --git a/dlls/localspl/spl_Zh.rc b/dlls/localspl/spl_Zh.rc index c5db382..108cb50 100644 --- a/dlls/localspl/spl_Zh.rc +++ b/dlls/localspl/spl_Zh.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "localspl_private.h" + /* Chinese text is encoded in UTF-8 */ #pragma code_page(65001) @@ -36,5 +38,3 @@ STRINGTABLE DISCARDABLE IDS_LOCALPORT "本地端口" IDS_LOCALMONITOR "本地監視器" } - -#pragma code_page(default)

1 0

Michael Stefaniuc : reg: Build language resource files separately.
by Alexandre Julliard July 2, 2009

July 2, 2009

Module: wine Branch: master Commit: dd2d38355b74928dc320cecb8baacec661ae467c URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd2d38355b74928dc320cecb8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 2 00:29:26 2009 +0200 reg: Build language resource files separately. Do not include them from an other rc file. --- programs/reg/Da.rc | 2 ++ programs/reg/De.rc | 4 ++-- programs/reg/En.rc | 2 ++ programs/reg/Fr.rc | 2 ++ programs/reg/Ja.rc | 4 ++-- programs/reg/Ko.rc | 2 ++ programs/reg/Lt.rc | 4 ++-- programs/reg/Makefile.in | 15 ++++++++++++++- programs/reg/Nl.rc | 2 ++ programs/reg/No.rc | 2 ++ programs/reg/Pl.rc | 2 ++ programs/reg/Pt.rc | 2 ++ programs/reg/Ru.rc | 2 ++ programs/reg/Si.rc | 4 ++-- programs/reg/reg.h | 2 ++ programs/reg/rsrc.rc | 37 ------------------------------------- 16 files changed, 42 insertions(+), 46 deletions(-) diff --git a/programs/reg/Da.rc b/programs/reg/Da.rc index c385d0a..353b94d 100644 --- a/programs/reg/Da.rc +++ b/programs/reg/Da.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "reg.h" + LANGUAGE LANG_DANISH, SUBLANG_DEFAULT STRINGTABLE diff --git a/programs/reg/De.rc b/programs/reg/De.rc index 9768c60..0940640 100644 --- a/programs/reg/De.rc +++ b/programs/reg/De.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "reg.h" + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL #pragma code_page(65001) @@ -36,5 +38,3 @@ STRINGTABLE STRING_NO_REMOTE, "Fehler: Konnte Schlüssel nicht zum remote Rechner hinzufügen\n" STRING_CANNOT_FIND, "Fehler: Der angegebene Schlüssel oder Wert konnte nicht gefunden werden\n" } - -#pragma code_page(default) diff --git a/programs/reg/En.rc b/programs/reg/En.rc index e713416..10cfa2b 100644 --- a/programs/reg/En.rc +++ b/programs/reg/En.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "reg.h" + LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE diff --git a/programs/reg/Fr.rc b/programs/reg/Fr.rc index 671ebf6..cb5de82 100644 --- a/programs/reg/Fr.rc +++ b/programs/reg/Fr.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "reg.h" + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE diff --git a/programs/reg/Ja.rc b/programs/reg/Ja.rc index 9163132..a2c1434 100644 --- a/programs/reg/Ja.rc +++ b/programs/reg/Ja.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "reg.h" + /* UTF-8 */ #pragma code_page(65001) @@ -31,5 +33,3 @@ STRINGTABLE STRING_DELETE_USAGE, "REG DELETE キー名 [/v 値名 | /ve | /va] [/f]\n" STRING_QUERY_USAGE, "REG QUERY キー名 [/v 値名 | /ve] [/s]\n" } - -#pragma code_page(default) diff --git a/programs/reg/Ko.rc b/programs/reg/Ko.rc index e9ebbee..46efd91 100644 --- a/programs/reg/Ko.rc +++ b/programs/reg/Ko.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "reg.h" + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT STRINGTABLE diff --git a/programs/reg/Lt.rc b/programs/reg/Lt.rc index d0e0fe3..98aea18 100644 --- a/programs/reg/Lt.rc +++ b/programs/reg/Lt.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "reg.h" + /* UTF-8 */ #pragma code_page(65001) @@ -36,5 +38,3 @@ STRINGTABLE STRING_NO_REMOTE, "Klaida: Negalima pridėti raktų nuotoliniame kompiuteryje\n" STRING_CANNOT_FIND, "Klaida: Sistemai nepavyko rasti nurodyto registro rakto ar reikšmės\n" } - -#pragma code_page(default) diff --git a/programs/reg/Makefile.in b/programs/reg/Makefile.in index 6fb05f1..de4d2c8 100644 --- a/programs/reg/Makefile.in +++ b/programs/reg/Makefile.in @@ -10,7 +10,20 @@ DELAYIMPORTS = user32 C_SRCS = reg.c -RC_SRCS = rsrc.rc +RC_SRCS = \ + Da.rc \ + De.rc \ + En.rc \ + Fr.rc \ + Ja.rc \ + Ko.rc \ + Lt.rc \ + Nl.rc \ + No.rc \ + Pl.rc \ + Pt.rc \ + Ru.rc \ + Si.rc @MAKE_PROG_RULES@ diff --git a/programs/reg/Nl.rc b/programs/reg/Nl.rc index c6a89f1..c34e395 100644 --- a/programs/reg/Nl.rc +++ b/programs/reg/Nl.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "reg.h" + LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL STRINGTABLE diff --git a/programs/reg/No.rc b/programs/reg/No.rc index 5b9a33d..5ad032d 100644 --- a/programs/reg/No.rc +++ b/programs/reg/No.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "reg.h" + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL STRINGTABLE diff --git a/programs/reg/Pl.rc b/programs/reg/Pl.rc index 51ae0e1..01c4244 100644 --- a/programs/reg/Pl.rc +++ b/programs/reg/Pl.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "reg.h" + LANGUAGE LANG_POLISH, SUBLANG_DEFAULT STRINGTABLE diff --git a/programs/reg/Pt.rc b/programs/reg/Pt.rc index 2918883..6294408 100644 --- a/programs/reg/Pt.rc +++ b/programs/reg/Pt.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "reg.h" + LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL STRINGTABLE diff --git a/programs/reg/Ru.rc b/programs/reg/Ru.rc index 0d895a3..8e07c4c 100644 --- a/programs/reg/Ru.rc +++ b/programs/reg/Ru.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "reg.h" + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE diff --git a/programs/reg/Si.rc b/programs/reg/Si.rc index 84a339a..6f3e01c 100644 --- a/programs/reg/Si.rc +++ b/programs/reg/Si.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "reg.h" + #pragma code_page(65001) LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT @@ -35,5 +37,3 @@ STRINGTABLE STRING_NO_REMOTE, "Napaka: Na morem dodati ključa na oddaljen računalnik\n" STRING_CANNOT_FIND, "Napaka: Sistem ni našel zahtevanega ključa ali vrednosti\n" } - -#pragma code_page(default) diff --git a/programs/reg/reg.h b/programs/reg/reg.h index 6d4ae47..2221647 100644 --- a/programs/reg/reg.h +++ b/programs/reg/reg.h @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <windef.h> + /* Translation IDs. */ #define STRING_USAGE 101 #define STRING_ADD_USAGE 102 diff --git a/programs/reg/rsrc.rc b/programs/reg/rsrc.rc deleted file mode 100644 index aa70a4b..0000000 --- a/programs/reg/rsrc.rc +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright 2008 Andrew Riedi - * - * 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 - */ - -#include <windef.h> - -#include "reg.h" - -LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL - -#include "Da.rc" -#include "De.rc" -#include "En.rc" -#include "Fr.rc" -#include "Ja.rc" -#include "Ko.rc" -#include "Lt.rc" -#include "Nl.rc" -#include "No.rc" -#include "Pl.rc" -#include "Pt.rc" -#include "Ru.rc" -#include "Si.rc"

1 0

Michael Stefaniuc : shdoclc: Build language resource files separately.
by Alexandre Julliard July 2, 2009

July 2, 2009

Module: wine Branch: master Commit: 8919ba34987ae121c35aeb39e81ae7bfb738424d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8919ba34987ae121c35aeb39e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 2 00:28:07 2009 +0200 shdoclc: Build language resource files separately. Do not include them from an other rc file. --- dlls/shdoclc/Bg.rc | 1 + dlls/shdoclc/Da.rc | 1 + dlls/shdoclc/De.rc | 1 + dlls/shdoclc/En.rc | 1 + dlls/shdoclc/Es.rc | 1 + dlls/shdoclc/Fi.rc | 1 + dlls/shdoclc/Fr.rc | 1 + dlls/shdoclc/Hu.rc | 1 + dlls/shdoclc/Ko.rc | 1 + dlls/shdoclc/Lt.rc | 4 ++-- dlls/shdoclc/Makefile.in | 20 +++++++++++++++++++- dlls/shdoclc/Nl.rc | 1 + dlls/shdoclc/No.rc | 1 + dlls/shdoclc/Pt.rc | 1 + dlls/shdoclc/Ru.rc | 1 + dlls/shdoclc/Si.rc | 3 +-- dlls/shdoclc/Sv.rc | 1 + dlls/shdoclc/Tr.rc | 1 + dlls/shdoclc/Zh.rc | 3 +-- dlls/shdoclc/rsrc.rc | 42 ------------------------------------------ dlls/shdoclc/shdoclc.h | 3 +++ 21 files changed, 41 insertions(+), 49 deletions(-) diff --git a/dlls/shdoclc/Bg.rc b/dlls/shdoclc/Bg.rc index 814ac7c..0cec8ec 100644 --- a/dlls/shdoclc/Bg.rc +++ b/dlls/shdoclc/Bg.rc @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "shdoclc.h" LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT diff --git a/dlls/shdoclc/Da.rc b/dlls/shdoclc/Da.rc index 5f22bc8..8a25db9 100644 --- a/dlls/shdoclc/Da.rc +++ b/dlls/shdoclc/Da.rc @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "shdoclc.h" LANGUAGE LANG_DANISH, SUBLANG_DEFAULT diff --git a/dlls/shdoclc/De.rc b/dlls/shdoclc/De.rc index c202773..f2fd672 100644 --- a/dlls/shdoclc/De.rc +++ b/dlls/shdoclc/De.rc @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "shdoclc.h" LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL diff --git a/dlls/shdoclc/En.rc b/dlls/shdoclc/En.rc index d237c51..b3823c2 100644 --- a/dlls/shdoclc/En.rc +++ b/dlls/shdoclc/En.rc @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "shdoclc.h" LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT diff --git a/dlls/shdoclc/Es.rc b/dlls/shdoclc/Es.rc index 8be9757..fd2e3c7 100644 --- a/dlls/shdoclc/Es.rc +++ b/dlls/shdoclc/Es.rc @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "shdoclc.h" LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL diff --git a/dlls/shdoclc/Fi.rc b/dlls/shdoclc/Fi.rc index 81233d3..ae5e0c2 100644 --- a/dlls/shdoclc/Fi.rc +++ b/dlls/shdoclc/Fi.rc @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "shdoclc.h" LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT diff --git a/dlls/shdoclc/Fr.rc b/dlls/shdoclc/Fr.rc index 75aefc7..216babb 100644 --- a/dlls/shdoclc/Fr.rc +++ b/dlls/shdoclc/Fr.rc @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "shdoclc.h" LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL diff --git a/dlls/shdoclc/Hu.rc b/dlls/shdoclc/Hu.rc index 9ed68ca..2fdc4c2 100644 --- a/dlls/shdoclc/Hu.rc +++ b/dlls/shdoclc/Hu.rc @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "shdoclc.h" LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT diff --git a/dlls/shdoclc/Ko.rc b/dlls/shdoclc/Ko.rc index d038994..6bf28d1 100644 --- a/dlls/shdoclc/Ko.rc +++ b/dlls/shdoclc/Ko.rc @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "shdoclc.h" LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT diff --git a/dlls/shdoclc/Lt.rc b/dlls/shdoclc/Lt.rc index b3a0641..331e0a9 100644 --- a/dlls/shdoclc/Lt.rc +++ b/dlls/shdoclc/Lt.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "shdoclc.h" + /* UTF-8 */ #pragma code_page(65001) @@ -247,5 +249,3 @@ IDR_BROWSE_CONTEXT_MENU MENU MENUITEM "Slinkti dešinėn", IDM_SCROLL_RIGHT } } - -#pragma code_page(default) diff --git a/dlls/shdoclc/Makefile.in b/dlls/shdoclc/Makefile.in index 4045ecf..d053a9d 100644 --- a/dlls/shdoclc/Makefile.in +++ b/dlls/shdoclc/Makefile.in @@ -5,7 +5,25 @@ VPATH = @srcdir@ MODULE = shdoclc.dll IMPORTS = kernel32 -RC_SRCS = rsrc.rc +RC_SRCS = \ + Bg.rc \ + Da.rc \ + De.rc \ + En.rc \ + Es.rc \ + Fi.rc \ + Fr.rc \ + Hu.rc \ + Ko.rc \ + Lt.rc \ + Nl.rc \ + No.rc \ + Pt.rc \ + Ru.rc \ + Si.rc \ + Sv.rc \ + Tr.rc \ + Zh.rc @MAKE_DLL_RULES@ diff --git a/dlls/shdoclc/Nl.rc b/dlls/shdoclc/Nl.rc index 3f76475..c10e803 100644 --- a/dlls/shdoclc/Nl.rc +++ b/dlls/shdoclc/Nl.rc @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "shdoclc.h" LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL diff --git a/dlls/shdoclc/No.rc b/dlls/shdoclc/No.rc index 6c38a1f..65f554a 100644 --- a/dlls/shdoclc/No.rc +++ b/dlls/shdoclc/No.rc @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "shdoclc.h" LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL diff --git a/dlls/shdoclc/Pt.rc b/dlls/shdoclc/Pt.rc index 393037f..64379f4 100644 --- a/dlls/shdoclc/Pt.rc +++ b/dlls/shdoclc/Pt.rc @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "shdoclc.h" LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL diff --git a/dlls/shdoclc/Ru.rc b/dlls/shdoclc/Ru.rc index f20c2f4..11db872 100644 --- a/dlls/shdoclc/Ru.rc +++ b/dlls/shdoclc/Ru.rc @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "shdoclc.h" LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT diff --git a/dlls/shdoclc/Si.rc b/dlls/shdoclc/Si.rc index ccc7900..c95dc01 100644 --- a/dlls/shdoclc/Si.rc +++ b/dlls/shdoclc/Si.rc @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "shdoclc.h" LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT @@ -247,5 +248,3 @@ IDR_BROWSE_CONTEXT_MENU MENU MENUITEM "Drsenje desno", IDM_SCROLL_RIGHT } } - -#pragma code_page(default) diff --git a/dlls/shdoclc/Sv.rc b/dlls/shdoclc/Sv.rc index 9b20705..277745d 100644 --- a/dlls/shdoclc/Sv.rc +++ b/dlls/shdoclc/Sv.rc @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "shdoclc.h" LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL diff --git a/dlls/shdoclc/Tr.rc b/dlls/shdoclc/Tr.rc index 8bd4ed0..ea238e1 100644 --- a/dlls/shdoclc/Tr.rc +++ b/dlls/shdoclc/Tr.rc @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "shdoclc.h" LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT diff --git a/dlls/shdoclc/Zh.rc b/dlls/shdoclc/Zh.rc index f3570e8..c597676 100644 --- a/dlls/shdoclc/Zh.rc +++ b/dlls/shdoclc/Zh.rc @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "shdoclc.h" /* Chinese text is encoded in UTF-8 */ #pragma code_page(65001) @@ -479,5 +480,3 @@ IDR_BROWSE_CONTEXT_MENU MENU MENUITEM "向右滾動", IDM_SCROLL_RIGHT } } - -#pragma code_page(default) diff --git a/dlls/shdoclc/rsrc.rc b/dlls/shdoclc/rsrc.rc deleted file mode 100644 index 641c4c9..0000000 --- a/dlls/shdoclc/rsrc.rc +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright 2005 Jacek Caban - * - * 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 - */ - -#include "windef.h" -#include "winuser.h" -#include "mshtmcid.h" - -#include "shdoclc.h" - -#include "Bg.rc" -#include "Da.rc" -#include "De.rc" -#include "En.rc" -#include "Es.rc" -#include "Fi.rc" -#include "Fr.rc" -#include "Hu.rc" -#include "Ko.rc" -#include "Lt.rc" -#include "Nl.rc" -#include "No.rc" -#include "Pt.rc" -#include "Ru.rc" -#include "Si.rc" -#include "Sv.rc" -#include "Tr.rc" -#include "Zh.rc" diff --git a/dlls/shdoclc/shdoclc.h b/dlls/shdoclc/shdoclc.h index 2bc7626..b5492d6 100644 --- a/dlls/shdoclc/shdoclc.h +++ b/dlls/shdoclc/shdoclc.h @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <windef.h> +#include <mshtmcid.h> + #define IDS_MESSAGE_BOX_TITLE 2213 #define IDS_PRINT_HEADER_TEMPLATE 8403

1 0

Michael Stefaniuc : net: Build language resource files separately.
by Alexandre Julliard July 2, 2009

July 2, 2009

Module: wine Branch: master Commit: 0063b3e4a67589ce250084beb1069bc973e90255 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0063b3e4a67589ce250084beb… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 2 00:28:54 2009 +0200 net: Build language resource files separately. Do not include them from an other rc file. --- programs/net/Da.rc | 2 ++ programs/net/De.rc | 4 ++-- programs/net/En.rc | 2 ++ programs/net/Fr.rc | 5 +++-- programs/net/Ko.rc | 2 ++ programs/net/Lt.rc | 4 ++-- programs/net/Makefile.in | 14 +++++++++++++- programs/net/Nl.rc | 2 ++ programs/net/No.rc | 2 ++ programs/net/Pl.rc | 2 ++ programs/net/Pt.rc | 2 ++ programs/net/Ru.rc | 2 ++ programs/net/Si.rc | 4 ++-- programs/net/resources.h | 2 ++ programs/net/rsrc.rc | 36 ------------------------------------ 15 files changed, 40 insertions(+), 45 deletions(-) diff --git a/programs/net/Da.rc b/programs/net/Da.rc index 02694fd..3be4723 100644 --- a/programs/net/Da.rc +++ b/programs/net/Da.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resources.h" + LANGUAGE LANG_DANISH, SUBLANG_DEFAULT STRINGTABLE diff --git a/programs/net/De.rc b/programs/net/De.rc index 78f87ec..0e2b0f3 100644 --- a/programs/net/De.rc +++ b/programs/net/De.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resources.h" + #pragma code_page(65001) LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL @@ -44,5 +46,3 @@ STRINGTABLE STRING_USE_HEADER, "\nStatus Lokal Entfernt\n---------------------------------------------------------------\n" STRING_USE_ENTRY, "%s %S %S Offene Ressourcen: %lu\n" } - -#pragma code_page(default) diff --git a/programs/net/En.rc b/programs/net/En.rc index 54da5ed..49233a4 100644 --- a/programs/net/En.rc +++ b/programs/net/En.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resources.h" + LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE diff --git a/programs/net/Fr.rc b/programs/net/Fr.rc index 3890649..49e6be4 100644 --- a/programs/net/Fr.rc +++ b/programs/net/Fr.rc @@ -18,6 +18,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "resources.h" + #pragma code_page(65001) LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL @@ -42,5 +45,3 @@ STRINGTABLE STRING_USE_HEADER, "\nStatut Local Distant\n---------------------------------------------------------------\n" STRING_USE_ENTRY, "%s %S %S Ressources ouvertes : %lu\n" } - -#pragma code_page(default) diff --git a/programs/net/Ko.rc b/programs/net/Ko.rc index 44775d3..713edf8 100644 --- a/programs/net/Ko.rc +++ b/programs/net/Ko.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resources.h" + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT STRINGTABLE diff --git a/programs/net/Lt.rc b/programs/net/Lt.rc index 76893ae..7db5762 100644 --- a/programs/net/Lt.rc +++ b/programs/net/Lt.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resources.h" + /* UTF-8 */ #pragma code_page(65001) @@ -45,5 +47,3 @@ STRINGTABLE STRING_USE_HEADER, "\nBūsena Vietinė Nutolusi\n---------------------------------------------------------------\n" STRING_USE_ENTRY, "%s %S %S Atverti ištekliai: %lu\n" } - -#pragma code_page(default) diff --git a/programs/net/Makefile.in b/programs/net/Makefile.in index 8ababf7..4f6f6fc 100644 --- a/programs/net/Makefile.in +++ b/programs/net/Makefile.in @@ -8,7 +8,19 @@ IMPORTS = netapi32 user32 advapi32 kernel32 C_SRCS = net.c -RC_SRCS = rsrc.rc +RC_SRCS = \ + Da.rc \ + De.rc \ + En.rc \ + Fr.rc \ + Ko.rc \ + Lt.rc \ + Nl.rc \ + No.rc \ + Pl.rc \ + Pt.rc \ + Ru.rc \ + Si.rc @MAKE_PROG_RULES@ diff --git a/programs/net/Nl.rc b/programs/net/Nl.rc index 93fa834..5f7e12b 100644 --- a/programs/net/Nl.rc +++ b/programs/net/Nl.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resources.h" + LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL STRINGTABLE diff --git a/programs/net/No.rc b/programs/net/No.rc index bc0ad33..7cd0b57 100644 --- a/programs/net/No.rc +++ b/programs/net/No.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resources.h" + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL STRINGTABLE diff --git a/programs/net/Pl.rc b/programs/net/Pl.rc index c5ef8a3..a60a5fe 100644 --- a/programs/net/Pl.rc +++ b/programs/net/Pl.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resources.h" + LANGUAGE LANG_POLISH, SUBLANG_DEFAULT STRINGTABLE diff --git a/programs/net/Pt.rc b/programs/net/Pt.rc index 0efa8c2..0229cb9 100644 --- a/programs/net/Pt.rc +++ b/programs/net/Pt.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resources.h" + LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL STRINGTABLE diff --git a/programs/net/Ru.rc b/programs/net/Ru.rc index 33da048..a59394b 100644 --- a/programs/net/Ru.rc +++ b/programs/net/Ru.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resources.h" + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE diff --git a/programs/net/Si.rc b/programs/net/Si.rc index 7130967..7a7e0cf 100644 --- a/programs/net/Si.rc +++ b/programs/net/Si.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resources.h" + #pragma code_page(65001) LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT @@ -44,5 +46,3 @@ STRINGTABLE STRING_USE_HEADER, "\nStanje Lokalno Oddaljeno\n---------------------------------------------------------------\n" STRING_USE_ENTRY, "%s %S %S Porabljena sredstva: %lu\n" } - -#pragma code_page(default) diff --git a/programs/net/resources.h b/programs/net/resources.h index c5199fd..659e47f 100644 --- a/programs/net/resources.h +++ b/programs/net/resources.h @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <windef.h> + #define STRING_USAGE 101 #define STRING_START_USAGE 102 #define STRING_STOP_USAGE 103 diff --git a/programs/net/rsrc.rc b/programs/net/rsrc.rc deleted file mode 100644 index 3f39391..0000000 --- a/programs/net/rsrc.rc +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright 2007 Tim Schwartz - * - * 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 - */ - -#include <windef.h> - -#include "resources.h" - -LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL - -#include "Da.rc" -#include "De.rc" -#include "En.rc" -#include "Fr.rc" -#include "Ko.rc" -#include "Lt.rc" -#include "Nl.rc" -#include "No.rc" -#include "Pl.rc" -#include "Pt.rc" -#include "Ru.rc" -#include "Si.rc"

1 0