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