May 2006 - Wine-Commits - list.winehq.org

Robert Reif : winmm: Add multiple header wave tests.
by Alexandre Julliard May 30, 2006

May 30, 2006

Module: wine Branch: refs/heads/master Commit: fe2becaee3f3f2cb0bee8b8336ccb7bae952e607 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fe2becaee3f3f2cb0bee8b8… Author: Robert Reif <reif(a)earthlink.net> Date: Sun May 28 16:50:09 2006 -0400 winmm: Add multiple header wave tests. The current wave tests only use a single header for playback. Tests have been added to use multiple headers and to reuse them. This is how streaming applications and direct sound use the wave api. --- dlls/winmm/tests/wave.c | 255 +++++++++++++++++++++++++++++++++++------------ 1 files changed, 191 insertions(+), 64 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=fe2becaee3f3f2cb0be…

1 0

Andrew Talbot : comctl32/tests: Write-strings warning fix.
by Alexandre Julliard May 28, 2006

May 28, 2006

Module: wine Branch: refs/heads/master Commit: b836d1f7c3c9e37a6c094f8734fb487c2520b03d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b836d1f7c3c9e37a6c094f8… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat May 27 18:14:52 2006 +0100 comctl32/tests: Write-strings warning fix. --- dlls/comctl32/tests/header.c | 19 +++++++++++-------- dlls/comctl32/tests/tab.c | 9 ++++++--- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c index 70860d9..178eac1 100644 --- a/dlls/comctl32/tests/header.c +++ b/dlls/comctl32/tests/header.c @@ -220,20 +220,21 @@ static void check_auto_format(void) { HDITEMA hdiCreate; HDITEMA hdiRead; + static CHAR text[] = "Test"; ZeroMemory(&hdiCreate, sizeof(HDITEMA)); /* Windows implicitly sets some format bits in INSERTITEM */ /* HDF_STRING is automaticaly set and cleared for no text */ hdiCreate.mask = HDI_TEXT|HDI_WIDTH|HDI_FORMAT; - hdiCreate.pszText = "Test"; + hdiCreate.pszText = text; hdiCreate.cxy = 100; hdiCreate.fmt=HDF_CENTER; addReadDelItem(hWndHeader, &hdiCreate, HDI_FORMAT, &hdiRead); ok(hdiRead.fmt == (HDF_STRING|HDF_CENTER), "HDF_STRING not set automatically (fmt=%x)\n", hdiRead.fmt); hdiCreate.mask = HDI_WIDTH|HDI_FORMAT; - hdiCreate.pszText = "Test"; + hdiCreate.pszText = text; hdiCreate.fmt = HDF_CENTER|HDF_STRING; addReadDelItem(hWndHeader, &hdiCreate, HDI_FORMAT, &hdiRead); ok(hdiRead.fmt == (HDF_CENTER), "HDF_STRING should be automatically cleared (fmt=%x)\n", hdiRead.fmt); @@ -273,20 +274,21 @@ static void check_auto_fields(void) { HDITEMA hdiCreate; HDITEMA hdiRead; + static CHAR text[] = "Test"; LRESULT res; /* Windows stores the format, width, lparam even if they are not in the item's mask */ ZeroMemory(&hdiCreate, sizeof(HDITEMA)); hdiCreate.mask = HDI_TEXT; hdiCreate.cxy = 100; - hdiCreate.pszText = "Test"; + hdiCreate.pszText = text; addReadDelItem(hWndHeader, &hdiCreate, HDI_WIDTH, &hdiRead); TEST_GET_ITEMCOUNT(6); ok(hdiRead.cxy == hdiCreate.cxy, "cxy should be automatically set\n"); ZeroMemory(&hdiCreate, sizeof(HDITEMA)); hdiCreate.mask = HDI_TEXT; - hdiCreate.pszText = "Test"; + hdiCreate.pszText = text; hdiCreate.lParam = 0x12345678; addReadDelItem(hWndHeader, &hdiCreate, HDI_LPARAM, &hdiRead); TEST_GET_ITEMCOUNT(6); @@ -294,7 +296,7 @@ static void check_auto_fields(void) ZeroMemory(&hdiCreate, sizeof(HDITEMA)); hdiCreate.mask = HDI_TEXT; - hdiCreate.pszText = "Test"; + hdiCreate.pszText = text; hdiCreate.fmt = HDF_STRING|HDF_CENTER; addReadDelItem(hWndHeader, &hdiCreate, HDI_FORMAT, &hdiRead); TEST_GET_ITEMCOUNT(6); @@ -303,7 +305,7 @@ static void check_auto_fields(void) /* others fields are not set */ ZeroMemory(&hdiCreate, sizeof(HDITEMA)); hdiCreate.mask = HDI_TEXT; - hdiCreate.pszText = "Test"; + hdiCreate.pszText = text; hdiCreate.hbm = CreateBitmap(16, 16, 1, 8, NULL); addReadDelItem(hWndHeader, &hdiCreate, HDI_BITMAP, &hdiRead); TEST_GET_ITEMCOUNT(6); @@ -313,7 +315,7 @@ static void check_auto_fields(void) ZeroMemory(&hdiCreate, sizeof(HDITEMA)); hdiCreate.mask = HDI_IMAGE; hdiCreate.iImage = 17; - hdiCreate.pszText = "Test"; + hdiCreate.pszText = text; addReadDelItem(hWndHeader, &hdiCreate, HDI_TEXT, &hdiRead); TEST_GET_ITEMCOUNT(6); ok(hdiRead.pszText==NULL, "pszText shouldn't be automatically set\n"); @@ -324,13 +326,14 @@ static void check_auto_fields(void) static void check_mask() { HDITEMA hdi; + static CHAR text[] = "ABC"; LRESULT ret; /* don't create items if the mask is zero */ ZeroMemory(&hdi, sizeof(hdi)); hdi.mask = 0; hdi.cxy = 200; - hdi.pszText = "ABC"; + hdi.pszText = text; hdi.fmt = 0; hdi.iOrder = 0; hdi.lParam = 17; diff --git a/dlls/comctl32/tests/tab.c b/dlls/comctl32/tests/tab.c index 4454472..d5901c0 100644 --- a/dlls/comctl32/tests/tab.c +++ b/dlls/comctl32/tests/tab.c @@ -57,6 +57,9 @@ create_tabcontrol (DWORD style, DWORD ma { HWND handle; TCITEM tcNewTab; + static char text1[] = "Tab 1", + text2[] = "Wide Tab 2", + text3[] = "T 3"; handle = CreateWindow ( WC_TABCONTROLA, @@ -71,13 +74,13 @@ create_tabcontrol (DWORD style, DWORD ma SendMessage (handle, WM_SETFONT, 0, (LPARAM) hFont); tcNewTab.mask = mask; - tcNewTab.pszText = "Tab 1"; + tcNewTab.pszText = text1; tcNewTab.iImage = 0; SendMessage (handle, TCM_INSERTITEM, 0, (LPARAM) &tcNewTab); - tcNewTab.pszText = "Wide Tab 2"; + tcNewTab.pszText = text2; tcNewTab.iImage = 1; SendMessage (handle, TCM_INSERTITEM, 1, (LPARAM) &tcNewTab); - tcNewTab.pszText = "T 3"; + tcNewTab.pszText = text3; tcNewTab.iImage = 2; SendMessage (handle, TCM_INSERTITEM, 2, (LPARAM) &tcNewTab);

1 0

Detlef Riekenberg : winspool/tests: Use 0xdeadbeef as magic value.
by Alexandre Julliard May 28, 2006

May 28, 2006

Module: wine Branch: refs/heads/master Commit: e073887c0f78d02a9c800e74f3fd1d97cbe8ba28 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e073887c0f78d02a9c800e7… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sat May 27 12:09:52 2006 +0200 winspool/tests: Use 0xdeadbeef as magic value. --- dlls/winspool.drv/tests/info.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index b7ccf6a..09a1a16 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -29,7 +29,7 @@ #include "winuser.h" #include "winreg.h" #include "winspool.h" -#define MAGIC_DEAD 0x00dead00 +#define MAGIC_DEAD 0xdeadbeef #define DEFAULT_PRINTER_SIZE 1000 static char env_x86[] = "Windows NT x86";

1 0

Detlef Riekenberg : DEVELOPER-HINTS: Some directories are renamed / removed / added.
by Alexandre Julliard May 28, 2006

May 28, 2006

Module: wine Branch: refs/heads/master Commit: 46fc401b05fbb96471278dff1e5c8e7687184fa0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=46fc401b05fbb96471278df… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sat May 27 17:47:28 2006 +0200 DEVELOPER-HINTS: Some directories are renamed / removed / added. --- DEVELOPERS-HINTS | 27 +++++++++++++++++---------- 1 files changed, 17 insertions(+), 10 deletions(-) diff --git a/DEVELOPERS-HINTS b/DEVELOPERS-HINTS index 2e24e96..c329936 100644 --- a/DEVELOPERS-HINTS +++ b/DEVELOPERS-HINTS @@ -27,7 +27,7 @@ DLLs (under dlls/): cfgmgr32/ - Config manager comcat/ - Component category manager comctl32/ - Common controls - commdlg/ - Common dialog boxes (both 16 & 32 bit) + comdlg32/ - Common dialog boxes (both 16 & 32 bit) crtdll/ - Old C runtime library crypt32/ - Cryptography cryptdll/ - Cryptography Manager @@ -80,12 +80,15 @@ DLLs (under dlls/): mciavi32/ - MCI video driver mcicda/ - MCI audio CD driver mciseq/ - MCI MIDI driver + mciwave/ - MCI wave driver midimap/ - MIDI mapper mlang/ - Multi Language Support mmdevldr.vxd/ - MMDEVLDR VxD implementation monodebg.vxd/ - MONODEBG VxD implementation mpr/ - Multi-Protocol Router (networking) - msacm/ - Audio Compression Manager (multimedia) + mprapi/ - Multi-Protocol Router Administration + msacm32/ - Audio Compression Manager (multimedia) + msacm32.drv/ - Audio mapper msadp32.acm/ - MS ADPCM Audio Codec mscms/ - Color Management System msdmo/ - DirectX Media Objects @@ -94,7 +97,7 @@ DLLs (under dlls/): mshtml/ - MS HTML component msi/ - Microsoft Installer msimg32/ - Gradient and transparency (graphics) - msisys/ - System information + msisys.ocx/ - System information msnet32/ - Network interface msrle32/ - Video codecs msvcrt/ - C runtime library @@ -108,6 +111,7 @@ DLLs (under dlls/): netapi32/ - Network interface newdev/ - New Hardware Device Library ntdll/ - NT implementation of kernel calls + ntdsapi/ - NT Directory Service Provider objsel/ - Object Picker Dialog odbc32/ - Open DataBase Connectivity driver manager odbccp32/ - Open DataBase Connectivity driver installer @@ -125,7 +129,7 @@ DLLs (under dlls/): quartz/ - DirectShow runtime rasapi32/ - Remote Access Server interface riched20/ - Rich text editing control (Version 2.0 and 3.0) - richedit/ - Rich text editing control + riched32/ - Rich text editing control rpcrt4/ - Remote Procedure Call runtime rsabase/ - RSA encryption rsaenh/ - Crypto API (DES, 3DES, RSA, etc.) @@ -165,12 +169,10 @@ DLLs (under dlls/): wined3d/ - Wine internal Direct3D helper winedos/ - DOS features and BIOS calls (Wine specific) winemp3.acm/ - Mpeg Layer 3 Audio Codec - wineps/ - Postscript driver (Wine specific) + wineps.drv/ - Postscript driver (Wine specific) wininet/ - Internet extensions winmm/ - Multimedia (16 & 32 bit) winmm/joystick/ - Joystick driver - winmm/mciwave/ - MCI wave driver - winmm/wavemap/ - Audio mapper winmm/winealsa/ - ALSA audio driver winmm/winearts/ - aRts audio driver winmm/wineaudioio/ - audioio audio driver @@ -178,7 +180,7 @@ DLLs (under dlls/): winmm/winenas/ - NAS audio driver winmm/wineoss/ - OSS audio driver winnls32/ - National Language Support - winspool/ - Printing & Print Spooler + winspool.drv/ - Printing & Print Spooler wintab32/ - Tablet device interface wintrust/ - Trust verification interface wldap32/ - LDAP support @@ -192,11 +194,15 @@ DLLs (under dlls/): Winelib programs (under programs/): ----------------------------------- - avitools/ - AVI information viewer and player clock/ - Graphical clock cmdlgtst/ - Common dialog tests control/ - Control panel + eject/ - Unmount and eject removable Media expand/ - Decompress Lempel-Ziv compressed archive + explorer/ - Desktop/Systray/HAL-Manager, Winefile-wrapper + hh/ - HTML Help viewer + icinfo/ - List/Configure installed Video Compressors + iexplore/ - Internet Explorer replacement msiexec/ - Microsoft Installer frontend notepad/ - Notepad replacement progman/ - Program manager @@ -210,6 +216,7 @@ Winelib programs (under programs/): view/ - Metafile viewer wcmd/ - Command line interface wineboot/ - Wine bootstrap process + winebrowser/ - Frontend for Webbrowsers on the Host winecfg/ - Wine configuration utility wineconsole/ - Console winedbg/ - Debugger @@ -221,6 +228,7 @@ Winelib programs (under programs/): winevdm/ - Wine virtual DOS machine winhelp/ - Help viewer winver/ - Windows Version Program + wordpad/ - Wordpad replacement skeleton Support programs, libraries, etc: @@ -249,7 +257,6 @@ Support programs, libraries, etc: tools/winedump/ - a .DLL dump utility tools/winegcc/ - a MinGW command line compatible gcc wrapper tools/wmc/ - the message compiler - tools/wpp/ - the C pre-processor library tools/wrc/ - the resource compiler

1 0

Detlef Riekenberg : winspool: Documentation for GetPrintProcessorDirectory.
by Alexandre Julliard May 28, 2006

May 28, 2006

Module: wine Branch: refs/heads/master Commit: aff1b33192c2396599959cd3383118c91c22ed5f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=aff1b33192c2396599959cd… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sat May 27 00:30:58 2006 +0200 winspool: Documentation for GetPrintProcessorDirectory. --- dlls/winspool.drv/info.c | 35 +++++++++++++++++++++++++++++++++++ 1 files changed, 35 insertions(+), 0 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index ed12be6..12bc975 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -1825,6 +1825,14 @@ end: /***************************************************************************** * GetPrintProcessorDirectoryA [WINSPOOL.@] + * + * Return the PATH for the Print-Processors + * + * See GetPrintProcessorDirectoryW. + * + * NOTES + * On NT, the returned ANSI-Data need the same Size as the Unicode-Version + * */ BOOL WINAPI GetPrintProcessorDirectoryA(LPSTR server, LPSTR env, DWORD level, LPBYTE Info, @@ -1837,6 +1845,33 @@ BOOL WINAPI GetPrintProcessorDirectoryA( /***************************************************************************** * GetPrintProcessorDirectoryW [WINSPOOL.@] + * + * Return the PATH for the Print-Processors + * + * PARAMS + * server [I] Servername (NT only) or NULL (local Computer) + * env [I] Printing-Environment (see below) or NULL (Default) + * level [I] Structure-Level (must be 1) + * Info [O] PTR to Buffer that receives the Result + * cbBuf [I] Size of Buffer at "Info" + * needed [O] PTR to DWORD that receives the size in Bytes used / + * required for the Buffer at "Info" + * + * RETURNS + * Success: TRUE and in pcbNeeded the Bytes used in pPrintProcessorInfo + * Failure: FALSE and in pcbNeeded the Bytes required for pPrintProcessorInfo, + * if cbBuf is too small + * + * Native Values returned in pPrintProcessorInfo on Success: + *| NT(Windows NT x86): "%winsysdir%\\spool\\PRTPROCS\\w32x86" + *| NT(Windows 4.0): "%winsysdir%\\spool\\PRTPROCS\\win40" + *| win9x(Windows 4.0): "%winsysdir%" + * + * "%winsysdir%" is the Value from GetSystemDirectoryW() + * + * BUGS + *- Only NULL or "" is supported for pName + * */ BOOL WINAPI GetPrintProcessorDirectoryW(LPWSTR server, LPWSTR env, DWORD level, LPBYTE Info,

1 0

Alexandre Julliard : server: Return an error for invalid requests instead of killing the client process .
by Alexandre Julliard May 28, 2006

May 28, 2006

Module: wine Branch: refs/heads/master Commit: 4ec9e110b0c7d9966382d6d3ace1fa28ea6c1085 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4ec9e110b0c7d9966382d6d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun May 28 18:27:02 2006 +0200 server: Return an error for invalid requests instead of killing the client process. --- server/request.c | 28 +++++++++++++++------------- 1 files changed, 15 insertions(+), 13 deletions(-) diff --git a/server/request.c b/server/request.c index c1a32f1..c6b4472 100644 --- a/server/request.c +++ b/server/request.c @@ -52,9 +52,12 @@ #ifdef HAVE_POLL_H #include <poll.h> #endif +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" #include "wincon.h" +#include "winternl.h" #include "wine/library.h" #include "file.h" @@ -277,23 +280,22 @@ static void call_req_handler( struct thr if (debug_level) trace_request(); if (req < REQ_NB_REQUESTS) - { req_handlers[req]( &current->req, &reply ); - if (current) + else + set_error( STATUS_NOT_IMPLEMENTED ); + + if (current) + { + if (current->reply_fd) { - if (current->reply_fd) - { - reply.reply_header.error = current->error; - reply.reply_header.reply_size = current->reply_size; - if (debug_level) trace_reply( req, &reply ); - send_reply( &reply ); - } - else fatal_protocol_error( current, "no reply fd for request %d\n", req ); + reply.reply_header.error = current->error; + reply.reply_header.reply_size = current->reply_size; + if (debug_level) trace_reply( req, &reply ); + send_reply( &reply ); } - current = NULL; - return; + else fatal_protocol_error( current, "no reply fd for request %d\n", req ); } - fatal_protocol_error( current, "bad request %d\n", req ); + current = NULL; } /* read a request from a thread */

1 0

Alexandre Julliard : user: Fixed WM_ACTIVATEAPP mapping with null task handle.
by Alexandre Julliard May 28, 2006

May 28, 2006

Module: wine Branch: refs/heads/master Commit: ee48e1e3d5aed434f9457d74ef15bb164cf65407 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ee48e1e3d5aed434f9457d7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun May 28 18:26:32 2006 +0200 user: Fixed WM_ACTIVATEAPP mapping with null task handle. --- dlls/user/winproc.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/user/winproc.c b/dlls/user/winproc.c index b993597..0c1f36f 100644 --- a/dlls/user/winproc.c +++ b/dlls/user/winproc.c @@ -1520,7 +1520,8 @@ LRESULT WINPROC_CallProc16To32A( winproc /* We need this when SetActiveWindow sends a Sendmessage16() to * a 32bit window. Might be superflous with 32bit interprocess * message queues. */ - ret = callback( hwnd32, msg, wParam, HTASK_32(lParam), result, arg ); + if (lParam) lParam = HTASK_32(lParam); + ret = callback( hwnd32, msg, wParam, lParam, result, arg ); break; case WM_DDE_INITIATE: case WM_DDE_TERMINATE:

1 0

Alexandre Julliard : Make.rules: Define datarootdir to avoid a configure warning.
by Alexandre Julliard May 28, 2006

May 28, 2006

Module: wine Branch: refs/heads/master Commit: 749841148f44423df2714c0ad6fb4417792bc4ea URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=749841148f44423df2714c0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun May 28 18:16:38 2006 +0200 Make.rules: Define datarootdir to avoid a configure warning. --- Make.rules.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 9deee72..9af2d3e 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -98,6 +98,7 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ bindir = @bindir@ libdir = @libdir@ +datarootdir = @datarootdir@ datadir = @datadir@ infodir = @infodir@ mandir = @mandir@

1 0

Frank Richter : shdocvw: Install Mozilla control silently.
by Alexandre Julliard May 28, 2006

May 28, 2006

Module: wine Branch: refs/heads/master Commit: ea4f92bdd950afb2bafb49bb123b4c482d43d6b4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ea4f92bdd950afb2bafb49b… Author: Frank Richter <frank.richter(a)gmail.com> Date: Sun May 28 04:12:23 2006 +0200 shdocvw: Install Mozilla control silently. --- dlls/shdocvw/shdocvw_main.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/shdocvw_main.c b/dlls/shdocvw/shdocvw_main.c index f559e99..569d3a2 100644 --- a/dlls/shdocvw/shdocvw_main.c +++ b/dlls/shdocvw/shdocvw_main.c @@ -299,7 +299,9 @@ static DWORD WINAPI ThreadFunc( LPVOID i IBindStatusCallback *dl; static const WCHAR szUrlVal[] = {'M','o','z','i','l','l','a','U','r','l',0}; static const WCHAR szFileProtocol[] = {'f','i','l','e',':','/','/','/',0}; + static const WCHAR szSilentParameter[] = {' ','/','S',0}; WCHAR path[MAX_PATH], szUrl[MAX_PATH]; + WCHAR szCommandLine[MAX_PATH+(sizeof( szSilentParameter )/sizeof( WCHAR ))]; LPWSTR p; STARTUPINFOW si; PROCESS_INFORMATION pi; @@ -347,7 +349,9 @@ static DWORD WINAPI ThreadFunc( LPVOID i /* run it */ memset( &si, 0, sizeof si ); si.cb = sizeof si; - r = CreateProcessW( path, NULL, NULL, NULL, 0, 0, NULL, NULL, &si, &pi ); + strcpyW( szCommandLine, path ); + strcatW( szCommandLine, szSilentParameter ); + r = CreateProcessW( path, szCommandLine, NULL, NULL, 0, 0, NULL, NULL, &si, &pi ); if( !r ) goto end; WaitForSingleObject( pi.hProcess, INFINITE );

1 0

Frank Richter : shdocvw: Improve German translation.
by Alexandre Julliard May 28, 2006

May 28, 2006

Module: wine Branch: refs/heads/master Commit: 9fee0afe02963c8eadc35a10363f9415274d9f0e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9fee0afe02963c8eadc35a1… Author: Frank Richter <frank.richter(a)gmail.com> Date: Sun May 28 04:10:33 2006 +0200 shdocvw: Improve German translation. --- dlls/shdocvw/De.rc | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/shdocvw/De.rc b/dlls/shdocvw/De.rc index 790b9da..6d3e75a 100644 --- a/dlls/shdocvw/De.rc +++ b/dlls/shdocvw/De.rc @@ -20,7 +20,7 @@ LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT 100 DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 62 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Lade die Mozilla Active X Steuerung" +CAPTION "Lade das Mozilla ActiveX-Steuerelement" FONT 8, "MS Shell Dlg" { CONTROL "Progress1",1000,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10,200,12 @@ -30,7 +30,7 @@ FONT 8, "MS Shell Dlg" STRINGTABLE BEGIN - 1001 "Diese Anwendung fordert ein ActiveX Browser Objekt an,\n" \ - "aber die Mozilla Active X Steuerung ist nicht installiert." \ - "M�chten Sie, dass es aus dem Internet geladen und installiert wird ?" + 1001 "Diese Anwendung fordert ein Browser-ActiveX-Objekt an, " \ + "aber das Mozilla ActiveX-Steuerelement ist nicht installiert.\n" \ + "M�chten Sie, dass es aus dem Internet geladen und installiert wird?" END

1 0