August 2008 - Wine-commits - list.winehq.org

Jeff Zaroyko : winmm: Remove misleading message.
by Alexandre Julliard 18 Aug '08

18 Aug '08

Module: wine Branch: master Commit: 4603c873517c822131dd75ca3df83a98f70c523b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4603c873517c822131dd75ca3… Author: Jeff Zaroyko <jeffz(a)jeffz.name> Date: Sat Aug 16 16:47:34 2008 +1000 winmm: Remove misleading message. --- dlls/winmm/mci.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index 411d28e..0053619 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -898,9 +898,7 @@ static DWORD MCI_LoadMciDriver(LPCWSTR _strDevTyp, LPWINE_MCIDRIVER* lpwmd) if (strcmpiW(strDevTyp, wszAll) == 0) { dwRet = MCIERR_CANNOT_USE_ALL; } else { - FIXME("Couldn't load driver for type %s.\n" - "If you don't have a windows installation accessible from Wine,\n" - "you perhaps forgot to create a [mci] section in system.ini\n", + FIXME("Couldn't load driver for type %s.\n", debugstr_w(strDevTyp)); dwRet = MCIERR_DEVICE_NOT_INSTALLED; }

1 0

Alistair Leslie-Hughes : mshtml: Implement IDispatch for IHTMLElement.
by Alexandre Julliard 18 Aug '08

18 Aug '08

Module: wine Branch: master Commit: 666378f4fe841528a97f232bf1c3989da74a2943 URL: http://source.winehq.org/git/wine.git/?a=commit;h=666378f4fe841528a97f232bf… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Aug 16 21:12:38 2008 +1000 mshtml: Implement IDispatch for IHTMLElement. --- dlls/mshtml/htmlelem.c | 15 +++++---------- 1 files changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 244661f..3aa5f29 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -103,16 +103,14 @@ static ULONG WINAPI HTMLElement_Release(IHTMLElement *iface) static HRESULT WINAPI HTMLElement_GetTypeInfoCount(IHTMLElement *iface, UINT *pctinfo) { HTMLElement *This = HTMLELEM_THIS(iface); - FIXME("(%p)->(%p)\n", This, pctinfo); - return E_NOTIMPL; + return IDispatchEx_GetTypeInfoCount(DISPATCHEX(&This->node.dispex), pctinfo); } static HRESULT WINAPI HTMLElement_GetTypeInfo(IHTMLElement *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { HTMLElement *This = HTMLELEM_THIS(iface); - FIXME("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); - return E_NOTIMPL; + return IDispatchEx_GetTypeInfo(DISPATCHEX(&This->node.dispex), iTInfo, lcid, ppTInfo); } static HRESULT WINAPI HTMLElement_GetIDsOfNames(IHTMLElement *iface, REFIID riid, @@ -120,9 +118,7 @@ static HRESULT WINAPI HTMLElement_GetIDsOfNames(IHTMLElement *iface, REFIID riid LCID lcid, DISPID *rgDispId) { HTMLElement *This = HTMLELEM_THIS(iface); - FIXME("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, - lcid, rgDispId); - return E_NOTIMPL; + return IDispatchEx_GetIDsOfNames(DISPATCHEX(&This->node.dispex), riid, rgszNames, cNames, lcid, rgDispId); } static HRESULT WINAPI HTMLElement_Invoke(IHTMLElement *iface, DISPID dispIdMember, @@ -130,9 +126,8 @@ static HRESULT WINAPI HTMLElement_Invoke(IHTMLElement *iface, DISPID dispIdMembe VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { HTMLElement *This = HTMLELEM_THIS(iface); - FIXME("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - return E_NOTIMPL; + return IDispatchEx_Invoke(DISPATCHEX(&This->node.dispex), dispIdMember, riid, lcid, + wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); } static HRESULT WINAPI HTMLElement_setAttribute(IHTMLElement *iface, BSTR strAttributeName,

1 0

Christian Costa : winmm: Implement stub for midiConnect and midiDisconnect.
by Alexandre Julliard 18 Aug '08

18 Aug '08

Module: wine Branch: master Commit: 48b459afff649ada7cdd9a3acb0c1786af171025 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48b459afff649ada7cdd9a3ac… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Sat Aug 16 20:52:22 2008 +0200 winmm: Implement stub for midiConnect and midiDisconnect. --- dlls/winmm/winmm.c | 18 ++++++++++++++++++ dlls/winmm/winmm.spec | 4 ++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index 8c37a18..389fff8 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -1441,6 +1441,24 @@ UINT WINAPI midiInMessage(HMIDIIN hMidiIn, UINT uMessage, return MMDRV_Message(wmld, uMessage, dwParam1, dwParam2, TRUE); } +/************************************************************************** + * midiConnect [WINMM.@] + */ +MMRESULT WINAPI midiConnect(HMIDI hMidi, HMIDIOUT hmo, LPVOID pReserved) +{ + FIXME("(%p, %p, %p): Stub\n", hMidi, hmo, pReserved); + return MMSYSERR_ERROR; +} + +/************************************************************************** + * midiDisconnect [WINMM.@] + */ +MMRESULT WINAPI midiDisconnect(HMIDI hMidi, HMIDIOUT hmo, LPVOID pReserved) +{ + FIXME("(%p, %p, %p): Stub\n", hMidi, hmo, pReserved); + return MMSYSERR_ERROR; +} + typedef struct WINE_MIDIStream { HMIDIOUT hDevice; HANDLE hThread; diff --git a/dlls/winmm/winmm.spec b/dlls/winmm/winmm.spec index 9e216f3..b4043c9 100644 --- a/dlls/winmm/winmm.spec +++ b/dlls/winmm/winmm.spec @@ -56,8 +56,8 @@ @ stdcall mciSendStringW(wstr ptr long long) @ stdcall mciSetDriverData(long long) @ stdcall mciSetYieldProc(long ptr long) -@ stub midiConnect -@ stub midiDisconnect +@ stdcall midiConnect(long long ptr) +@ stdcall midiDisconnect(long long ptr) @ stdcall midiInAddBuffer(long ptr long) @ stdcall midiInClose(long) @ stdcall midiInGetDevCapsA(long ptr long)

1 0

Michael Karcher : winex11: Fix GetDIBits with monochrome pixmaps.
by Alexandre Julliard 18 Aug '08

18 Aug '08

Module: wine Branch: master Commit: 3843d5beee4550f26eb97451653714eff5bc163c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3843d5beee4550f26eb974516… Author: Michael Karcher <wine(a)mkarcher.dialup.fu-berlin.de> Date: Sat Aug 16 13:23:49 2008 +0200 winex11: Fix GetDIBits with monochrome pixmaps. --- dlls/gdi32/tests/bitmap.c | 1 - dlls/winex11.drv/dib.c | 2 +- 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 4c4abe0..12224c9 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -1552,7 +1552,6 @@ todo_wine } /* returned bits are DWORD aligned and upside down */ -todo_wine ok(!memcmp(buf, dib_bits_24, sizeof(dib_bits_24)), "DIB bits don't match\n"); DeleteObject(hbmp); diff --git a/dlls/winex11.drv/dib.c b/dlls/winex11.drv/dib.c index 9348281..b2a5b5a 100644 --- a/dlls/winex11.drv/dib.c +++ b/dlls/winex11.drv/dib.c @@ -4039,7 +4039,7 @@ INT X11DRV_GetDIBits( X11DRV_PDEVICE *physDev, HBITMAP hbitmap, UINT startscan, bitmap_type = DIB_GetBitmapInfo( (BITMAPINFOHEADER*)info, &width, &tempHeight, &descr.infoBpp, &descr.compression); - if (physDev->depth > 1) + if (physBitmap->pixmap_depth > 1) { GetPaletteEntries( GetCurrentObject( physDev->hdc, OBJ_PAL ), 0, 256, palette ); }

1 0

Alistair Leslie-Hughes : mshtml: Implement IDispatch for IHTMLStyle.
by Alexandre Julliard 18 Aug '08

18 Aug '08

Module: wine Branch: master Commit: 6d9e79a45f37f5843d06110ce293f43c125bc3b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d9e79a45f37f5843d06110ce… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Aug 16 21:01:25 2008 +1000 mshtml: Implement IDispatch for IHTMLStyle. --- dlls/mshtml/htmlstyle.c | 15 +++++---------- 1 files changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index dfc5ff3..b4c48d4 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -279,16 +279,14 @@ static ULONG WINAPI HTMLStyle_Release(IHTMLStyle *iface) static HRESULT WINAPI HTMLStyle_GetTypeInfoCount(IHTMLStyle *iface, UINT *pctinfo) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%p)\n", This, pctinfo); - return E_NOTIMPL; + return IDispatchEx_GetTypeInfoCount(DISPATCHEX(&This->dispex), pctinfo); } static HRESULT WINAPI HTMLStyle_GetTypeInfo(IHTMLStyle *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); - return E_NOTIMPL; + return IDispatchEx_GetTypeInfo(DISPATCHEX(&This->dispex), iTInfo, lcid, ppTInfo); } static HRESULT WINAPI HTMLStyle_GetIDsOfNames(IHTMLStyle *iface, REFIID riid, @@ -296,9 +294,7 @@ static HRESULT WINAPI HTMLStyle_GetIDsOfNames(IHTMLStyle *iface, REFIID riid, LCID lcid, DISPID *rgDispId) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, - lcid, rgDispId); - return E_NOTIMPL; + return IDispatchEx_GetIDsOfNames(DISPATCHEX(&This->dispex), riid, rgszNames, cNames, lcid, rgDispId); } static HRESULT WINAPI HTMLStyle_Invoke(IHTMLStyle *iface, DISPID dispIdMember, @@ -306,9 +302,8 @@ static HRESULT WINAPI HTMLStyle_Invoke(IHTMLStyle *iface, DISPID dispIdMember, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - return E_NOTIMPL; + return IDispatchEx_Invoke(DISPATCHEX(&This->dispex), dispIdMember, riid, lcid, + wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); } static HRESULT WINAPI HTMLStyle_put_fontFamily(IHTMLStyle *iface, BSTR v)

1 0

Alistair Leslie-Hughes : mshtml: Implement HTMLStyle get_background.
by Alexandre Julliard 18 Aug '08

18 Aug '08

Module: wine Branch: master Commit: 059c3ab6501ed7331063daf5b53994be7edef55e URL: http://source.winehq.org/git/wine.git/?a=commit;h=059c3ab6501ed7331063daf5b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Aug 13 09:29:57 2008 +1000 mshtml: Implement HTMLStyle get_background. --- dlls/mshtml/htmlstyle.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index e4bc483..dfc5ff3 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -455,8 +455,10 @@ static HRESULT WINAPI HTMLStyle_put_background(IHTMLStyle *iface, BSTR v) static HRESULT WINAPI HTMLStyle_get_background(IHTMLStyle *iface, BSTR *p) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_style_attr(This, attrBackground, p); } static HRESULT WINAPI HTMLStyle_put_backgroundColor(IHTMLStyle *iface, VARIANT v)

1 0

Alistair Leslie-Hughes : msxml3: Added and corrected trace string.
by Alexandre Julliard 18 Aug '08

18 Aug '08

Module: wine Branch: master Commit: 373a43f0afd8738384a76cd0d2a17ec993482746 URL: http://source.winehq.org/git/wine.git/?a=commit;h=373a43f0afd8738384a76cd0d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Aug 13 16:06:22 2008 +1000 msxml3: Added and corrected trace string. --- dlls/msxml3/domdoc.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 8e39391..61f01f1 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -1444,7 +1444,7 @@ static HRESULT WINAPI domdoc_save( HRESULT ret = S_OK; DWORD written; - TRACE("(%p)->(var(vt %x, %s))\n", This, V_VT(&destination), + TRACE("(%p)->(var(vt %d, %s))\n", This, V_VT(&destination), V_VT(&destination) == VT_BSTR ? debugstr_w(V_BSTR(&destination)) : NULL); if(V_VT(&destination) != VT_BSTR && V_VT(&destination) != VT_UNKNOWN) @@ -1475,6 +1475,8 @@ static HRESULT WINAPI domdoc_save( IXMLDOMDocument_Release(pDocument); } + TRACE("ret %d", ret); + return ret; }

1 0

Lei Zhang : comctl32: Add a test for TTM_GETTEXT.
by Alexandre Julliard 18 Aug '08

18 Aug '08

Module: wine Branch: master Commit: fc6553973f02cbd763f043847498190a03e654f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc6553973f02cbd763f043847… Author: Lei Zhang <thestig(a)google.com> Date: Tue Aug 12 11:05:41 2008 -0700 comctl32: Add a test for TTM_GETTEXT. --- dlls/comctl32/tests/tooltips.c | 60 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 60 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/tooltips.c b/dlls/comctl32/tests/tooltips.c index e9bce63..c945a27 100644 --- a/dlls/comctl32/tests/tooltips.c +++ b/dlls/comctl32/tests/tooltips.c @@ -232,10 +232,70 @@ static void test_customdraw(void) { } +static void test_gettext(void) +{ + HWND hwnd; + TTTOOLINFOA toolinfoA; + TTTOOLINFOW toolinfoW; + LRESULT r; + char bufA[10] = ""; + WCHAR bufW[10] = { 0 }; + + /* For bug 14790 - lpszText is NULL */ + hwnd = CreateWindowExA(0, TOOLTIPS_CLASSA, NULL, 0, + 10, 10, 300, 100, + NULL, NULL, NULL, 0); + assert(hwnd); + + toolinfoA.cbSize = sizeof(TTTOOLINFOA); + toolinfoA.hwnd = NULL; + toolinfoA.hinst = GetModuleHandleA(NULL); + toolinfoA.uFlags = 0; + toolinfoA.uId = (UINT_PTR)0x1234ABCD; + toolinfoA.lpszText = NULL; + toolinfoA.lParam = 0xdeadbeef; + GetClientRect(hwnd, &toolinfoA.rect); + r = SendMessageA(hwnd, TTM_ADDTOOL, 0, (LPARAM)&toolinfoA); + ok(r, "Adding the tool to the tooltip failed\n"); + + toolinfoA.hwnd = NULL; + toolinfoA.uId = (UINT_PTR)0x1234ABCD; + toolinfoA.lpszText = bufA; + SendMessageA(hwnd, TTM_GETTEXTA, 0, (LPARAM)&toolinfoA); + ok(strcmp(toolinfoA.lpszText, "") == 0, "lpszText should be an empty string\n"); + + DestroyWindow(hwnd); + + hwnd = CreateWindowExW(0, TOOLTIPS_CLASSW, NULL, 0, + 10, 10, 300, 100, + NULL, NULL, NULL, 0); + assert(hwnd); + + toolinfoW.cbSize = sizeof(TTTOOLINFOW); + toolinfoW.hwnd = NULL; + toolinfoW.hinst = GetModuleHandleA(NULL); + toolinfoW.uFlags = 0; + toolinfoW.uId = (UINT_PTR)0x1234ABCD; + toolinfoW.lpszText = NULL; + toolinfoW.lParam = 0xdeadbeef; + GetClientRect(hwnd, &toolinfoW.rect); + r = SendMessageW(hwnd, TTM_ADDTOOL, 0, (LPARAM)&toolinfoW); + ok(r, "Adding the tool to the tooltip failed\n"); + + toolinfoW.hwnd = NULL; + toolinfoW.uId = (UINT_PTR)0x1234ABCD; + toolinfoW.lpszText = bufW; + SendMessageW(hwnd, TTM_GETTEXTW, 0, (LPARAM)&toolinfoW); + ok(toolinfoW.lpszText[0] == 0, "lpszText should be an empty string\n"); + + DestroyWindow(hwnd); +} + START_TEST(tooltips) { InitCommonControls(); test_create_tooltip(); test_customdraw(); + test_gettext(); }

1 0

Will Tipton : comctl32: Added input validation to TOOLTIPS_GetTextW() in order to handle gracefully the case where it is called with an empty tooltip .
by Alexandre Julliard 18 Aug '08

18 Aug '08

Module: wine Branch: master Commit: accb5f8faf68501a803117a67092b22e0bfbf6c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=accb5f8faf68501a803117a67… Author: Will Tipton <wtipton(a)MIT.EDU> Date: Mon Aug 11 10:23:45 2008 -0400 comctl32: Added input validation to TOOLTIPS_GetTextW() in order to handle gracefully the case where it is called with an empty tooltip. --- dlls/comctl32/tooltips.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index f7e538b..1149a07 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -1574,6 +1574,9 @@ TOOLTIPS_GetTextW (HWND hwnd, WPARAM wParam, LPARAM lParam) nTool = TOOLTIPS_GetToolFromInfoW (infoPtr, lpToolInfo); if (nTool == -1) return 0; + if (infoPtr->tools[nTool].lpszText == NULL) + return 0; + strcpyW (lpToolInfo->lpszText, infoPtr->tools[nTool].lpszText); return 0;

1 0

Frans Kool : appwiz.cpl: Added Dutch resources.
by Alexandre Julliard 18 Aug '08

18 Aug '08

Module: wine Branch: master Commit: 497377ec39b5dea005e5bdbc21e107ef4978c045 URL: http://source.winehq.org/git/wine.git/?a=commit;h=497377ec39b5dea005e5bdbc2… Author: Frans Kool <Frans.Kool(a)gmail.com> Date: Fri Aug 8 13:11:12 2008 +0200 appwiz.cpl: Added Dutch resources. --- dlls/appwiz.cpl/Nl.rc | 79 +++++++++++++++++++++++++++++++++++++++++++++ dlls/appwiz.cpl/appwiz.rc | 1 + 2 files changed, 80 insertions(+), 0 deletions(-) diff --git a/dlls/appwiz.cpl/Nl.rc b/dlls/appwiz.cpl/Nl.rc new file mode 100644 index 0000000..696dc20 --- /dev/null +++ b/dlls/appwiz.cpl/Nl.rc @@ -0,0 +1,79 @@ +/* +* Add/Remove Programs Dutch resources +* +* Copyright 2008 Frans Kool +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser General Public +* License as published by the Free Software Foundation; either +* version 2.1 of the License, or (at your option) any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this library; if not, write to the Free Software +* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA +* +*/ + +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL + +STRINGTABLE +{ + IDS_CPL_TITLE, "Software" + IDS_CPL_DESC, "Hiermee installeert u nieuwe software, of verwijderd u bestaande software van uw computer." + IDS_TAB1_TITLE, "Programma's" + + IDS_UNINSTALL_FAILED, "Het programma '%s' kan niet verwijderd worden van het systeem. Wilt u het verwijderen uit het register?" + IDS_NOT_SPECIFIED, "Niet gespecificeerd" + + IDS_COLUMN_NAME, "Naam" + IDS_COLUMN_PUBLISHER, "Uitgever" + IDS_COLUMN_VERSION, "Versie" +} + +/* TODO: it's best to use the constant WC_LISTVIEW instead of SysListView32 directly, but the Wine resource compiler doesn't seem to like that... */ + +IDD_MAIN DIALOG 0, 0, 320, 220 +STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Installeren/Verwijderen" +FONT 8, "MS Sans Serif" +{ + CONTROL "Om een programma te installeren vanaf een floppy disk, CD-ROM drive, of uw hard disk, click op Installeren.", 1000, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 7, 270, 20 + CONTROL "&Installeren...", IDC_INSTALL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 246, 26, 64, 14 + CONTROL "", -1, "STATIC", SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE, 7, 46, 303, 1 + CONTROL 2, 1001, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 7, 21, 20 + CONTROL "De volgende software kan automatisch verwijderd worden. Om het programma te verwijderen of de geinstalleerde onderdelen te wijzigen, selecteer het in de lijst en druk op Toevoegen/Verwijderen.", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 57, 270, 30 + CONTROL "", IDL_PROGRAMS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SORTASCENDING | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 90, 303, 100 + CONTROL "Toevoegen/&Verwijderen...", IDC_ADDREMOVE, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 246, 198, 64, 14 + CONTROL "&Support Informatie...", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 176, 198, 64, 14 + CONTROL 3, 1003, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 57, 21, 20 +} + +IDD_INFO DIALOG 0, 0, 256, 138 +STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Support Informatie" +FONT 8, "MS Sans Serif" +{ + CONTROL "OK", IDOK, "BUTTON", BS_DEFPUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 103, 116, 50, 14 + CONTROL "De volgende informatie kan gebruikt worden om technische ondersteuning te krijgen voor %s:", IDC_INFO_LABEL, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 12, 9, 228, 19 + CONTROL "Uitgever:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 30, 60, 8 + CONTROL "Versie:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 40, 60, 8 + CONTROL "Contact:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 50, 60, 8 + CONTROL "Support Informatie:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 60, 64, 8 + CONTROL "Support Telefoon:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 70, 68, 8 + CONTROL "Lees me:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 80, 60, 8 + CONTROL "Produkt Updates:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 90, 60, 8 + CONTROL "Commentaar:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 100, 60, 8 + CONTROL "", IDC_INFO_PUBLISHER, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 30, 136, 8 + CONTROL "", IDC_INFO_VERSION, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 40, 136, 8 + CONTROL "", IDC_INFO_CONTACT, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 50, 136, 8 + CONTROL "", IDC_INFO_SUPPORT, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 60, 136, 8 + CONTROL "", IDC_INFO_PHONE, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 70, 136, 8 + CONTROL "", IDC_INFO_README, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 80, 136, 8 + CONTROL "", IDC_INFO_UPDATES, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 90, 136, 8 + CONTROL "", IDC_INFO_COMMENTS, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 100, 136, 8 +} diff --git a/dlls/appwiz.cpl/appwiz.rc b/dlls/appwiz.cpl/appwiz.rc index 8b839be..8b88911 100644 --- a/dlls/appwiz.cpl/appwiz.rc +++ b/dlls/appwiz.cpl/appwiz.rc @@ -26,6 +26,7 @@ #include "res.h" #include "En.rc" +#include "Nl.rc" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL

1 0