July 2006 - Wine-commits - list.winehq.org

Vitaliy Margolen : dinput: Unacquire correct device.
by Alexandre Julliard 17 Jul '06

17 Jul '06

Module: wine Branch: refs/heads/master Commit: 83bda8e6d441d4da51461307ecd0524439a6d3f7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=83bda8e6d441d4da5146130… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Sun Jul 16 19:14:04 2006 -0600 dinput: Unacquire correct device. --- dlls/dinput/keyboard.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index d9a8c43..f6195b1 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -518,7 +518,7 @@ static HRESULT WINAPI SysKeyboardAImpl_A if (current_lock != NULL) { FIXME("Not more than one keyboard can be acquired at the same time.\n"); - SysKeyboardAImpl_Unacquire(iface); + SysKeyboardAImpl_Unacquire((LPDIRECTINPUTDEVICE8A)current_lock); } current_lock = This;

1 0

Jonathan Ernst : notepad: Fix typo in Danish translation spotted by Henrik Olsen.
by Alexandre Julliard 17 Jul '06

17 Jul '06

Module: wine Branch: refs/heads/master Commit: 7e184e15b67cdbf3d327663ac838a11a2bd6e07f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7e184e15b67cdbf3d327663… Author: Jonathan Ernst <jonathan(a)ernstfamily.ch> Date: Mon Jul 17 10:04:36 2006 +0200 notepad: Fix typo in Danish translation spotted by Henrik Olsen. --- programs/notepad/Da.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/notepad/Da.rc b/programs/notepad/Da.rc index 3148ec4..caf041d 100644 --- a/programs/notepad/Da.rc +++ b/programs/notepad/Da.rc @@ -23,7 +23,7 @@ LANGUAGE LANG_DANISH, SUBLANG_DEFAULT MAIN_MENU MENU { - POPUP "&Filef" { + POPUP "&Filer" { MENUITEM "&Ny\tCtrl+N", CMD_NEW MENUITEM "�&bn...\tCtrl+O", CMD_OPEN MENUITEM "&Gem\tCtrl+S", CMD_SAVE

1 0

Jacek Caban : mshtml: Added get_all implementation.
by Alexandre Julliard 17 Jul '06

17 Jul '06

Module: wine Branch: refs/heads/master Commit: 17e193e1883bf55334aff6ff6fc72cbedcd040a9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=17e193e1883bf55334aff6f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jul 16 21:29:44 2006 +0200 mshtml: Added get_all implementation. --- dlls/mshtml/htmldoc.c | 22 ++++++++++++++++++++-- 1 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 18f5cdd..2bf8522 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -209,8 +209,26 @@ static HRESULT WINAPI HTMLDocument_get_S static HRESULT WINAPI HTMLDocument_get_all(IHTMLDocument2 *iface, IHTMLElementCollection **p) { - FIXME("(%p)->(%p)\n", iface, p); - return E_NOTIMPL; + HTMLDocument *This = HTMLDOC_THIS(iface); + IHTMLElement *doc; + IDispatch *disp; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, p); + + hres = IHTMLDocument3_get_documentElement(HTMLDOC3(This), &doc); + if(FAILED(hres)) + return hres; + + hres = IHTMLElement_get_all(doc, &disp); + IHTMLElement_Release(doc); + if(FAILED(hres)) + return hres; + + hres = IDispatch_QueryInterface(disp, &IID_IHTMLElementCollection, (void**)p); + IDispatch_Release(disp); + + return hres; } static HRESULT WINAPI HTMLDocument_get_body(IHTMLDocument2 *iface, IHTMLElement **p)

1 0

Duane Clark : comdlg32: Set PD_PAGENUMS from print dialog.
by Alexandre Julliard 17 Jul '06

17 Jul '06

Module: wine Branch: refs/heads/master Commit: e0aabe4f8c5064af23ae62f31b9781f710f4f315 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e0aabe4f8c5064af23ae62f… Author: Duane Clark <dclark(a)akamail.com> Date: Sat Jul 15 19:10:00 2006 -0700 comdlg32: Set PD_PAGENUMS from print dialog. --- dlls/comdlg32/printdlg.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index be6e7e5..8e20aeb 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -397,7 +397,10 @@ static BOOL PRINTDLG_UpdatePrintDlgW(HWN } lppd->nFromPage = nFromPage; lppd->nToPage = nToPage; + lppd->Flags |= PD_PAGENUMS; } + else + lppd->Flags &= ~PD_PAGENUMS; if (IsDlgButtonChecked(hDlg, chx1) == BST_CHECKED) {/* Print to file */ static WCHAR file[] = {'F','I','L','E',':',0};

1 0

Duane Clark : examine-relay: Indent winex11.drv lines.
by Alexandre Julliard 17 Jul '06

17 Jul '06

Module: wine Branch: refs/heads/master Commit: 1df4128563b9e5478d217389313fb7dcde10b3b0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1df4128563b9e5478d21738… Author: Duane Clark <fpga(a)pacbell.net> Date: Sun Jul 16 12:48:39 2006 -0700 examine-relay: Indent winex11.drv lines. --- tools/examine-relay | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/examine-relay b/tools/examine-relay index bffe8d7..d82110c 100755 --- a/tools/examine-relay +++ b/tools/examine-relay @@ -44,7 +44,7 @@ LINE: while (<IN>) { - if (/^([0-9a-f]+):Call ([A-Za-z0-9]+\.[A-Za-z0-9_]+)$(.*$) .*/) { + if (/^([0-9a-f]+):Call ([A-Za-z0-9]+\.[A-Za-z0-9_.]+)$(.*$) .*/) { my $tid = $1; my $func = $2; if (defined $fullformat) { @@ -96,10 +96,10 @@ # print "have call func=$func $_"; push @{$tid_callstack{$tid}}, [$func, $retaddr, $segreg]; } - elsif (/^([0-9a-f]+):Ret ([A-Za-z0-9]+\.[A-Za-z0-9_]+)$.*$ .* ret=(........)$/ || - /^([0-9a-f]+):Ret ([A-Za-z0-9]+\.[A-Za-z0-9_]+)$.*$ .* ret=(....:....) (ds=....)$/ || - /^([0-9a-f]+):Ret ([A-Za-z0-9]+\.[A-Za-z0-9_]+)$.*$ .* ret=(........) fs=....$/ || - /^([0-9a-f]+):RET ([A-Za-z0-9]+\.[A-Za-z0-9_]+: [A-Za-z0-9]+)$.*$ .* ret=(........)$/ || + elsif (/^([0-9a-f]+):Ret ([A-Za-z0-9]+\.[A-Za-z0-9_.]+)$.*$ .* ret=(........)$/ || + /^([0-9a-f]+):Ret ([A-Za-z0-9]+\.[A-Za-z0-9_.]+)$.*$ .* ret=(....:....) (ds=....)$/ || + /^([0-9a-f]+):Ret ([A-Za-z0-9]+\.[A-Za-z0-9_.]+)$.*$ .* ret=(........) fs=....$/ || + /^([0-9a-f]+):RET ([A-Za-z0-9]+\.[A-Za-z0-9_.]+: [A-Za-z0-9]+)$.*$ .* ret=(........)$/ || /^([0-9a-f]+):Ret (window proc) ([0-9a-fx]+) .*/) { my $tid = $1; my $func = $2;

1 0

Stefan Dösinger : wined3d: Allocate 4 extra bytes in the dib section.
by Alexandre Julliard 17 Jul '06

17 Jul '06

Module: wine Branch: refs/heads/master Commit: 5702a310e998d29f3e1f8413d127d364d5c1fdd5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5702a310e998d29f3e1f841… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Jul 16 10:08:26 2006 +0200 wined3d: Allocate 4 extra bytes in the dib section. --- dlls/wined3d/surface.c | 30 ++++++++++++++++++++++++++++-- 1 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index b827fa8..ce4e384 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -781,6 +781,7 @@ static HRESULT WINAPI IWineD3DSurfaceImp GLint prev_store; GLint prev_depth_test; GLint prev_rasterpos[4]; + int tex; /* Some drivers(radeon dri, others?) don't like exceptions during * glDrawPixels. If the surface is a DIB section, it might be in GDIMode @@ -827,6 +828,17 @@ static HRESULT WINAPI IWineD3DSurfaceImp glGetIntegerv(GL_UNPACK_ROW_LENGTH, &skipBytes); glPixelStorei(GL_UNPACK_ROW_LENGTH, This->currentDesc.Width); + /* Disable all textures before calling glDrawPixels */ + for(tex = 0; tex < GL_LIMITS(sampler_stages); tex++) { + if (GL_SUPPORT(ARB_MULTITEXTURE)) { + GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + tex)); + checkGLcall("glActiveTextureARB"); + } + glDisable(GL_TEXTURE_2D); + checkGLcall("glDisable GL_TEXTURE_2D"); + glDisable(GL_TEXTURE_1D); + checkGLcall("glDisable GL_TEXTURE_1D"); + } /* And back buffers are not blended */ glDisable(GL_BLEND); glDisable(GL_DEPTH_TEST); @@ -993,6 +1005,9 @@ HRESULT WINAPI IWineD3DSurfaceImpl_GetDC /* Create a DIB section if there isn't a hdc yet */ if(!This->hDC) { + int extraline = 0; + SYSTEM_INFO sysInfo; + if(This->Flags & SFLAG_ACTIVELOCK) { ERR("Creating a DIB section while a lock is active. Uncertain consequences\n"); } @@ -1017,17 +1032,28 @@ HRESULT WINAPI IWineD3DSurfaceImpl_GetDC break; } + /* Some apps access the surface in via DWORDs, and do not take the necessary care at the end of the + * surface. So we need at least extra 4 bytes at the end of the surface. Check against the page size, + * if the last page used for the surface has at least 4 spare bytes we're safe, otherwise + * add an extra line to the dib section + */ + GetSystemInfo(&sysInfo); + if( ((This->resource.size + 3) % sysInfo.dwPageSize) < 4) { + extraline = 1; + TRACE("Adding an extra line to the dib section\n"); + } + b_info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); if( (NP2_REPACK == wined3d_settings.nonpower2_mode || This->resource.usage & WINED3DUSAGE_RENDERTARGET)) { b_info->bmiHeader.biWidth = This->currentDesc.Width; - b_info->bmiHeader.biHeight = -This->currentDesc.Height; + b_info->bmiHeader.biHeight = -This->currentDesc.Height -extraline; b_info->bmiHeader.biSizeImage = This->currentDesc.Width * This->currentDesc.Height * This->bytesPerPixel; /* Use the full pow2 image size(assigned below) because LockRect * will need it for a full glGetTexImage call */ } else { b_info->bmiHeader.biWidth = This->pow2Width; - b_info->bmiHeader.biHeight = -This->pow2Height; + b_info->bmiHeader.biHeight = -This->pow2Height -extraline; b_info->bmiHeader.biSizeImage = This->resource.size; } b_info->bmiHeader.biPlanes = 1;

1 0

James Hawkins : wininet: Add more tests for InternetCrackurl.
by Alexandre Julliard 17 Jul '06

17 Jul '06

Module: wine Branch: refs/heads/master Commit: a1544731dbaf30c473be2ae254f2f24e3138babf URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a1544731dbaf30c473be2ae… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Jul 14 16:45:46 2006 -0700 wininet: Add more tests for InternetCrackurl. --- dlls/wininet/internet.c | 7 +++++++ dlls/wininet/tests/url.c | 18 ++++++++++++++++++ 2 files changed, 25 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 332e4f7..ebe209d 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1323,6 +1323,13 @@ BOOL WINAPI InternetCrackUrlW(LPCWSTR lp dwUrlLength=strlenW(lpszUrl); TRACE("(%s %lu %lx %p)\n", debugstr_w(lpszUrl), dwUrlLength, dwFlags, lpUC); + + if (!lpszUrl_orig || !*lpszUrl_orig) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + if (dwFlags & ICU_DECODE) { lpszUrl_decode=HeapAlloc( GetProcessHeap(), 0, dwUrlLength * sizeof (WCHAR) ); diff --git a/dlls/wininet/tests/url.c b/dlls/wininet/tests/url.c index 56e38f1..ea09631 100644 --- a/dlls/wininet/tests/url.c +++ b/dlls/wininet/tests/url.c @@ -208,6 +208,24 @@ static void InternetCrackUrl_test(void) ok(!strcmp(urlComponents.lpszScheme, "about"), "lpszScheme was \"%s\" instead of \"about\"\n", urlComponents.lpszScheme); ok(!strcmp(urlComponents.lpszHostName, "host"), "lpszHostName was \"%s\" instead of \"host\"\n", urlComponents.lpszHostName); ok(!strcmp(urlComponents.lpszUrlPath, "/blank"), "lpszUrlPath was \"%s\" instead of \"/blank\"\n", urlComponents.lpszUrlPath); + + /* try a NULL lpszUrl */ + SetLastError(0xdeadbeef); + copy_compsA(&urlSrc, &urlComponents, 32, 1024, 1024, 1024, 2048, 1024); + ret = InternetCrackUrl(NULL, 0, 0, &urlComponents); + GLE = GetLastError(); + ok(ret == FALSE, "Expected InternetCrackUrl to fail\n"); + ok(GLE == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %ld\n", GLE); + + /* try an empty lpszUrl, GetLastError returns 12006, whatever that means + * we just need to fail and not return success + */ + SetLastError(0xdeadbeef); + copy_compsA(&urlSrc, &urlComponents, 32, 1024, 1024, 1024, 2048, 1024); + ret = InternetCrackUrl("", 0, 0, &urlComponents); + GLE = GetLastError(); + ok(ret == FALSE, "Expected InternetCrackUrl to fail\n"); + ok(GLE != 0xdeadbeef && GLE != ERROR_SUCCESS, "Expected GLE to represent a failure\n"); } static void InternetCrackUrlW_test(void)

1 0

Hwang YunSong(황윤성) : wordpad: Updated Korean resource.
by Alexandre Julliard 17 Jul '06

17 Jul '06

Module: wine Branch: refs/heads/master Commit: c6ff1ef6fb89323ce1596e1bbe0508ae722abe56 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c6ff1ef6fb89323ce1596e1… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Sat Jul 15 08:59:22 2006 +0900 wordpad: Updated Korean resource. --- programs/wordpad/Ko.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/wordpad/Ko.rc b/programs/wordpad/Ko.rc index 8c507f2..a10a96e 100644 --- a/programs/wordpad/Ko.rc +++ b/programs/wordpad/Ko.rc @@ -27,7 +27,7 @@ BEGIN MENUITEM "��(&O)\tCtrl+O", ID_FILE_OPEN MENUITEM "��(&S)\tCtrl+S", ID_FILE_SAVE MENUITEM SEPARATOR - MENUITEM "��(&E)", ID_FILE_EXIT + MENUITEM "��(&X)", ID_FILE_EXIT END POPUP "��(&E)" BEGIN

1 0

James Hawkins : msi: Add handling for the ListBox dialog control.
by Alexandre Julliard 17 Jul '06

17 Jul '06

Module: wine Branch: refs/heads/master Commit: 6de2ca845983dd93c3e9cdda97e8f6019b5f1f2f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6de2ca845983dd93c3e9cdd… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Jul 14 15:46:00 2006 -0700 msi: Add handling for the ListBox dialog control. --- dlls/msi/dialog.c | 147 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 147 insertions(+), 0 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index a4b4bec..2bb931f 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -135,6 +135,7 @@ static const WCHAR szIcon[] = { 'I','c', static const WCHAR szSelectionTree[] = { 'S','e','l','e','c','t','i','o','n','T','r','e','e',0 }; static const WCHAR szGroupBox[] = { 'G','r','o','u','p','B','o','x',0 }; +static const WCHAR szListBox[] = { 'L','i','s','t','B','o','x',0 }; static UINT msi_dialog_checkbox_handler( msi_dialog *, msi_control *, WPARAM ); static void msi_dialog_checkbox_sync_state( msi_dialog *, msi_control * ); @@ -1705,6 +1706,151 @@ static UINT msi_dialog_group_box( msi_di return ERROR_SUCCESS; } +/******************** List Box ***************************************/ + +struct msi_listbox_item +{ + LPWSTR property; + LPWSTR value; +}; + +struct msi_listbox_info +{ + msi_dialog *dialog; + HWND hwnd; + WNDPROC oldproc; + DWORD num_items; + struct msi_listbox_item *items; +}; + +static LRESULT WINAPI MSIListBox_WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + struct msi_listbox_info *info; + LRESULT r; + DWORD j; + + TRACE("%p %04x %08x %08lx\n", hWnd, msg, wParam, lParam); + + info = GetPropW( hWnd, szButtonData ); + if (!info) + return 0; + + r = CallWindowProcW( info->oldproc, hWnd, msg, wParam, lParam ); + + switch( msg ) + { + case WM_NCDESTROY: + for (j = 0; j < info->num_items; j++) + { + msi_free( info->items[j].property ); + msi_free( info->items[j].value ); + } + msi_free( info->items ); + msi_free( info ); + RemovePropW( hWnd, szButtonData ); + break; + } + + return r; +} + +static UINT msi_listbox_add_item( MSIRECORD *rec, LPVOID param ) +{ + struct msi_listbox_info *info = param; + struct msi_listbox_item *item; + LPCWSTR property, value, text; + static int index = 0; + + item = &info->items[index++]; + property = MSI_RecordGetString( rec, 1 ); + value = MSI_RecordGetString( rec, 3 ); + text = MSI_RecordGetString( rec, 4 ); + + item->property = strdupW( property ); + item->value = strdupW( value ); + + SendMessageW( info->hwnd, LB_ADDSTRING, 0, (LPARAM)text ); + + return ERROR_SUCCESS; +} + +static UINT msi_listbox_add_items( struct msi_listbox_info *info ) +{ + UINT r; + MSIQUERY *view = NULL; + DWORD count; + + static const WCHAR query[] = { + 'S','E','L','E','C','T',' ','*',' ', + 'F','R','O','M',' ','`','L','i','s','t','B','o','x','`',' ', + 'O','R','D','E','R',' ','B','Y',' ','`','O','r','d','e','r','`',0 + }; + + r = MSI_OpenQuery( info->dialog->package->db, &view, query ); + if ( r != ERROR_SUCCESS ) + return r; + + /* just get the number of records */ + r = MSI_IterateRecords( view, &count, NULL, NULL ); + + info->num_items = count; + info->items = msi_alloc( sizeof(*info->items) * count ); + + r = MSI_IterateRecords( view, NULL, msi_listbox_add_item, info ); + msiobj_release( &view->hdr ); + + return r; +} + +static UINT msi_dialog_listbox_handler( msi_dialog *dialog, + msi_control *control, WPARAM param ) +{ + struct msi_listbox_info *info; + int index; + + if( HIWORD(param) != LBN_SELCHANGE ) + return ERROR_SUCCESS; + + info = GetPropW( control->hwnd, szButtonData ); + index = SendMessageW( control->hwnd, LB_GETCURSEL, 0, 0 ); + + MSI_SetPropertyW( info->dialog->package, + info->items[index].property, info->items[index].value ); + msi_dialog_evaluate_control_conditions( info->dialog ); + + return ERROR_SUCCESS; +} + +static UINT msi_dialog_list_box( msi_dialog *dialog, MSIRECORD *rec ) +{ + struct msi_listbox_info *info; + msi_control *control; + DWORD style; + + info = msi_alloc( sizeof *info ); + if (!info) + return ERROR_FUNCTION_FAILED; + + style = WS_TABSTOP | WS_GROUP | WS_CHILD | LBS_STANDARD; + control = msi_dialog_add_control( dialog, rec, WC_LISTBOXW, style ); + if (!control) + return ERROR_FUNCTION_FAILED; + + control->handler = msi_dialog_listbox_handler; + + /* subclass */ + info->dialog = dialog; + info->hwnd = control->hwnd; + info->items = NULL; + info->oldproc = (WNDPROC)SetWindowLongPtrW( control->hwnd, GWLP_WNDPROC, + (LONG_PTR)MSIListBox_WndProc ); + SetPropW( control->hwnd, szButtonData, info ); + + msi_listbox_add_items( info ); + + return ERROR_SUCCESS; +} + static const struct control_handler msi_dialog_handler[] = { { szText, msi_dialog_text_control }, @@ -1722,6 +1868,7 @@ static const struct control_handler msi_ { szIcon, msi_dialog_icon_control }, { szSelectionTree, msi_dialog_selection_tree }, { szGroupBox, msi_dialog_group_box }, + { szListBox, msi_dialog_list_box }, }; #define NUM_CONTROL_TYPES (sizeof msi_dialog_handler/sizeof msi_dialog_handler[0])

1 0

Milko Krachounov : mshtml: Update Bulgarian translation.
by Alexandre Julliard 17 Jul '06

17 Jul '06

Module: wine Branch: refs/heads/master Commit: 9247c1d48fa8b03d4c486ffbdda72fb0fc735987 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9247c1d48fa8b03d4c486ff… Author: Milko Krachounov <milko(a)3mhz.net> Date: Fri Jul 14 00:41:42 2006 +0300 mshtml: Update Bulgarian translation. --- dlls/mshtml/Bg.rc | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/Bg.rc b/dlls/mshtml/Bg.rc index 60738fc..fba39d8 100644 --- a/dlls/mshtml/Bg.rc +++ b/dlls/mshtml/Bg.rc @@ -23,6 +23,22 @@ STRINGTABLE DISCARDABLE { IDS_HTMLDISABLED "HTML �� ." IDS_HTMLDOCUMENT "HTML ��" + IDS_DOWNLOADING "��..." + IDS_INSTALLING "��..." +} + + +ID_DWL_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 260, 85 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Wine Gecko Installer" +FONT 8, "MS Shell Dlg" +{ + LTEXT "�� HTML ��. �� , " \ + "�� Gecko (HTML �� Mozilla) ��. �� Gecko " \ + "�� ?", ID_DWL_STATUS, 10, 10, 240, 30, SS_CENTER + CONTROL "��", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 40, 240, 12 + PUSHBUTTON "��", IDCANCEL, 140, 60, 50, 15, WS_GROUP | WS_TABSTOP + PUSHBUTTON "��", ID_DWL_INSTALL, 200, 60, 50, 15, WS_GROUP | WS_TABSTOP } /* FIXME: This should be in shdoclc.dll */

1 0