wine-commits June 2009

wine-commits@winehq.org

5 participants
1115 discussions

Vincent Povirk : ole32: Fix crash when calling CreateStream on read only storage.
by Alexandre Julliard 01 Jun '09

01 Jun '09

Module: wine Branch: master Commit: 4a0901fb87a6272b65f69529411fe039f1c3e665 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a0901fb87a6272b65f695294… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri May 29 16:30:56 2009 -0500 ole32: Fix crash when calling CreateStream on read only storage. --- dlls/ole32/storage32.c | 4 ++++ dlls/ole32/tests/storage32.c | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 748eac8..d68f09f 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -979,6 +979,10 @@ static HRESULT WINAPI StorageBaseImpl_CreateStream( (grfMode & STGM_TRANSACTED)) return STG_E_INVALIDFUNCTION; + /* Can't create a stream on read-only storage */ + if ( STGM_ACCESS_MODE( This->openFlags ) == STGM_READ ) + return STG_E_ACCESSDENIED; + /* * Check that we're compatible with the parent's storage mode * if not in transacted mode diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 7d4fb30..f932765 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -1302,13 +1302,11 @@ void test_readonly(void) ok(hr == S_OK, "should succeed, res=%x\n", hr); if (SUCCEEDED(hr)) { -#if 0 /* crashes on Wine */ /* CreateStream on read-only storage, name exists */ hr = IStorage_CreateStream( stg2, streamW, STGM_CREATE | STGM_SHARE_EXCLUSIVE | STGM_READ, 0, 0, &stream ); ok(hr == STG_E_ACCESSDENIED, "should fail, res=%x\n", hr); if (SUCCEEDED(hr)) IStream_Release(stream); -#endif /* CreateStream on read-only storage, name does not exist */ hr = IStorage_CreateStream( stg2, storageW, STGM_CREATE | STGM_SHARE_EXCLUSIVE | STGM_READ, 0, 0, &stream );

1 0

Vincent Povirk : ole32: Add some tests for read only storage objects.
by Alexandre Julliard 01 Jun '09

01 Jun '09

Module: wine Branch: master Commit: 5aab52c9778d3a73e17b636dc3100c058b4da19a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5aab52c9778d3a73e17b636dc… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri May 29 16:27:30 2009 -0500 ole32: Add some tests for read only storage objects. --- dlls/ole32/tests/storage32.c | 81 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 81 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index da2d0aa..7d4fb30 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -1267,6 +1267,86 @@ static void test_access(void) DeleteFileA("winetest"); } +void test_readonly(void) +{ + IStorage *stg, *stg2, *stg3; + IStream *stream; + HRESULT hr; + static const WCHAR fileW[] = {'w','i','n','e','t','e','s','t',0}; + static const WCHAR storageW[] = {'s','t','o','r','a','g','e',0}; + static const WCHAR streamW[] = {'s','t','r','e','a','m',0}; + + hr = StgCreateDocfile( fileW, STGM_CREATE | STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, &stg); + ok(hr == S_OK, "should succeed, res=%x\n", hr); + if (SUCCEEDED(hr)) + { + hr = IStorage_CreateStorage( stg, storageW, STGM_CREATE | STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stg2 ); + ok(hr == S_OK, "should succeed, res=%x\n", hr); + if (SUCCEEDED(hr)) + { + hr = IStorage_CreateStream( stg2, streamW, STGM_CREATE | STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stream ); + ok(hr == S_OK, "should succeed, res=%x\n", hr); + if (SUCCEEDED(hr)) + IStream_Release(stream); + IStorage_Release(stg2); + } + IStorage_Release(stg); + } + + /* re-open read only */ + hr = StgOpenStorage( fileW, NULL, STGM_TRANSACTED | STGM_SHARE_DENY_NONE | STGM_READ, NULL, 0, &stg); + ok(hr == S_OK, "should succeed, res=%x\n", hr); + if (SUCCEEDED(hr)) + { + hr = IStorage_OpenStorage( stg, storageW, NULL, STGM_SHARE_EXCLUSIVE | STGM_READ, NULL, 0, &stg2 ); + ok(hr == S_OK, "should succeed, res=%x\n", hr); + if (SUCCEEDED(hr)) + { +#if 0 /* crashes on Wine */ + /* CreateStream on read-only storage, name exists */ + hr = IStorage_CreateStream( stg2, streamW, STGM_CREATE | STGM_SHARE_EXCLUSIVE | STGM_READ, 0, 0, &stream ); + ok(hr == STG_E_ACCESSDENIED, "should fail, res=%x\n", hr); + if (SUCCEEDED(hr)) + IStream_Release(stream); +#endif + + /* CreateStream on read-only storage, name does not exist */ + hr = IStorage_CreateStream( stg2, storageW, STGM_CREATE | STGM_SHARE_EXCLUSIVE | STGM_READ, 0, 0, &stream ); + ok(hr == STG_E_ACCESSDENIED, "should fail, res=%x\n", hr); + if (SUCCEEDED(hr)) + IStream_Release(stream); + +#if 0 /* crashes on Wine */ + /* CreateStorage on read-only storage, name exists */ + hr = IStorage_CreateStorage( stg2, streamW, STGM_CREATE | STGM_SHARE_EXCLUSIVE | STGM_READ, 0, 0, &stg3 ); + ok(hr == STG_E_FILEALREADYEXISTS, "should fail, res=%x\n", hr); + if (SUCCEEDED(hr)) + IStream_Release(stg3); +#endif + + /* CreateStorage on read-only storage, name does not exist */ + hr = IStorage_CreateStorage( stg2, storageW, STGM_CREATE | STGM_SHARE_EXCLUSIVE | STGM_READ, 0, 0, &stg3 ); + ok(hr == STG_E_ACCESSDENIED, "should fail, res=%x\n", hr); + if (SUCCEEDED(hr)) + IStream_Release(stg3); + + /* DestroyElement on read-only storage, name exists */ + hr = IStorage_DestroyElement( stg2, streamW ); + todo_wine ok(hr == STG_E_ACCESSDENIED, "should fail, res=%x\n", hr); + + /* DestroyElement on read-only storage, name does not exist */ + hr = IStorage_DestroyElement( stg2, storageW ); + todo_wine ok(hr == STG_E_ACCESSDENIED, "should fail, res=%x\n", hr); + + IStorage_Release(stg2); + } + + IStorage_Release(stg); + } + + DeleteFileA("winetest"); +} + START_TEST(storage32) { test_hglobal_storage_stat(); @@ -1280,4 +1360,5 @@ START_TEST(storage32) test_ReadClassStm(); test_access(); test_writeclassstg(); + test_readonly(); }

1 0

Alexandre Julliard : configure: Add checks for fnmatch support.
by Alexandre Julliard 01 Jun '09

01 Jun '09

Module: wine Branch: master Commit: 7d5e565b5a114de6d9e5a1a44d3ef73ed4bca6bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d5e565b5a114de6d9e5a1a44… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 1 12:51:54 2009 +0200 configure: Add checks for fnmatch support. --- configure | 4 ++++ configure.ac | 2 ++ include/config.h.in | 6 ++++++ programs/winemenubuilder/winemenubuilder.c | 6 ++++++ 4 files changed, 18 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 52a8130..4ed22e0 100755 --- a/configure +++ b/configure @@ -5780,6 +5780,7 @@ done + for ac_header in \ AudioUnit/AudioUnit.h \ Carbon/Carbon.h \ @@ -5799,6 +5800,7 @@ for ac_header in \ dlfcn.h \ elf.h \ float.h \ + fnmatch.h \ fontconfig/fontconfig.h \ getopt.h \ grp.h \ @@ -17988,6 +17990,7 @@ CFLAGS="$CFLAGS $BUILTINFLAG" + for ac_func in \ _pclose \ _popen \ @@ -18005,6 +18008,7 @@ for ac_func in \ epoll_create \ ffs \ finite \ + fnmatch \ fork \ fpclass \ fstatfs \ diff --git a/configure.ac b/configure.ac index beccbbd..2185331 100644 --- a/configure.ac +++ b/configure.ac @@ -275,6 +275,7 @@ AC_CHECK_HEADERS(\ dlfcn.h \ elf.h \ float.h \ + fnmatch.h \ fontconfig/fontconfig.h \ getopt.h \ grp.h \ @@ -1476,6 +1477,7 @@ AC_CHECK_FUNCS(\ epoll_create \ ffs \ finite \ + fnmatch \ fork \ fpclass \ fstatfs \ diff --git a/include/config.h.in b/include/config.h.in index c22d1f7..a36d1fb 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -93,6 +93,12 @@ /* Define to 1 if you have the <float.h> header file. */ #undef HAVE_FLOAT_H +/* Define to 1 if you have the `fnmatch' function. */ +#undef HAVE_FNMATCH + +/* Define to 1 if you have the <fnmatch.h> header file. */ +#undef HAVE_FNMATCH_H + /* Define to 1 if you have the <fontconfig/fontconfig.h> header file. */ #undef HAVE_FONTCONFIG_FONTCONFIG_H diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 2e87ca5..a86d207 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -64,7 +64,9 @@ #endif #include <errno.h> #include <stdarg.h> +#ifdef HAVE_FNMATCH_H #include <fnmatch.h> +#endif #define COBJMACROS @@ -1444,6 +1446,7 @@ static BOOL build_native_mime_types(const char *xdg_data_home, struct list **mim static BOOL match_glob(struct list *native_mime_types, const char *extension, char **match) { +#ifdef HAVE_FNMATCH struct xdg_mime_type *mime_type_entry; int matchLength = 0; @@ -1467,6 +1470,9 @@ static BOOL match_glob(struct list *native_mime_types, const char *extension, if (*match == NULL) return FALSE; } +#else + *match = NULL; +#endif return TRUE; }

1 0

Vitaliy Margolen : winecfg: Update WinXP version to SP3.
by Alexandre Julliard 01 Jun '09

01 Jun '09

Module: wine Branch: master Commit: 1e4b401a980f22a01913e1572d8e3091da9f2e60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e4b401a980f22a01913e1572… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun May 31 15:21:00 2009 -0600 winecfg: Update WinXP version to SP3. --- dlls/ntdll/version.c | 4 ++-- programs/winecfg/appdefaults.c | 2 +- tools/wine.inf.in | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index d43a5b6..24531aa 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -128,8 +128,8 @@ static const RTL_OSVERSIONINFOEXW VersionData[NB_WINDOWS_VERSIONS] = /* WINXP */ { sizeof(RTL_OSVERSIONINFOEXW), 5, 1, 0xA28, VER_PLATFORM_WIN32_NT, - {'S','e','r','v','i','c','e',' ','P','a','c','k',' ','2',0}, - 2, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 30 /* FIXME: Great, a reserved field with a value! */ + {'S','e','r','v','i','c','e',' ','P','a','c','k',' ','3',0}, + 3, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 30 /* FIXME: Great, a reserved field with a value! */ }, /* WIN2K3 */ { diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index 8e48949..4df2a4a 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -51,7 +51,7 @@ static const struct { "win2008", "Windows 2008", 6, 0, 0x1771,VER_PLATFORM_WIN32_NT, "Service Pack 1", 0, 0, "ServerNT"}, { "vista", "Windows Vista", 6, 0, 0x1770,VER_PLATFORM_WIN32_NT, " ", 0, 0, "WinNT"}, { "win2003", "Windows 2003", 5, 2, 0xECE, VER_PLATFORM_WIN32_NT, "Service Pack 1", 1, 0, "ServerNT"}, - { "winxp", "Windows XP", 5, 1, 0xA28, VER_PLATFORM_WIN32_NT, "Service Pack 2", 2, 0, "WinNT"}, + { "winxp", "Windows XP", 5, 1, 0xA28, VER_PLATFORM_WIN32_NT, "Service Pack 3", 3, 0, "WinNT"}, { "win2k", "Windows 2000", 5, 0, 0x893, VER_PLATFORM_WIN32_NT, "Service Pack 4", 4, 0, "WinNT"}, { "winme", "Windows ME", 4, 90, 0xBB8, VER_PLATFORM_WIN32_WINDOWS, " ", 0, 0, ""}, { "win98", "Windows 98", 4, 10, 0x8AE, VER_PLATFORM_WIN32_WINDOWS, " A ", 0, 0, ""}, diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 25cec58..ccae9b9 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2929,9 +2929,9 @@ HKLM,"System\CurrentControlSet\Services\VxD\MSTCP",,,"" [VersionInfo] HKLM,%CurrentVersionNT%,"CurrentVersion",2,"5.1" -HKLM,%CurrentVersionNT%,"CSDVersion",2,"Service Pack 2" +HKLM,%CurrentVersionNT%,"CSDVersion",2,"Service Pack 3" HKLM,%CurrentVersionNT%,"CurrentBuildNumber",2,"2600" HKLM,%CurrentVersionNT%,"CurrentType",2,"Uniprocessor Free" HKLM,%Control%\ProductOptions,"ProductType",2,"WinNT" -HKLM,%Control%\Windows,"CSDVersion",0x10003,0x200 +HKLM,%Control%\Windows,"CSDVersion",0x10003,0x300 HKLM,%Control%\Session Manager\Environment,"OS",2,"Windows_NT"

1 0

Yuriy Kaminskiy : dsound: Fix segv on use-after-free in IDirectSoundNotifyImpl_Release.
by Alexandre Julliard 01 Jun '09

01 Jun '09

Module: wine Branch: master Commit: cb93f15e32230d29637492be78d410d46e73d7ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb93f15e32230d29637492be7… Author: Yuriy Kaminskiy <yumkam(a)mail.ru> Date: Sat May 30 20:59:13 2009 +0400 dsound: Fix segv on use-after-free in IDirectSoundNotifyImpl_Release. --- dlls/dsound/buffer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index 251c436..2d64341 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -82,8 +82,8 @@ static ULONG WINAPI IDirectSoundNotifyImpl_Release(LPDIRECTSOUNDNOTIFY iface) TRACE("(%p) ref was %d\n", This, ref + 1); if (!ref) { - IDirectSoundBuffer_Release((LPDIRECTSOUNDBUFFER)This->dsb); This->dsb->notify = NULL; + IDirectSoundBuffer_Release((LPDIRECTSOUNDBUFFER)This->dsb); HeapFree(GetProcessHeap(), 0, This); TRACE("(%p) released\n", This); }

1 0

Paul Vriens : winmm/tests: Remove an unreliable test.
by Alexandre Julliard 01 Jun '09

01 Jun '09

Module: wine Branch: master Commit: 1aa71ea39e31ecd87025e96d60c0640ca53e78bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=1aa71ea39e31ecd87025e96d6… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sat May 30 20:43:31 2009 +0200 winmm/tests: Remove an unreliable test. --- dlls/winmm/tests/wave.c | 10 +--------- 1 files changed, 1 insertions(+), 9 deletions(-) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 6430667..b509f74 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -604,7 +604,6 @@ static void wave_out_test_deviceOut(int device, double duration, DWORD nSamplesPerSec = pwfx->nSamplesPerSec; BOOL has_volume = pcaps->dwSupport & WAVECAPS_VOLUME ? TRUE : FALSE; double paused = 0.0; - DWORD actual; DWORD_PTR callback = 0; DWORD_PTR callback_instance = 0; HANDLE thread = 0; @@ -724,7 +723,7 @@ static void wave_out_test_deviceOut(int device, double duration, } if (interactive && rc==MMSYSERR_NOERROR) { - DWORD start,end; + DWORD start; trace("Playing %g second %s at %5dx%2dx%d %2d header%s %d loop%s %d bytes %s %s\n",duration, sine ? "440Hz tone" : "silence",pwfx->nSamplesPerSec, pwfx->wBitsPerSample,pwfx->nChannels, headers, headers > 1 ? "s": " ", @@ -791,13 +790,6 @@ static void wave_out_test_deviceOut(int device, double duration, } } - /* Check the sound duration was at least 90% of the expected value */ - end=GetTickCount(); - actual = end - start; - trace("sound duration=%u ms\n",actual); - ok(actual > 900 * (duration+paused), - "The sound played for %u ms instead of %g ms\n", - actual,1000*(duration+paused)); for (i = 0; i < headers; i++) { ok(frags[i].dwFlags==(WHDR_DONE|WHDR_PREPARED), "WHDR_DONE WHDR_PREPARED expected, got %s\n",

1 0

Paul Vriens : user32: Fix Dutch translations.
by Alexandre Julliard 01 Jun '09

01 Jun '09

Module: wine Branch: master Commit: 37bba53eb7f75ad6b24c8cac1eec3d5bc2fee559 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37bba53eb7f75ad6b24c8cac1… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sat May 30 20:36:13 2009 +0200 user32: Fix Dutch translations. --- dlls/user32/resources/user32_Nl.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/resources/user32_Nl.rc b/dlls/user32/resources/user32_Nl.rc index 3993ab5..2df1b74 100644 --- a/dlls/user32/resources/user32_Nl.rc +++ b/dlls/user32/resources/user32_Nl.rc @@ -58,8 +58,8 @@ BEGIN PUSHBUTTON "N&egeer", 5, 208, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "&Ja", 6, 256, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "&Nee", 7, 304, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Try Again", 10, 352, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Continue", 11, 400, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Probeer opnieuw", 10, 352, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Verder", 11, 400, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "Help", 9, 448, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END

1 0

Paul Vriens : shell32: Fix Dutch translations.
by Alexandre Julliard 01 Jun '09

01 Jun '09

Module: wine Branch: master Commit: c579ebdff6358504d8bde9a786e3a8f88d21856b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c579ebdff6358504d8bde9a78… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sat May 30 20:34:04 2009 +0200 shell32: Fix Dutch translations. --- dlls/shell32/shell32_Nl.rc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shell32_Nl.rc b/dlls/shell32/shell32_Nl.rc index 71a0545..1de7bf0 100644 --- a/dlls/shell32/shell32_Nl.rc +++ b/dlls/shell32/shell32_Nl.rc @@ -84,7 +84,7 @@ BEGIN MENUITEM "K&nippen", FCIDM_SHVIEW_CUT MENUITEM "&Kopieren", FCIDM_SHVIEW_COPY MENUITEM SEPARATOR - MENUITEM "Creeer &Link", FCIDM_SHVIEW_CREATELINK + MENUITEM "Creëer &Link", FCIDM_SHVIEW_CREATELINK MENUITEM "Ver&wijder", FCIDM_SHVIEW_DELETE MENUITEM "&Hernoemen", FCIDM_SHVIEW_RENAME MENUITEM SEPARATOR @@ -110,7 +110,7 @@ BEGIN POPUP "&Help" BEGIN - MENUITEM "&About Control Panel...", IDM_CPANEL_ABOUT + MENUITEM "&Over Controle Paneel...", IDM_CPANEL_ABOUT END END @@ -210,7 +210,7 @@ STRINGTABLE IDS_DESKTOP "Bureaublad" IDS_MYCOMPUTER "Mijn Computer" IDS_RECYCLEBIN_FOLDER_NAME "Vuilnisbak" - IDS_CONTROLPANEL "Control Panel" + IDS_CONTROLPANEL "Controle Paneel" /* context menus */ IDS_VIEW_LARGE "Grote Icons"

1 0

Paul Vriens : appwiz.cpl: Fix Dutch translations.
by Alexandre Julliard 01 Jun '09

01 Jun '09

Module: wine Branch: master Commit: dd9ef1206866b9b95757946e11821379b52554f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd9ef1206866b9b95757946e1… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sat May 30 20:28:44 2009 +0200 appwiz.cpl: Fix Dutch translations. --- dlls/appwiz.cpl/Nl.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/appwiz.cpl/Nl.rc b/dlls/appwiz.cpl/Nl.rc index 4abee57..62a82f4 100644 --- a/dlls/appwiz.cpl/Nl.rc +++ b/dlls/appwiz.cpl/Nl.rc @@ -40,11 +40,11 @@ STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMEN CAPTION "Installeren/Verwijderen" FONT 8, "MS Shell Dlg" { - 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 "Om een programma te installeren vanaf een floppy disk, CD-ROM drive, of uw hard disk, klik 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 "De volgende software kan automatisch verwijderd worden. Om het programma te verwijderen of de geïnstalleerde 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

1 0

Paul Vriens : oleacc: Fix Dutch translations.
by Alexandre Julliard 01 Jun '09

01 Jun '09

Module: wine Branch: master Commit: f5c00f7ff39ebbf6528edcc7be80aa5ff54188b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5c00f7ff39ebbf6528edcc7b… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sat May 30 20:25:03 2009 +0200 oleacc: Fix Dutch translations. --- dlls/oleacc/oleacc_Nl.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleacc/oleacc_Nl.rc b/dlls/oleacc/oleacc_Nl.rc index b639128..1dce053 100644 --- a/dlls/oleacc/oleacc_Nl.rc +++ b/dlls/oleacc/oleacc_Nl.rc @@ -76,8 +76,8 @@ STRINGTABLE DISCARDABLE ROLE_SYSTEM_SLIDER "schuifknop" ROLE_SYSTEM_SPINBUTTON "spin box" ROLE_SYSTEM_DIAGRAM "diagram" - ROLE_SYSTEM_ANIMATION "animation" - ROLE_SYSTEM_EQUATION "formula" + ROLE_SYSTEM_ANIMATION "animatie" + ROLE_SYSTEM_EQUATION "formule" ROLE_SYSTEM_BUTTONDROPDOWN "dropdown knop" ROLE_SYSTEM_BUTTONMENU "menu knop" ROLE_SYSTEM_BUTTONDROPDOWNGRID "dropdown grid knop"

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2009