- wine-devel - winehq.org

[PATCH] mfplat: Implement MFGetService()
by Nikolay Sivov 20 Dec '17

20 Dec '17

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- For https://bugs.winehq.org/show_bug.cgi?id=44201 dlls/mf/main.c | 23 ++++++++++ dlls/mf/mf.spec | 2 +- dlls/mf/tests/mf.c | 128 +++++++++++++++++++++++++++++++++++++++++++++++++++++ include/mfidl.idl | 1 + 4 files changed, 153 insertions(+), 1 deletion(-) diff --git a/dlls/mf/main.c b/dlls/mf/main.c index 2ad2e5d37b..73cd6aa3f1 100644 --- a/dlls/mf/main.c +++ b/dlls/mf/main.c @@ -20,6 +20,8 @@ #include <stdarg.h> +#define COBJMACROS + #include "windef.h" #include "winbase.h" #include "mfidl.h" @@ -51,3 +53,24 @@ HRESULT WINAPI MFGetSupportedMimeTypes(PROPVARIANT *array) return E_NOTIMPL; } + +/*********************************************************************** + * MFGetService (mf.@) + */ +HRESULT WINAPI MFGetService(IUnknown *object, REFGUID service, REFIID riid, void **obj) +{ + IMFGetService *gs; + HRESULT hr; + + TRACE("(%p, %s, %s, %p)\n", object, debugstr_guid(service), debugstr_guid(riid), obj); + + if (!object) + return E_POINTER; + + if (FAILED(hr = IUnknown_QueryInterface(object, &IID_IMFGetService, (void **)&gs))) + return hr; + + hr = IMFGetService_GetService(gs, service, riid, obj); + IMFGetService_Release(gs); + return hr; +} diff --git a/dlls/mf/mf.spec b/dlls/mf/mf.spec index 54fa1f3dbe..deb9057153 100644 --- a/dlls/mf/mf.spec +++ b/dlls/mf/mf.spec @@ -72,7 +72,7 @@ @ stub MFCreateWMVEncoderActivate @ stub MFEnumDeviceSources @ stub MFGetMultipleServiceProviders -@ stub MFGetService +@ stdcall MFGetService(ptr ptr ptr ptr) @ stdcall MFGetSupportedMimeTypes(ptr) @ stub MFGetSupportedSchemes @ stub MFGetTopoNodeCurrentType diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index f28c6e048d..76e092aa80 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -26,6 +26,7 @@ #include "windef.h" #include "winbase.h" +#include "initguid.h" #include "mfidl.h" #include "wine/test.h" @@ -43,7 +44,134 @@ static void test_topology(void) IMFTopology_Release(topology); } +static HRESULT WINAPI test_getservice_QI(IMFGetService *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IMFGetService) || IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI test_getservice_AddRef(IMFGetService *iface) +{ + return 2; +} + +static ULONG WINAPI test_getservice_Release(IMFGetService *iface) +{ + return 1; +} + +static HRESULT WINAPI test_getservice_GetService(IMFGetService *iface, REFGUID service, REFIID riid, void **obj) +{ + *obj = (void *)0xdeadbeef; + return 0x83eddead; +} + +static const IMFGetServiceVtbl testmfgetservicevtbl = +{ + test_getservice_QI, + test_getservice_AddRef, + test_getservice_Release, + test_getservice_GetService, +}; + +static IMFGetService test_getservice = { &testmfgetservicevtbl }; + +static HRESULT WINAPI testservice_QI(IUnknown *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + return S_OK; + } + + *obj = NULL; + + if (IsEqualIID(riid, &IID_IMFGetService)) + return 0x82eddead; + + return E_NOINTERFACE; +} + +static HRESULT WINAPI testservice2_QI(IUnknown *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + return S_OK; + } + + if (IsEqualIID(riid, &IID_IMFGetService)) + { + *obj = &test_getservice; + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI testservice_AddRef(IUnknown *iface) +{ + return 2; +} + +static ULONG WINAPI testservice_Release(IUnknown *iface) +{ + return 1; +} + +static const IUnknownVtbl testservicevtbl = +{ + testservice_QI, + testservice_AddRef, + testservice_Release, +}; + +static const IUnknownVtbl testservice2vtbl = +{ + testservice2_QI, + testservice_AddRef, + testservice_Release, +}; + +static IUnknown testservice = { &testservicevtbl }; +static IUnknown testservice2 = { &testservice2vtbl }; + +static void test_MFGetService(void) +{ + IUnknown *unk; + HRESULT hr; + + hr = MFGetService(NULL, NULL, NULL, NULL); + ok(hr == E_POINTER, "Unexpected return value %#x.\n", hr); + + unk = (void *)0xdeadbeef; + hr = MFGetService(NULL, NULL, NULL, (void **)&unk); + ok(hr == E_POINTER, "Unexpected return value %#x.\n", hr); + ok(unk == (void *)0xdeadbeef, "Unexpected out object.\n"); + + hr = MFGetService(&testservice, NULL, NULL, NULL); + ok(hr == 0x82eddead, "Unexpected return value %#x.\n", hr); + + unk = (void *)0xdeadbeef; + hr = MFGetService(&testservice, NULL, NULL, (void **)&unk); + ok(hr == 0x82eddead, "Unexpected return value %#x.\n", hr); + ok(unk == (void *)0xdeadbeef, "Unexpected out object.\n"); + + unk = NULL; + hr = MFGetService(&testservice2, NULL, NULL, (void **)&unk); + ok(hr == 0x83eddead, "Unexpected return value %#x.\n", hr); + ok(unk == (void *)0xdeadbeef, "Unexpected out object.\n"); +} + START_TEST(mf) { test_topology(); + test_MFGetService(); } diff --git a/include/mfidl.idl b/include/mfidl.idl index 2792d383db..12b351d87b 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -256,3 +256,4 @@ cpp_quote("HRESULT WINAPI MFCreateStreamDescriptor(DWORD identifier, DWORD cMedi cpp_quote(" IMFMediaType **types, IMFStreamDescriptor **descriptor);") cpp_quote("HRESULT WINAPI MFCreateTopology(IMFTopology **topology);") cpp_quote("HRESULT WINAPI MFGetSupportedMimeTypes(PROPVARIANT *array);") +cpp_quote("HRESULT WINAPI MFGetService(IUnknown *object, REFGUID service, REFIID iid, void **obj);") -- 2.15.1

1 0

Issues with the registry font keys / entries
by Mihai Todor 20 Dec '17

20 Dec '17

Hi Everyone, I have spent some time trying to improve the font packages in Winetricks and I've run into a few issues with Wine that I hope someone can clarify. I agreed with Austin here https://github.com/Winetricks/winetricks/issues/896 that it would be best to get a wider audience on Wine Devel. First of all, there is some logic somewhere in Wine which automagically populates `HKCU\Software\Wine\Fonts\Cache` when font files are copied into `.wine/drive_c/windows/Fonts/`. The magic seems to be based on inotify, but I don't understand well enough how it works. However, there seems to be a race issue between apps like regedit and notepad and the above mechanism. For example, if I have the corefonts installers cached under `.cache/winetricks/` and I run `winetricks corefonts` and I start notepad immediately after, I notice that the new fonts are not available. Worse, most times (not sure yet how to reproduce it all the time) if I run regedit just after, the new fonts never get added to `HKCU\Software\Wine\Fonts\Cache`, which seems to be the place from where Wine lists fonts through EnumFontFamiliesEx (try running this code https://github.com/kamwoods/FontAnalysis/blob/d894c082221912e72653ae76804a7… just after installing corefonts). This happens on wine-3.0-rc2 and older. Is this the expected behaviour? I'm also wondering why Wine doesn't also write the required entries under `HKLM\Software\Microsoft\Windows[\ NT]?\CurrentVersion\Fonts` when it populates `HKCU\Software\Wine\Fonts\Cache`. Is this a bug? Is there a different way of registering fonts that Winetricks should use? I'd be more than happy to remove this manual registry insertion code from Winetricks... And, I also noticed that a fresh wine install on Ubuntu 16 will auto-populate both `HKLM\Software\Microsoft\Windows[\ NT]?\CurrentVersion\Fonts` keys with the following fonts: Courier -> coure.fon MS Sans Serif -> sserife.fon MS Serif -> serife.fon Small Fonts -> smalle.fon If I look in `HKCU\Software\Wine\Fonts\Cache`, I see that they are located in `/opt/wine-devel/bin/../share/wine/fonts/`, so shouldn't the above entries also point to the same location? And maybe not all apps will like the `..` in the font path... And, since we're here, I noticed that Winetricks registers font replacements under `HKCU\Software\Wine\Fonts\Replacements`, but doesn't add any entries to `HKLM\Software\Microsoft\Windows NT\CurrentVersion\FontSubstitutes`. Does Wine completely ignore this key? Thank you, Mihai

2 2

[PATCH] mmdevapi/tests: Fix memory leaks (Coverity)
by Alex Henrie 20 Dec '17

20 Dec '17

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/mmdevapi/tests/capture.c | 4 ++-- dlls/mmdevapi/tests/render.c | 8 ++------ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/mmdevapi/tests/capture.c b/dlls/mmdevapi/tests/capture.c index 99da296e0a..3cdfda1a37 100644 --- a/dlls/mmdevapi/tests/capture.c +++ b/dlls/mmdevapi/tests/capture.c @@ -556,8 +556,7 @@ static void test_audioclient(void) if (hr != S_OK) { skip("Cannot initialize %08x, remainder of tests is useless\n", hr); - CoTaskMemFree(pwfx); - return; + goto cleanup; } hr = IAudioClient_GetStreamLatency(ac, NULL); @@ -592,6 +591,7 @@ static void test_audioclient(void) test_capture(ac, handle, pwfx); +cleanup: IAudioClient_Release(ac); CloseHandle(handle); CoTaskMemFree(pwfx); diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index e394d59cfe..9d3e8617b9 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -323,11 +323,7 @@ static void test_audioclient(void) hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, 0, pwfx, NULL); ok(hr == S_OK, "Valid Initialize returns %08x\n", hr); if (hr != S_OK) - { - IAudioClient_Release(ac); - CoTaskMemFree(pwfx); - return; - } + goto cleanup; hr = IAudioClient_GetStreamLatency(ac, NULL); ok(hr == E_POINTER, "GetStreamLatency(NULL) call returns %08x\n", hr); @@ -372,8 +368,8 @@ static void test_audioclient(void) hr = IAudioClient_Start(ac); ok(hr == AUDCLNT_E_NOT_STOPPED, "Start twice returns %08x\n", hr); +cleanup: IAudioClient_Release(ac); - CloseHandle(handle); CoTaskMemFree(pwfx); } -- 2.15.1

3 2

[PATCH] include: Add newer definitions for user controls
by Nikolay Sivov 20 Dec '17

20 Dec '17

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/commctrl.h | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 70 insertions(+), 1 deletion(-) diff --git a/include/commctrl.h b/include/commctrl.h index 587caae88b..e3c166b305 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -1032,7 +1032,51 @@ static const WCHAR WC_BUTTONW[] = { 'B','u','t','t','o','n',0 }; #define BCN_FIRST (0U-1250U) #define BCN_LAST (0U-1350U) -#define BCN_HOTITEMCHANGE (BCN_FIRST + 0x0001) +#define BCN_HOTITEMCHANGE (BCN_FIRST + 1) +#define BCN_DROPDOWN (BCN_FIRST + 2) + +#define BCM_FIRST 0x1600 +#define BCM_GETIDEALSIZE (BCM_FIRST + 1) +#define BCM_SETIMAGELIST (BCM_FIRST + 2) +#define BCM_GETIMAGELIST (BCM_FIRST + 3) +#define BCM_SETTEXTMARGIN (BCM_FIRST + 4) +#define BCM_GETTEXTMARGIN (BCM_FIRST + 5) +#define BCM_SETDROPDOWNSTATE (BCM_FIRST + 6) +#define BCM_SETSPLITINFO (BCM_FIRST + 7) +#define BCM_GETSPLITINFO (BCM_FIRST + 8) +#define BCM_SETNOTE (BCM_FIRST + 9) +#define BCM_GETNOTE (BCM_FIRST + 10) +#define BCM_GETNOTELENGTH (BCM_FIRST + 11) +#define BCM_SETSHIELD (BCM_FIRST + 12) + +#define BUTTON_IMAGELIST_ALIGN_LEFT 0 +#define BUTTON_IMAGELIST_ALIGN_RIGHT 1 +#define BUTTON_IMAGELIST_ALIGN_TOP 2 +#define BUTTON_IMAGELIST_ALIGN_BOTTOM 3 +#define BUTTON_IMAGELIST_ALIGN_CENTER 4 + +#define BCCL_NOGLYPH (HIMAGELIST)(-1) + +typedef struct +{ + HIMAGELIST himl; + RECT margin; + UINT uAlign; +} BUTTON_IMAGELIST, *PBUTTON_IMAGELIST; + +typedef struct tagBUTTON_SPLITINFO +{ + UINT mask; + HIMAGELIST himlGlyph; + UINT uSplitStyle; + SIZE size; +} BUTTON_SPLITINFO, *PBUTTON_SPLITINFO; + +typedef struct tagNMBCDROPDOWN +{ + NMHDR hdr; + RECT rcButton; +} NMBCDROPDOWN; typedef struct tagNMBCHOTITEM { @@ -1041,6 +1085,7 @@ typedef struct tagNMBCHOTITEM } NMBCHOTITEM, *LPNMBCHOTITEM; #define BST_HOT 0x0200 +#define BST_DROPDOWNPUSHED 0x0400 /* Button control styles for _WIN32_WINNT >= 0x600 */ #define BS_SPLITBUTTON 0x0000000C @@ -5147,6 +5192,12 @@ static const WCHAR WC_COMBOBOXW[] = { 'C','o','m','b','o','B','o','x',0 }; #endif #define WC_COMBOBOX WINELIB_NAME_AW(WC_COMBOBOX) +#define CBM_FIRST 0x1700 +#define CB_SETMINVISIBLE (CBM_FIRST + 1) +#define CB_GETMINVISIBLE (CBM_FIRST + 2) +#define CB_SETCUEBANNER (CBM_FIRST + 3) +#define CB_GETCUEBANNER (CBM_FIRST + 4) + /************************************************************************** * Edit control */ @@ -5161,6 +5212,24 @@ static const WCHAR WC_EDITW[] = { 'E','d','i','t',0 }; #endif #define WC_EDIT WINELIB_NAME_AW(WC_EDIT) +typedef struct _tagEDITBALLOONTIP +{ + DWORD cbStruct; + LPCWSTR pszTitle; + LPCWSTR pszText; + INT ttiIcon; +} EDITBALLOONTIP, *PEDITBALLOONTIP; + +#define ECM_FIRSP 0x1500 +#define EM_SETCUEBANNER (ECM_FIRST + 1) +#define EM_GETCUEBANNER (ECM_FIRST + 2) +#define EM_SHOWBALLOONTIP (ECM_FIRST + 3) +#define EM_HIDEBALLOONTIP (ECM_FIRST + 4) +#define EM_SETHILITE (ECM_FIRST + 5) +#define EM_GETHILITE (ECM_FIRST + 6) +#define EM_NOSETFOCUS (ECM_FIRST + 7) +#define EM_TAKEFOCUS (ECM_FIRST + 8) + /************************************************************************** * Listbox control */ -- 2.15.1

1 0

[PATCH] winegstreamer: Hold a reference to the filter in push_data().
by Zebediah Figura 20 Dec '17

20 Dec '17

Fixes bug #43004. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- This fixes a regression probably introduced by 38586dcf48bf38c136ea315fd9d83a1be56483b1. dlls/winegstreamer/gstdemux.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 95a1630..a19c64f 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -510,6 +510,8 @@ static DWORD CALLBACK push_data(LPVOID iface) DWORD_PTR user; HRESULT hr; + IBaseFilter_AddRef(&This->filter.IBaseFilter_iface); + if (!This->stop) IAsyncReader_Length(This->pInputPin.pReader, &maxlen, &curlen); else @@ -589,6 +591,9 @@ static DWORD CALLBACK push_data(LPVOID iface) } while (buf); TRACE("Stopping.. %08x\n", hr); + + IBaseFilter_Release(&This->filter.IBaseFilter_iface); + return 0; } -- 2.7.4

1 0

[PATCH 1/4] user32/tests: Don't leave hwndMain in a topmost state.
by Zebediah Figura 20 Dec '17

20 Dec '17

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/user32/tests/win.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index db27b6b..ea9fac2 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -4011,6 +4011,8 @@ done: if (child) DestroyWindow(child); DestroyWindow(popup); + + SetWindowPos(hwnd, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE); } static void test_validatergn(HWND hwnd) -- 2.7.4

2 5

[PATCH] po: Update Norwegian translation.
by Kim Malmo 19 Dec '17

19 Dec '17

Signed-off-by: Kim Malmo <berencamlost(a)msn.com> --- po/nb_NO.po | 68 +++++++++++++------------------------------------------------ 1 file changed, 14 insertions(+), 54 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index 605b7e8c62..d00e67aebc 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -6998,7 +6998,7 @@ msgstr "Publiserer produktinformasjon" #: msi.rc:118 msgid "Registering Class servers" -msgstr "" +msgstr "Registrerer Klassetjenere" #: msi.rc:119 msgid "Registering COM+ Applications and Components" @@ -7102,7 +7102,7 @@ msgstr "Avpubliserer produktinformasjon" #: msi.rc:145 msgid "Unregister Class servers" -msgstr "" +msgstr "Avregistrerer Klassetjenere" #: msi.rc:146 msgid "Unregistering COM+ Applications and Components" @@ -7162,7 +7162,7 @@ msgstr "Tjeneste: [1]" #: msi.rc:166 msi.rc:169 msi.rc:173 msgid "File: [1], Directory: [9], Size: [6]" -msgstr "Fil: [1], Mappe: [9], Størrelse: [6]" +msgstr "Fil: [1], Katalog: [9], Størrelse: [6]" #: msi.rc:167 msgid "Found application: [1]" @@ -7170,7 +7170,7 @@ msgstr "Funnet program: [1]" #: msi.rc:168 msgid "File: [1], Directory: [9], Size: [6]" -msgstr "Fil: [1], Mappe: [9], Størrelse: [6]" +msgstr "Fil: [1], Katalog: [9], Størrelse: [6]" #: msi.rc:170 msgid "Service: [2]" @@ -7186,11 +7186,11 @@ msgstr "Program: [1]" #: msi.rc:174 msi.rc:175 msgid "Application Context:[1], Assembly Name:[2]" -msgstr "Programkontekst:[1], Assemblynavn:[2]" +msgstr "Programkontekst:[1], Assembly-navn:[2]" #: msi.rc:176 msgid "File: [1], Directory: [2], Size: [3]" -msgstr "Fil: [1], Mappe: [2], Størrelse: [6]" +msgstr "Fil: [1], Katalog: [2], Størrelse: [6]" #: msi.rc:177 msi.rc:198 msgid "Component ID: [1], Qualifier: [2]" @@ -7202,7 +7202,7 @@ msgstr "Egenskap: [1]" #: msi.rc:179 msi.rc:200 msgid "Class Id: [1]" -msgstr "Klasse ID: [1]" +msgstr "Klasse Id: [1]" #: msi.rc:180 msgid "AppId: [1]{{, AppType: [2], Users: [3], RSN: [4]}}" @@ -7222,15 +7222,15 @@ msgstr "MIME innholdstype: [1], Utvidelse: [2]" #: msi.rc:184 msi.rc:205 msgid "ProgId: [1]" -msgstr "" +msgstr "ProgId: [1]" #: msi.rc:185 msi.rc:206 msgid "LibID: [1]" -msgstr "" +msgstr "LibID: [1]" #: msi.rc:186 msi.rc:189 msgid "File: [1], Directory: [9]" -msgstr "Fil: [1], Mappe: [2]" +msgstr "Fil: [1], Katalog: [2]" #: msi.rc:187 msi.rc:207 msgid "Name: [1], Value: [2], Action [3]" @@ -7254,7 +7254,7 @@ msgstr "Fil: [1], Mappe: [2]" #: msi.rc:201 msgid "AppId: [1]{{, AppType: [2]}}" -msgstr "" +msgstr "AppId: [1]{{, AppType: [2]}}" #: msi.rc:209 msgid "Key: [1], Name: [2], Value: [3]" @@ -7282,7 +7282,7 @@ msgid "" "This may indicate a problem with this package. The error code is [1]. {{The " "arguments are: [2], [3], [4]}}" msgstr "" -"Installeren har truffet på ett eventet problem under installeringen av denne " +"Installeren har truffet på ett uventet problem under installeringen av denne " "pakken. Dette kan skyldes ett problem med denne pakken. Errorkoden er [1]. " "{{Argumentene er: [2], [3], [4]}}" @@ -10601,47 +10601,6 @@ msgstr "" "eller skallet CMD ble startet fra.\n" #: cmd.rc:364 -#, fuzzy -#| msgid "" -#| "CMD built-in commands are:\n" -#| "ASSOC\t\tShow or modify file extension associations\n" -#| "ATTRIB\t\tShow or change DOS file attributes\n" -#| "CALL\t\tInvoke a batch file from inside another\n" -#| "CD (CHDIR)\tChange current default directory\n" -#| "CHOICE\t\tWait for an keypress from a selectable list\n" -#| "CLS\t\tClear the console screen\n" -#| "COPY\t\tCopy file\n" -#| "CTTY\t\tChange input/output device\n" -#| "DATE\t\tShow or change the system date\n" -#| "DEL (ERASE)\tDelete a file or set of files\n" -#| "DIR\t\tList the contents of a directory\n" -#| "ECHO\t\tCopy text directly to the console output\n" -#| "ENDLOCAL\tEnd localization of environment changes in a batch file\n" -#| "FTYPE\t\tShow or modify open commands associated with file types\n" -#| "HELP\t\tShow brief help details on a topic\n" -#| "MD (MKDIR)\tCreate a subdirectory\n" -#| "MORE\t\tDisplay output in pages\n" -#| "MOVE\t\tMove a file, set of files or directory tree\n" -#| "PATH\t\tSet or show the search path\n" -#| "PAUSE\t\tSuspend execution of a batch file\n" -#| "POPD\t\tRestore the directory to the last one saved with PUSHD\n" -#| "PROMPT\t\tChange the command prompt\n" -#| "PUSHD\t\tChange to a new directory, saving the current one\n" -#| "REN (RENAME)\tRename a file\n" -#| "RD (RMDIR)\tDelete a subdirectory\n" -#| "SET\t\tSet or show environment variables\n" -#| "SETLOCAL\tStart localization of environment changes in a batch file\n" -#| "START\t\tStart a program, or open a document in the associated program\n" -#| "TIME\t\tSet or show the current system time\n" -#| "TITLE\t\tSet the window title for the CMD session\n" -#| "TYPE\t\tType the contents of a text file\n" -#| "VER\t\tShow the current version of CMD\n" -#| "VOL\t\tShow the volume label of a disk device\n" -#| "XCOPY\t\tCopy source files or directory trees to a destination\n" -#| "EXIT\t\tClose down CMD\n" -#| "\n" -#| "Enter HELP <command> for further information on any of the above " -#| "commands.\n" msgid "" "CMD built-in commands are:\n" "ASSOC\t\tShow or modify file extension associations\n" @@ -10701,6 +10660,7 @@ msgstr "" "FTYPE\t\tViser eller endrer kommandoer for åpning av ulike filtyper\n" "HELP\t\tViser en kort hjelpebeskrivelse om et emne\n" "MD (MKDIR)\tLager en underkatalog\n" +"MKLINK\tOpprett en symbolsk lenke\n" "MORE\t\tViser utdata i sider\n" "MOVE\t\tFlytter én eller flere filer, eller et katalogtre\n" "PATH\t\tEndrer eller viser søkestien\n" @@ -12531,7 +12491,7 @@ msgstr "" "Brukseksempler:\n" " regedit \"import.reg\"\n" " regedit /E \"export.reg\" \"HKEY_CURRENT_USER\\Console\"\n" -" regedit /D \"HKEY_LOCAL_MACHINE\\Error\\Path\"\n" +" regedit /D \"HKEY_LOCAL_MACHINE\\Key\\Path\"\n" #: regedit.rc:409 msgid "regedit: Invalid or unrecognized switch [%1]\n" -- 2.14.1

1 0

[PATCH] comctl32/tooltips: Remove window subclass right before window is destroyed
by Nikolay Sivov 19 Dec '17

19 Dec '17

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Fixes a crash reported as https://bugs.winehq.org/show_bug.cgi?id=14937. dlls/comctl32/tooltips.c | 41 ++++++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index bbf1693f4d..405b1e9f5c 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -1888,16 +1888,12 @@ TOOLTIPS_Destroy (TOOLTIPS_INFO *infoPtr) } } - /* remove subclassing */ - if (toolPtr->uInternalFlags & TTF_SUBCLASS) { - if (toolPtr->uInternalFlags & TTF_IDISHWND) { - RemoveWindowSubclass((HWND)toolPtr->uId, TOOLTIPS_SubclassProc, 1); - } - else { - RemoveWindowSubclass(toolPtr->hwnd, TOOLTIPS_SubclassProc, 1); - } + /* Reset subclassing data. */ + if (toolPtr->uInternalFlags & TTF_SUBCLASS) + SetWindowSubclass(toolPtr->uInternalFlags & TTF_IDISHWND ? (HWND)toolPtr->uId : toolPtr->hwnd, + TOOLTIPS_SubclassProc, 1, 0); } - } + Free (infoPtr->tools); } @@ -2117,12 +2113,13 @@ TOOLTIPS_WinIniChange (TOOLTIPS_INFO *infoPtr) static LRESULT CALLBACK -TOOLTIPS_SubclassProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, UINT_PTR uID, DWORD_PTR dwRef) +TOOLTIPS_SubclassProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam, UINT_PTR uID, DWORD_PTR dwRef) { TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr ((HWND)dwRef); MSG msg; - switch(uMsg) { + switch (message) + { case WM_MOUSEMOVE: case WM_LBUTTONDOWN: case WM_LBUTTONUP: @@ -2130,17 +2127,23 @@ TOOLTIPS_SubclassProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, UINT_ case WM_MBUTTONUP: case WM_RBUTTONDOWN: case WM_RBUTTONUP: - msg.hwnd = hwnd; - msg.message = uMsg; - msg.wParam = wParam; - msg.lParam = lParam; - TOOLTIPS_RelayEvent(infoPtr, &msg); - break; - + if (infoPtr) + { + msg.hwnd = hwnd; + msg.message = message; + msg.wParam = wParam; + msg.lParam = lParam; + TOOLTIPS_RelayEvent(infoPtr, &msg); + } + break; + case WM_NCDESTROY: + RemoveWindowSubclass(hwnd, TOOLTIPS_SubclassProc, 1); + break; default: break; } - return DefSubclassProc(hwnd, uMsg, wParam, lParam); + + return DefSubclassProc(hwnd, message, wParam, lParam); } -- 2.15.1

1 0

[PATCH v2] gdi32: Set otmMacLineGap from the line gap in the hhea table.
by Huw Davies 19 Dec '17

19 Dec '17

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/freetype.c | 2 +- dlls/gdi32/tests/font.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 660900a56e..4db1c7eb56 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -7930,7 +7930,7 @@ static BOOL get_outline_text_metrics(GdiFont *font) font->potm->otmrcFontBox.bottom = SCALE_Y(ft_face->bbox.yMin); font->potm->otmMacAscent = TM.tmAscent; font->potm->otmMacDescent = -TM.tmDescent; - font->potm->otmMacLineGap = font->potm->otmLineGap; + font->potm->otmMacLineGap = SCALE_Y(pHori->Line_Gap); font->potm->otmusMinimumPPEM = 0; /* TT Header */ font->potm->otmptSubscriptSize.x = SCALE_X(pOS2->ySubscriptXSize); font->potm->otmptSubscriptSize.y = SCALE_Y(pOS2->ySubscriptYSize); diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index bd04a8b6b1..117a14f153 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1790,17 +1790,17 @@ static void test_GetKerningPairs(void) kd[i].otmMacDescent, otm.otmMacDescent); ok(near_match(kd[i].otmMacAscent, otm.otmMacAscent), "expected %d, got %d\n", kd[i].otmMacAscent, otm.otmMacAscent); -todo_wine { +todo_wine ok(kd[i].otmsCapEmHeight == otm.otmsCapEmHeight, "expected %u, got %u\n", kd[i].otmsCapEmHeight, otm.otmsCapEmHeight); +todo_wine ok(kd[i].otmsXHeight == otm.otmsXHeight, "expected %u, got %u\n", kd[i].otmsXHeight, otm.otmsXHeight); - /* FIXME: this one sometimes succeeds due to expected 0, enable it when removing todo */ - if (0) ok(kd[i].otmMacLineGap == otm.otmMacLineGap, "expected %u, got %u\n", + ok(kd[i].otmMacLineGap == otm.otmMacLineGap, "expected %u, got %u\n", kd[i].otmMacLineGap, otm.otmMacLineGap); +todo_wine ok(kd[i].otmusMinimumPPEM == otm.otmusMinimumPPEM, "expected %u, got %u\n", kd[i].otmusMinimumPPEM, otm.otmusMinimumPPEM); -} total_kern_pairs = GetKerningPairsW(hdc, 0, NULL); trace("total_kern_pairs %u\n", total_kern_pairs); -- 2.12.0

2 1

Upcoming TestBot patches
by Francois Gouget 19 Dec '17

19 Dec '17

For those that are interested I'm trying to regularly push my set of 'might be ready to send' patches on GitHub: https://github.com/fgouget/wine-tools/tree/future So feel free to have a look and / or test it. -- Francois Gouget <fgouget(a)codeweavers.com>

2 4

[PATCH] bcrypt: Require macOS version 10.7 or newer for encryption support.
by Hans Leidekker 19 Dec '17

19 Dec '17

Reported by Ryan Schmidt. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/bcrypt_main.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 35c0e4a076..55cf2f6f28 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -22,6 +22,7 @@ #include <stdarg.h> #ifdef HAVE_COMMONCRYPTO_COMMONCRYPTOR_H +#include <AvailabilityMacros.h> #include <CommonCrypto/CommonCryptor.h> #elif defined(SONAME_LIBGNUTLS) #include <gnutls/gnutls.h> @@ -766,7 +767,7 @@ NTSTATUS WINAPI BCryptHash( BCRYPT_ALG_HANDLE algorithm, UCHAR *secret, ULONG se return BCryptDestroyHash( handle ); } -#if defined(HAVE_GNUTLS_CIPHER_INIT) || defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) +#if defined(HAVE_GNUTLS_CIPHER_INIT) || defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1070 static ULONG get_block_size( enum alg_id alg ) { ULONG ret = 0, size = sizeof(ret); @@ -895,7 +896,7 @@ static NTSTATUS key_destroy( struct key *key ) HeapFree( GetProcessHeap(), 0, key ); return STATUS_SUCCESS; } -#elif defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) +#elif defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1070 struct key { struct object hdr; -- 2.11.0

1 0

[PATCH] bcrypt: Fix build on macOS 10.8 and older.
by Hans Leidekker 19 Dec '17

19 Dec '17

Based on a patch by Ryan Schmidt. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/bcrypt_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 3bdc463904..35c0e4a076 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -949,13 +949,13 @@ static NTSTATUS key_set_params( struct key *key, UCHAR *iv, ULONG iv_len ) key->ref_decrypt = NULL; } - if ((status = CCCryptorCreateWithMode( kCCEncrypt, kCCModeCBC, kCCAlgorithmAES, ccNoPadding, iv, + if ((status = CCCryptorCreateWithMode( kCCEncrypt, kCCModeCBC, kCCAlgorithmAES128, ccNoPadding, iv, key->secret, key->secret_len, NULL, 0, 0, 0, &key->ref_encrypt )) != kCCSuccess) { WARN( "CCCryptorCreateWithMode failed %d\n", status ); return STATUS_INTERNAL_ERROR; } - if ((status = CCCryptorCreateWithMode( kCCDecrypt, kCCModeCBC, kCCAlgorithmAES, ccNoPadding, iv, + if ((status = CCCryptorCreateWithMode( kCCDecrypt, kCCModeCBC, kCCAlgorithmAES128, ccNoPadding, iv, key->secret, key->secret_len, NULL, 0, 0, 0, &key->ref_decrypt )) != kCCSuccess) { WARN( "CCCryptorCreateWithMode failed %d\n", status ); -- 2.11.0

1 0

Patch to fix error: use of undeclared identifier 'kCCAlgorithmAES'
by Ryan Schmidt 19 Dec '17

19 Dec '17

I was instructed to send this patch to this mailing list. It fixes https://bugs.winehq.org/show_bug.cgi?id=44173

2 2

[PATCH] comctl32/tests: Remove some workarounds that no longer apply
by Nikolay Sivov 19 Dec '17

19 Dec '17

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/tests/edit.c | 33 +++++++++++---------------------- 1 file changed, 11 insertions(+), 22 deletions(-) diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index 1453271986..9feb9b42bc 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -1675,40 +1675,30 @@ static void test_margins_font_change(void) SendMessageA(hwEdit, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(0,0)); SendMessageA(hwEdit, WM_SETFONT, (WPARAM)hfont, 0); margins = SendMessageA(hwEdit, EM_GETMARGINS, 0, 0); - ok(LOWORD(margins) == 0 || broken(LOWORD(margins) == LOWORD(font_margins)), /* win95 */ - "got %d\n", LOWORD(margins)); - ok(HIWORD(margins) == 0 || broken(HIWORD(margins) == HIWORD(font_margins)), /* win95 */ - "got %d\n", HIWORD(margins)); + ok(LOWORD(margins) == 0, "got %d\n", LOWORD(margins)); + ok(HIWORD(margins) == 0, "got %d\n", HIWORD(margins)); SendMessageA(hwEdit, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(1,0)); SendMessageA(hwEdit, WM_SETFONT, (WPARAM)hfont, 0); margins = SendMessageA(hwEdit, EM_GETMARGINS, 0, 0); - ok(LOWORD(margins) == 1 || broken(LOWORD(margins) == LOWORD(font_margins)), /* win95 */ - "got %d\n", LOWORD(margins)); - ok(HIWORD(margins) == 0 || broken(HIWORD(margins) == HIWORD(font_margins)), /* win95 */ - "got %d\n", HIWORD(margins)); + ok(LOWORD(margins) == 1, "got %d\n", LOWORD(margins)); + ok(HIWORD(margins) == 0, "got %d\n", HIWORD(margins)); SendMessageA(hwEdit, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(1,1)); SendMessageA(hwEdit, WM_SETFONT, (WPARAM)hfont, 0); margins = SendMessageA(hwEdit, EM_GETMARGINS, 0, 0); - ok(LOWORD(margins) == 1 || broken(LOWORD(margins) == LOWORD(font_margins)), /* win95 */ - "got %d\n", LOWORD(margins)); - ok(HIWORD(margins) == 1 || broken(HIWORD(margins) == HIWORD(font_margins)), /* win95 */ - "got %d\n", HIWORD(margins)); + ok(LOWORD(margins) == 1, "got %d\n", LOWORD(margins)); + ok(HIWORD(margins) == 1, "got %d\n", HIWORD(margins)); SendMessageA(hwEdit, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(EC_USEFONTINFO,EC_USEFONTINFO)); margins = SendMessageA(hwEdit, EM_GETMARGINS, 0, 0); - ok(LOWORD(margins) == 1 || broken(LOWORD(margins) == LOWORD(font_margins)), /* win95 */ - "got %d\n", LOWORD(margins)); - ok(HIWORD(margins) == 1 || broken(HIWORD(margins) == HIWORD(font_margins)), /* win95 */ - "got %d\n", HIWORD(margins)); + ok(LOWORD(margins) == 1, "got %d\n", LOWORD(margins)); + ok(HIWORD(margins) == 1, "got %d\n", HIWORD(margins)); SendMessageA(hwEdit, WM_SETFONT, (WPARAM)hfont2, 0); margins = SendMessageA(hwEdit, EM_GETMARGINS, 0, 0); - ok(LOWORD(margins) == 1 || broken(LOWORD(margins) != 1 && LOWORD(margins) != LOWORD(font_margins)), /* win95 */ - "got %d\n", LOWORD(margins)); - ok(HIWORD(margins) == 1 || broken(HIWORD(margins) != 1 && HIWORD(margins) != HIWORD(font_margins)), /* win95 */ - "got %d\n", HIWORD(margins)); + ok(LOWORD(margins) == 1, "got %d\n", LOWORD(margins)); + ok(HIWORD(margins) == 1, "got %d\n", HIWORD(margins)); /* Above a certain size threshold then the margin is updated */ SetWindowPos(hwEdit, NULL, 10, 10, 1000, 100, SWP_NOZORDER | SWP_NOACTIVATE); @@ -1731,8 +1721,7 @@ static void test_margins_font_change(void) ok(HIWORD(margins) == HIWORD(font_margins), "got %d\n", HIWORD(margins)); SendMessageA(hwEdit, WM_SETFONT, (WPARAM)hfont2, 0); margins = SendMessageA(hwEdit, EM_GETMARGINS, 0, 0); - ok(LOWORD(margins) != LOWORD(font_margins) || broken(LOWORD(margins) == LOWORD(font_margins)), /* win98 */ - "got %d\n", LOWORD(margins)); + ok(LOWORD(margins) != LOWORD(font_margins), "got %d\n", LOWORD(margins)); ok(HIWORD(margins) != HIWORD(font_margins), "got %d\n", HIWORD(margins)); SendMessageA(hwEdit, WM_SETFONT, 0, 0); -- 2.15.1

1 0

[PATCH] gdi32: Set otmMacLineGap from the line gap in the hhea table.
by Huw Davies 19 Dec '17

19 Dec '17

From: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/freetype.c | 2 +- dlls/gdi32/tests/font.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 660900a56e..4db1c7eb56 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -7930,7 +7930,7 @@ static BOOL get_outline_text_metrics(GdiFont *font) font->potm->otmrcFontBox.bottom = SCALE_Y(ft_face->bbox.yMin); font->potm->otmMacAscent = TM.tmAscent; font->potm->otmMacDescent = -TM.tmDescent; - font->potm->otmMacLineGap = font->potm->otmLineGap; + font->potm->otmMacLineGap = SCALE_Y(pHori->Line_Gap); font->potm->otmusMinimumPPEM = 0; /* TT Header */ font->potm->otmptSubscriptSize.x = SCALE_X(pOS2->ySubscriptXSize); font->potm->otmptSubscriptSize.y = SCALE_Y(pOS2->ySubscriptYSize); diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index bd04a8b6b1..117a14f153 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1790,17 +1790,17 @@ static void test_GetKerningPairs(void) kd[i].otmMacDescent, otm.otmMacDescent); ok(near_match(kd[i].otmMacAscent, otm.otmMacAscent), "expected %d, got %d\n", kd[i].otmMacAscent, otm.otmMacAscent); -todo_wine { +todo_wine ok(kd[i].otmsCapEmHeight == otm.otmsCapEmHeight, "expected %u, got %u\n", kd[i].otmsCapEmHeight, otm.otmsCapEmHeight); +todo_wine ok(kd[i].otmsXHeight == otm.otmsXHeight, "expected %u, got %u\n", kd[i].otmsXHeight, otm.otmsXHeight); - /* FIXME: this one sometimes succeeds due to expected 0, enable it when removing todo */ - if (0) ok(kd[i].otmMacLineGap == otm.otmMacLineGap, "expected %u, got %u\n", + ok(kd[i].otmMacLineGap == otm.otmMacLineGap, "expected %u, got %u\n", kd[i].otmMacLineGap, otm.otmMacLineGap); +todo_wine ok(kd[i].otmusMinimumPPEM == otm.otmusMinimumPPEM, "expected %u, got %u\n", kd[i].otmusMinimumPPEM, otm.otmusMinimumPPEM); -} total_kern_pairs = GetKerningPairsW(hdc, 0, NULL); trace("total_kern_pairs %u\n", total_kern_pairs); -- 2.12.0

1 1

[PATCH] comctl32/tests: Add ListBox tests
by Nikolay Sivov 19 Dec '17

19 Dec '17

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/tests/Makefile.in | 1 + dlls/comctl32/tests/listbox.c | 1862 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 1863 insertions(+) create mode 100644 dlls/comctl32/tests/listbox.c diff --git a/dlls/comctl32/tests/Makefile.in b/dlls/comctl32/tests/Makefile.in index 4fd0f0299e..f93ff2585d 100644 --- a/dlls/comctl32/tests/Makefile.in +++ b/dlls/comctl32/tests/Makefile.in @@ -11,6 +11,7 @@ C_SRCS = \ header.c \ imagelist.c \ ipaddress.c \ + listbox.c \ listview.c \ misc.c \ monthcal.c \ diff --git a/dlls/comctl32/tests/listbox.c b/dlls/comctl32/tests/listbox.c new file mode 100644 index 0000000000..23aaac29e2 --- /dev/null +++ b/dlls/comctl32/tests/listbox.c @@ -0,0 +1,1862 @@ +/* Unit test suite for list boxes. + * + * Copyright 2003 Ferenc Wagner + * + * 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 + */ + +#include <assert.h> +#include <stdarg.h> +#include <stdio.h> + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "winnls.h" + +#include "wine/test.h" +#include "v6util.h" + +static const char * const strings[4] = { + "First added", + "Second added", + "Third added", + "Fourth added which is very long because at some time we only had a 256 byte character buffer and " + "that was overflowing in one of those applications that had a common dialog file open box and tried " + "to add a 300 characters long custom filter string which of course the code did not like and crashed. " + "Just make sure this string is longer than 256 characters." +}; + +static const char BAD_EXTENSION[] = "*.badtxt"; + +static HWND create_listbox(DWORD add_style, HWND parent) +{ + INT_PTR ctl_id = 0; + HWND handle; + + if (parent) + ctl_id=1; + + handle = CreateWindowA("LISTBOX", "TestList", (LBS_STANDARD & ~LBS_SORT) | add_style, 0, 0, 100, 100, + parent, (HMENU)ctl_id, NULL, 0); + ok(handle != NULL, "Failed to create listbox window.\n"); + + SendMessageA(handle, LB_ADDSTRING, 0, (LPARAM) strings[0]); + SendMessageA(handle, LB_ADDSTRING, 0, (LPARAM) strings[1]); + SendMessageA(handle, LB_ADDSTRING, 0, (LPARAM) strings[2]); + SendMessageA(handle, LB_ADDSTRING, 0, (LPARAM) strings[3]); + + return handle; +} + +struct listbox_prop +{ + DWORD add_style; +}; + +struct listbox_stat +{ + int selected, anchor, caret, selcount; +}; + +struct listbox_test +{ + struct listbox_prop prop; + struct listbox_stat init, init_todo; + struct listbox_stat click, click_todo; + struct listbox_stat step, step_todo; + struct listbox_stat sel, sel_todo; +}; + +static void listbox_query(HWND handle, struct listbox_stat *results) +{ + results->selected = SendMessageA(handle, LB_GETCURSEL, 0, 0); + results->anchor = SendMessageA(handle, LB_GETANCHORINDEX, 0, 0); + results->caret = SendMessageA(handle, LB_GETCARETINDEX, 0, 0); + results->selcount = SendMessageA(handle, LB_GETSELCOUNT, 0, 0); +} + +static void buttonpress(HWND handle, WORD x, WORD y) +{ + LPARAM lp = x + (y << 16); + + SendMessageA(handle, WM_LBUTTONDOWN, MK_LBUTTON, lp); + SendMessageA(handle, WM_LBUTTONUP, 0, lp); +} + +static void keypress(HWND handle, WPARAM keycode, BYTE scancode, BOOL extended) +{ + LPARAM lp = 1 + (scancode << 16) + (extended ? KEYEVENTF_EXTENDEDKEY : 0); + + SendMessageA(handle, WM_KEYDOWN, keycode, lp); + SendMessageA(handle, WM_KEYUP , keycode, lp | 0xc000000); +} + +#define listbox_field_ok(t, s, f, got) \ + ok (t.s.f==got.f, "style %#x, step " #s ", field " #f \ + ": expected %d, got %d\n", (unsigned int)t.prop.add_style, \ + t.s.f, got.f) + +#define listbox_todo_field_ok(t, s, f, got) \ + todo_wine_if (t.s##_todo.f) { listbox_field_ok(t, s, f, got); } + +#define listbox_ok(t, s, got) \ + listbox_todo_field_ok(t, s, selected, got); \ + listbox_todo_field_ok(t, s, anchor, got); \ + listbox_todo_field_ok(t, s, caret, got); \ + listbox_todo_field_ok(t, s, selcount, got) + +static void run_test(const struct listbox_test test) +{ + struct listbox_stat answer; + HWND hLB=create_listbox (test.prop.add_style, 0); + RECT second_item; + int i, res; + + listbox_query (hLB, &answer); + listbox_ok (test, init, answer); + + SendMessageA(hLB, LB_GETITEMRECT, 1, (LPARAM) &second_item); + buttonpress(hLB, (WORD)second_item.left, (WORD)second_item.top); + + listbox_query(hLB, &answer); + listbox_ok(test, click, answer); + + keypress(hLB, VK_DOWN, 0x50, TRUE); + + listbox_query(hLB, &answer); + listbox_ok(test, step, answer); + + DestroyWindow(hLB); + + hLB = create_listbox(test.prop.add_style, 0); + + SendMessageA(hLB, LB_SELITEMRANGE, TRUE, MAKELPARAM(1, 2)); + listbox_query(hLB, &answer); + listbox_ok(test, sel, answer); + + for (i = 0; i < 4; i++) + { + DWORD size = SendMessageA(hLB, LB_GETTEXTLEN, i, 0); + int resA, resW; + WCHAR *txtw; + CHAR *txt; + + txt = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size + 1); + resA = SendMessageA(hLB, LB_GETTEXT, i, (LPARAM)txt); + ok(!strcmp(txt, strings[i]), "returned string for item %d does not match %s vs %s\n", i, txt, strings[i]); + + txtw = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (size + 1) * sizeof(*txtw)); + resW = SendMessageW(hLB, LB_GETTEXT, i, (LPARAM)txtw); + if (resA != resW) + trace("SendMessageW(LB_GETTEXT) not supported on this platform (resA=%d resW=%d), skipping...\n", resA, resW); + else + { + WideCharToMultiByte(CP_ACP, 0, txtw, -1, txt, size, NULL, NULL); + ok(!strcmp (txt, strings[i]), "returned string for item %d does not match %s vs %s\n", i, txt, strings[i]); + } + + HeapFree(GetProcessHeap(), 0, txtw); + HeapFree(GetProcessHeap(), 0, txt); + } + + /* Confirm the count of items, and that an invalid delete does not remove anything */ + res = SendMessageA(hLB, LB_GETCOUNT, 0, 0); + ok(res == 4, "Expected 4 items, got %d\n", res); + res = SendMessageA(hLB, LB_DELETESTRING, -1, 0); + ok(res == LB_ERR, "Expected LB_ERR items, got %d\n", res); + res = SendMessageA(hLB, LB_DELETESTRING, 4, 0); + ok(res == LB_ERR, "Expected LB_ERR items, got %d\n", res); + res = SendMessageA(hLB, LB_GETCOUNT, 0, 0); + ok(res == 4, "Expected 4 items, got %d\n", res); + + DestroyWindow(hLB); +} + +static void test_item_height(void) +{ + INT itemHeight; + TEXTMETRICA tm; + HFONT font; + HWND hLB; + HDC hdc; + + hLB = create_listbox (0, 0); + ok ((hdc = GetDCEx( hLB, 0, DCX_CACHE )) != 0, "Can't get hdc\n"); + ok ((font = GetCurrentObject(hdc, OBJ_FONT)) != 0, "Can't get the current font\n"); + ok (GetTextMetricsA( hdc, &tm ), "Can't read font metrics\n"); + ReleaseDC( hLB, hdc); + + ok (SendMessageA(hLB, WM_SETFONT, (WPARAM)font, 0) == 0, "Can't set font\n"); + + itemHeight = SendMessageA(hLB, LB_GETITEMHEIGHT, 0, 0); + ok (itemHeight == tm.tmHeight, "Item height wrong, got %d, expecting %d\n", itemHeight, tm.tmHeight); + + DestroyWindow (hLB); + + hLB = CreateWindowA("LISTBOX", "TestList", LBS_OWNERDRAWVARIABLE, 0, 0, 100, 100, NULL, NULL, NULL, 0); + + itemHeight = SendMessageA(hLB, LB_GETITEMHEIGHT, 0, 0); + ok(itemHeight > 0 && itemHeight <= tm.tmHeight, "Unexpected item height %d, expected %d.\n", + itemHeight, tm.tmHeight); + itemHeight = SendMessageA(hLB, LB_GETITEMHEIGHT, 5, 0); + ok(itemHeight > 0 && itemHeight <= tm.tmHeight, "Unexpected item height %d, expected %d.\n", + itemHeight, tm.tmHeight); + itemHeight = SendMessageA(hLB, LB_GETITEMHEIGHT, -5, 0); + ok(itemHeight > 0 && itemHeight <= tm.tmHeight, "Unexpected item height %d, expected %d.\n", + itemHeight, tm.tmHeight); + + DestroyWindow (hLB); +} + +static int got_selchange; + +static LRESULT WINAPI main_window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + switch (msg) + { + case WM_DRAWITEM: + { + RECT rc_item, rc_client, rc_clip; + DRAWITEMSTRUCT *dis = (DRAWITEMSTRUCT *)lparam; + + ok(wparam == dis->CtlID, "got wParam=%08lx instead of %08x\n", wparam, dis->CtlID); + ok(dis->CtlType == ODT_LISTBOX, "wrong CtlType %04x\n", dis->CtlType); + + GetClientRect(dis->hwndItem, &rc_client); + GetClipBox(dis->hDC, &rc_clip); + ok(EqualRect(&rc_client, &rc_clip) || IsRectEmpty(&rc_clip), + "client rect of the listbox should be equal to the clip box," + "or the clip box should be empty\n"); + + SendMessageA(dis->hwndItem, LB_GETITEMRECT, dis->itemID, (LPARAM)&rc_item); + ok(EqualRect(&dis->rcItem, &rc_item), "item rects are not equal\n"); + + break; + } + + case WM_COMMAND: + if (HIWORD( wparam ) == LBN_SELCHANGE) got_selchange++; + break; + + default: + break; + } + + return DefWindowProcA(hwnd, msg, wparam, lparam); +} + +static HWND create_parent( void ) +{ + static ATOM class; + WNDCLASSA cls; + + if (!class) + { + cls.style = 0; + cls.lpfnWndProc = main_window_proc; + cls.cbClsExtra = 0; + cls.cbWndExtra = 0; + cls.hInstance = GetModuleHandleA(NULL); + cls.hIcon = 0; + cls.hCursor = LoadCursorA(0, (LPCSTR)IDC_ARROW); + cls.hbrBackground = GetStockObject(WHITE_BRUSH); + cls.lpszMenuName = NULL; + cls.lpszClassName = "main_window_class"; + class = RegisterClassA( &cls ); + } + + return CreateWindowExA(0, "main_window_class", NULL, WS_POPUP | WS_VISIBLE, 100, 100, 400, 400, GetDesktopWindow(), + 0, GetModuleHandleA(NULL), NULL); +} + +static void test_ownerdraw(void) +{ + HWND parent, hLB; + INT ret; + RECT rc; + + parent = create_parent(); + assert(parent); + + hLB = create_listbox(LBS_OWNERDRAWFIXED | WS_CHILD | WS_VISIBLE, parent); + assert(hLB); + + SetForegroundWindow(hLB); + UpdateWindow(hLB); + + /* make height short enough */ + SendMessageA(hLB, LB_GETITEMRECT, 0, (LPARAM)&rc); + SetWindowPos(hLB, 0, 0, 0, 100, rc.bottom - rc.top + 1, SWP_NOZORDER | SWP_NOMOVE); + + /* make 0 item invisible */ + SendMessageA(hLB, LB_SETTOPINDEX, 1, 0); + ret = SendMessageA(hLB, LB_GETTOPINDEX, 0, 0); + ok(ret == 1, "wrong top index %d\n", ret); + + SendMessageA(hLB, LB_GETITEMRECT, 0, (LPARAM)&rc); + ok(!IsRectEmpty(&rc), "empty item rect\n"); + ok(rc.top < 0, "rc.top is not negative (%d)\n", rc.top); + + DestroyWindow(hLB); + DestroyWindow(parent); +} + +#define listbox_test_query(exp, got) \ + ok(exp.selected == got.selected, "expected selected %d, got %d\n", exp.selected, got.selected); \ + ok(exp.anchor == got.anchor, "expected anchor %d, got %d\n", exp.anchor, got.anchor); \ + ok(exp.caret == got.caret, "expected caret %d, got %d\n", exp.caret, got.caret); \ + ok(exp.selcount == got.selcount, "expected selcount %d, got %d\n", exp.selcount, got.selcount); + +static void test_LB_SELITEMRANGE(void) +{ + static const struct listbox_stat test_nosel = { 0, LB_ERR, 0, 0 }; + static const struct listbox_stat test_1 = { 0, LB_ERR, 0, 2 }; + static const struct listbox_stat test_2 = { 0, LB_ERR, 0, 3 }; + static const struct listbox_stat test_3 = { 0, LB_ERR, 0, 4 }; + struct listbox_stat answer; + HWND hLB; + INT ret; + + hLB = create_listbox(LBS_EXTENDEDSEL, 0); + assert(hLB); + + listbox_query(hLB, &answer); + listbox_test_query(test_nosel, answer); + + ret = SendMessageA(hLB, LB_SELITEMRANGE, TRUE, MAKELPARAM(1, 2)); + ok(ret == LB_OKAY, "LB_SELITEMRANGE returned %d instead of LB_OKAY\n", ret); + listbox_query(hLB, &answer); + listbox_test_query(test_1, answer); + + SendMessageA(hLB, LB_SETSEL, FALSE, -1); + listbox_query(hLB, &answer); + listbox_test_query(test_nosel, answer); + + ret = SendMessageA(hLB, LB_SELITEMRANGE, TRUE, MAKELPARAM(0, 4)); + ok(ret == LB_OKAY, "LB_SELITEMRANGE returned %d instead of LB_OKAY\n", ret); + listbox_query(hLB, &answer); + listbox_test_query(test_3, answer); + + SendMessageA(hLB, LB_SETSEL, FALSE, -1); + listbox_query(hLB, &answer); + listbox_test_query(test_nosel, answer); + + ret = SendMessageA(hLB, LB_SELITEMRANGE, TRUE, MAKELPARAM(-5, 5)); + ok(ret == LB_OKAY, "LB_SELITEMRANGE returned %d instead of LB_OKAY\n", ret); + listbox_query(hLB, &answer); + listbox_test_query(test_nosel, answer); + + SendMessageA(hLB, LB_SETSEL, FALSE, -1); + listbox_query(hLB, &answer); + listbox_test_query(test_nosel, answer); + + ret = SendMessageA(hLB, LB_SELITEMRANGE, TRUE, MAKELPARAM(2, 10)); + ok(ret == LB_OKAY, "LB_SELITEMRANGE returned %d instead of LB_OKAY\n", ret); + listbox_query(hLB, &answer); + listbox_test_query(test_1, answer); + + SendMessageA(hLB, LB_SETSEL, FALSE, -1); + listbox_query(hLB, &answer); + listbox_test_query(test_nosel, answer); + + ret = SendMessageA(hLB, LB_SELITEMRANGE, TRUE, MAKELPARAM(4, 10)); + ok(ret == LB_OKAY, "LB_SELITEMRANGE returned %d instead of LB_OKAY\n", ret); + listbox_query(hLB, &answer); + listbox_test_query(test_nosel, answer); + + SendMessageA(hLB, LB_SETSEL, FALSE, -1); + listbox_query(hLB, &answer); + listbox_test_query(test_nosel, answer); + + ret = SendMessageA(hLB, LB_SELITEMRANGE, TRUE, MAKELPARAM(10, 1)); + ok(ret == LB_OKAY, "LB_SELITEMRANGE returned %d instead of LB_OKAY\n", ret); + listbox_query(hLB, &answer); + listbox_test_query(test_2, answer); + + SendMessageA(hLB, LB_SETSEL, FALSE, -1); + listbox_query(hLB, &answer); + listbox_test_query(test_nosel, answer); + + ret = SendMessageA(hLB, LB_SELITEMRANGE, TRUE, MAKELPARAM(1, -1)); + ok(ret == LB_OKAY, "LB_SELITEMRANGE returned %d instead of LB_OKAY\n", ret); + listbox_query(hLB, &answer); + listbox_test_query(test_2, answer); + + DestroyWindow(hLB); +} + +static void test_LB_SETCURSEL(void) +{ + HWND parent, hLB; + INT ret; + + parent = create_parent(); + ok(parent != NULL, "Failed to create parent window.\n"); + + hLB = create_listbox(LBS_NOINTEGRALHEIGHT | WS_CHILD, parent); + ok(hLB != NULL, "Failed to create listbox.\n"); + + SendMessageA(hLB, LB_SETITEMHEIGHT, 0, 32); + + ret = SendMessageA(hLB, LB_SETCURSEL, 2, 0); + ok(ret == 2, "LB_SETCURSEL returned %d instead of 2\n", ret); + ret = GetScrollPos(hLB, SB_VERT); + ok(ret == 0, "expected vscroll 0, got %d\n", ret); + + ret = SendMessageA(hLB, LB_SETCURSEL, 3, 0); + ok(ret == 3, "LB_SETCURSEL returned %d instead of 3\n", ret); + ret = GetScrollPos(hLB, SB_VERT); + ok(ret == 1, "expected vscroll 1, got %d\n", ret); + + DestroyWindow(hLB); +} + +static void test_listbox_height(void) +{ + HWND hList; + int r, id; + + hList = CreateWindowA( "ListBox", "list test", 0, + 1, 1, 600, 100, NULL, NULL, NULL, NULL ); + ok( hList != NULL, "failed to create listbox\n"); + + id = SendMessageA( hList, LB_ADDSTRING, 0, (LPARAM) "hi"); + ok( id == 0, "item id wrong\n"); + + r = SendMessageA( hList, LB_SETITEMHEIGHT, 0, MAKELPARAM( 20, 0 )); + ok( r == 0, "send message failed\n"); + + r = SendMessageA(hList, LB_GETITEMHEIGHT, 0, 0 ); + ok( r == 20, "height wrong\n"); + + r = SendMessageA( hList, LB_SETITEMHEIGHT, 0, MAKELPARAM( 0, 30 )); + ok( r == -1, "send message failed\n"); + + r = SendMessageA(hList, LB_GETITEMHEIGHT, 0, 0 ); + ok( r == 20, "height wrong\n"); + + r = SendMessageA( hList, LB_SETITEMHEIGHT, 0, MAKELPARAM( 256, 0 )); + ok( r == -1, "Failed to set item height, %d.\n", r); + + r = SendMessageA(hList, LB_GETITEMHEIGHT, 0, 0 ); + ok( r == 20, "Unexpected item height %d.\n", r); + + r = SendMessageA( hList, LB_SETITEMHEIGHT, 0, MAKELPARAM( 0xff, 0 )); + ok( r == 0, "send message failed\n"); + + r = SendMessageA(hList, LB_GETITEMHEIGHT, 0, 0 ); + ok( r == 0xff, "height wrong\n"); + + DestroyWindow( hList ); +} + +static void test_itemfrompoint(void) +{ + /* WS_POPUP is required in order to have a more accurate size calculation ( + without caption). LBS_NOINTEGRALHEIGHT is required in order to test + behavior of partially-displayed item. + */ + HWND hList = CreateWindowA( "ListBox", "list test", + WS_VISIBLE|WS_POPUP|LBS_NOINTEGRALHEIGHT, + 1, 1, 600, 100, NULL, NULL, NULL, NULL ); + ULONG r, id; + RECT rc; + + /* For an empty listbox win2k returns 0x1ffff, win98 returns 0x10000, nt4 returns 0xffffffff */ + r = SendMessageA(hList, LB_ITEMFROMPOINT, 0, MAKELPARAM( /* x */ 30, /* y */ 30 )); + ok( r == 0x1ffff || r == 0x10000 || r == 0xffffffff, "ret %x\n", r ); + + r = SendMessageA(hList, LB_ITEMFROMPOINT, 0, MAKELPARAM( 700, 30 )); + ok( r == 0x1ffff || r == 0x10000 || r == 0xffffffff, "ret %x\n", r ); + + r = SendMessageA(hList, LB_ITEMFROMPOINT, 0, MAKELPARAM( 30, 300 )); + ok( r == 0x1ffff || r == 0x10000 || r == 0xffffffff, "ret %x\n", r ); + + id = SendMessageA( hList, LB_ADDSTRING, 0, (LPARAM) "hi"); + ok( id == 0, "item id wrong\n"); + id = SendMessageA( hList, LB_ADDSTRING, 0, (LPARAM) "hi1"); + ok( id == 1, "item id wrong\n"); + + r = SendMessageA(hList, LB_ITEMFROMPOINT, 0, MAKELPARAM( /* x */ 30, /* y */ 30 )); + ok( r == 0x1, "ret %x\n", r ); + + r = SendMessageA(hList, LB_ITEMFROMPOINT, 0, MAKELPARAM( /* x */ 30, /* y */ 601 )); + ok( r == 0x10001, "ret %x\n", r ); + + /* Resize control so that below assertions about sizes are valid */ + r = SendMessageA( hList, LB_GETITEMRECT, 0, (LPARAM)&rc); + ok( r == 1, "ret %x\n", r); + r = MoveWindow(hList, 1, 1, 600, (rc.bottom - rc.top + 1) * 9 / 2, TRUE); + ok( r != 0, "ret %x\n", r); + + id = SendMessageA( hList, LB_ADDSTRING, 0, (LPARAM) "hi2"); + ok( id == 2, "item id wrong\n"); + id = SendMessageA( hList, LB_ADDSTRING, 0, (LPARAM) "hi3"); + ok( id == 3, "item id wrong\n"); + id = SendMessageA( hList, LB_ADDSTRING, 0, (LPARAM) "hi4"); + ok( id == 4, "item id wrong\n"); + id = SendMessageA( hList, LB_ADDSTRING, 0, (LPARAM) "hi5"); + ok( id == 5, "item id wrong\n"); + id = SendMessageA( hList, LB_ADDSTRING, 0, (LPARAM) "hi6"); + ok( id == 6, "item id wrong\n"); + id = SendMessageA( hList, LB_ADDSTRING, 0, (LPARAM) "hi7"); + ok( id == 7, "item id wrong\n"); + + /* Set the listbox up so that id 1 is at the top, this leaves 5 + partially visible at the bottom and 6, 7 are invisible */ + + SendMessageA( hList, LB_SETTOPINDEX, 1, 0); + r = SendMessageA( hList, LB_GETTOPINDEX, 0, 0); + ok( r == 1, "top %d\n", r); + + r = SendMessageA( hList, LB_GETITEMRECT, 5, (LPARAM)&rc); + ok( r == 1, "ret %x\n", r); + r = SendMessageA( hList, LB_GETITEMRECT, 6, (LPARAM)&rc); + ok( r == 0, "ret %x\n", r); + + r = SendMessageA( hList, LB_ITEMFROMPOINT, 0, MAKELPARAM(/* x */ 10, /* y */ 10) ); + ok( r == 1, "ret %x\n", r); + + r = SendMessageA( hList, LB_ITEMFROMPOINT, 0, MAKELPARAM(1000, 10) ); + ok( r == 0x10001, "ret %x\n", r ); + + r = SendMessageA( hList, LB_ITEMFROMPOINT, 0, MAKELPARAM(10, -10) ); + ok( r == 0x10001, "ret %x\n", r ); + + r = SendMessageA( hList, LB_ITEMFROMPOINT, 0, MAKELPARAM(10, 100) ); + ok( r == 0x10005, "item %x\n", r ); + + r = SendMessageA( hList, LB_ITEMFROMPOINT, 0, MAKELPARAM(10, 200) ); + ok( r == 0x10005, "item %x\n", r ); + + DestroyWindow( hList ); +} + +static void test_listbox_item_data(void) +{ + HWND hList; + int r, id; + + hList = CreateWindowA( "ListBox", "list test", 0, + 1, 1, 600, 100, NULL, NULL, NULL, NULL ); + ok( hList != NULL, "failed to create listbox\n"); + + id = SendMessageA( hList, LB_ADDSTRING, 0, (LPARAM) "hi"); + ok( id == 0, "item id wrong\n"); + + r = SendMessageA( hList, LB_SETITEMDATA, 0, MAKELPARAM( 20, 0 )); + ok(r == TRUE, "LB_SETITEMDATA returned %d instead of TRUE\n", r); + + r = SendMessageA( hList, LB_GETITEMDATA, 0, 0); + ok( r == 20, "get item data failed\n"); + + DestroyWindow( hList ); +} + +static void test_listbox_LB_DIR(void) +{ + HWND hList; + int res, itemCount; + int itemCount_justFiles; + int itemCount_justDrives; + int itemCount_allFiles; + int itemCount_allDirs; + int i; + char pathBuffer[MAX_PATH]; + char * p; + char driveletter; + const char *wildcard = "*"; + HANDLE file; + + file = CreateFileA( "wtest1.tmp.c", GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL ); + ok(file != INVALID_HANDLE_VALUE, "Error creating the test file: %d\n", GetLastError()); + CloseHandle( file ); + + /* NOTE: for this test to succeed, there must be no subdirectories + under the current directory. In addition, there must be at least + one file that fits the wildcard w*.c . Normally, the test + directory itself satisfies both conditions. + */ + hList = CreateWindowA( "ListBox", "list test", WS_VISIBLE|WS_POPUP, + 1, 1, 600, 100, NULL, NULL, NULL, NULL ); + assert(hList); + + /* Test for standard usage */ + + /* This should list all the files in the test directory. */ + strcpy(pathBuffer, wildcard); + SendMessageA(hList, LB_RESETCONTENT, 0, 0); + res = SendMessageA(hList, LB_DIR, 0, (LPARAM)pathBuffer); + if (res == -1) /* "*" wildcard doesn't work on win9x */ + { + wildcard = "*.*"; + strcpy(pathBuffer, wildcard); + res = SendMessageA(hList, LB_DIR, 0, (LPARAM)pathBuffer); + } + ok (res >= 0, "SendMessage(LB_DIR, 0, *) failed - 0x%08x\n", GetLastError()); + + /* There should be some content in the listbox */ + itemCount = SendMessageA(hList, LB_GETCOUNT, 0, 0); + ok (itemCount > 0, "SendMessage(LB_DIR) did NOT fill the listbox!\n"); + itemCount_allFiles = itemCount; + ok(res + 1 == itemCount, + "SendMessage(LB_DIR, 0, *) returned incorrect index (expected %d got %d)!\n", + itemCount - 1, res); + + /* This tests behavior when no files match the wildcard */ + strcpy(pathBuffer, BAD_EXTENSION); + SendMessageA(hList, LB_RESETCONTENT, 0, 0); + res = SendMessageA(hList, LB_DIR, 0, (LPARAM)pathBuffer); + ok (res == -1, "SendMessage(LB_DIR, 0, %s) returned %d, expected -1\n", BAD_EXTENSION, res); + + /* There should be NO content in the listbox */ + itemCount = SendMessageA(hList, LB_GETCOUNT, 0, 0); + ok (itemCount == 0, "SendMessage(LB_DIR) DID fill the listbox!\n"); + + + /* This should list all the w*.c files in the test directory + * As of this writing, this includes win.c, winstation.c, wsprintf.c + */ + strcpy(pathBuffer, "w*.c"); + SendMessageA(hList, LB_RESETCONTENT, 0, 0); + res = SendMessageA(hList, LB_DIR, 0, (LPARAM)pathBuffer); + ok (res >= 0, "SendMessage(LB_DIR, 0, w*.c) failed - 0x%08x\n", GetLastError()); + + /* Path specification does NOT converted to uppercase */ + ok (!strcmp(pathBuffer, "w*.c"), + "expected no change to pathBuffer, got %s\n", pathBuffer); + + /* There should be some content in the listbox */ + itemCount = SendMessageA(hList, LB_GETCOUNT, 0, 0); + ok (itemCount > 0, "SendMessage(LB_DIR) did NOT fill the listbox!\n"); + itemCount_justFiles = itemCount; + ok(res + 1 == itemCount, + "SendMessage(LB_DIR, 0, w*.c) returned incorrect index (expected %d got %d)!\n", + itemCount - 1, res); + + /* Every single item in the control should start with a w and end in .c */ + for (i = 0; i < itemCount; i++) + { + memset(pathBuffer, 0, MAX_PATH); + SendMessageA(hList, LB_GETTEXT, i, (LPARAM)pathBuffer); + p = pathBuffer + strlen(pathBuffer); + ok(((pathBuffer[0] == 'w' || pathBuffer[0] == 'W') && + (*(p-1) == 'c' || *(p-1) == 'C') && + (*(p-2) == '.')), "Element %d (%s) does not fit requested w*.c\n", i, pathBuffer); + } + + /* Test DDL_DIRECTORY */ + strcpy(pathBuffer, wildcard); + SendMessageA(hList, LB_RESETCONTENT, 0, 0); + res = SendMessageA(hList, LB_DIR, DDL_DIRECTORY, (LPARAM)pathBuffer); + ok (res > 0, "SendMessage(LB_DIR, DDL_DIRECTORY, *) failed - 0x%08x\n", GetLastError()); + + /* There should be some content in the listbox. + * All files plus "[..]" + */ + itemCount = SendMessageA(hList, LB_GETCOUNT, 0, 0); + itemCount_allDirs = itemCount - itemCount_allFiles; + ok (itemCount >= itemCount_allFiles, + "SendMessage(LB_DIR, DDL_DIRECTORY, *) filled with %d entries, expected > %d\n", + itemCount, itemCount_allFiles); + ok(res + 1 == itemCount, + "SendMessage(LB_DIR, DDL_DIRECTORY, *) returned incorrect index (expected %d got %d)!\n", + itemCount - 1, res); + + /* This tests behavior when no files match the wildcard */ + strcpy(pathBuffer, BAD_EXTENSION); + SendMessageA(hList, LB_RESETCONTENT, 0, 0); + res = SendMessageA(hList, LB_DIR, DDL_DIRECTORY, (LPARAM)pathBuffer); + ok (res == -1, "SendMessage(LB_DIR, DDL_DIRECTORY, %s) returned %d, expected -1\n", BAD_EXTENSION, res); + + /* There should be NO content in the listbox */ + itemCount = SendMessageA(hList, LB_GETCOUNT, 0, 0); + ok (itemCount == 0, "SendMessage(LB_DIR) DID fill the listbox!\n"); + + /* Test DDL_DIRECTORY */ + strcpy(pathBuffer, "w*.c"); + SendMessageA(hList, LB_RESETCONTENT, 0, 0); + res = SendMessageA(hList, LB_DIR, DDL_DIRECTORY, (LPARAM)pathBuffer); + ok (res >= 0, "SendMessage(LB_DIR, DDL_DIRECTORY, w*.c) failed - 0x%08x\n", GetLastError()); + + /* There should be some content in the listbox. Since the parent directory does not + * fit w*.c, there should be exactly the same number of items as without DDL_DIRECTORY + */ + itemCount = SendMessageA(hList, LB_GETCOUNT, 0, 0); + ok (itemCount == itemCount_justFiles, + "SendMessage(LB_DIR, DDL_DIRECTORY, w*.c) filled with %d entries, expected %d\n", + itemCount, itemCount_justFiles); + ok(res + 1 == itemCount, + "SendMessage(LB_DIR, DDL_DIRECTORY, w*.c) returned incorrect index (expected %d got %d)!\n", + itemCount - 1, res); + + /* Every single item in the control should start with a w and end in .c. */ + for (i = 0; i < itemCount; i++) + { + memset(pathBuffer, 0, MAX_PATH); + SendMessageA(hList, LB_GETTEXT, i, (LPARAM)pathBuffer); + p = pathBuffer + strlen(pathBuffer); + ok( + ((pathBuffer[0] == 'w' || pathBuffer[0] == 'W') && + (*(p-1) == 'c' || *(p-1) == 'C') && + (*(p-2) == '.')), "Element %d (%s) does not fit requested w*.c\n", i, pathBuffer); + } + + /* Test DDL_DRIVES|DDL_EXCLUSIVE */ + strcpy(pathBuffer, wildcard); + SendMessageA(hList, LB_RESETCONTENT, 0, 0); + res = SendMessageA(hList, LB_DIR, DDL_DRIVES|DDL_EXCLUSIVE, (LPARAM)pathBuffer); + ok (res >= 0, "SendMessage(LB_DIR, DDL_DRIVES|DDL_EXCLUSIVE, *) failed - 0x%08x\n", GetLastError()); + + /* There should be some content in the listbox. In particular, there should + * be at least one element before, since the string "[-c-]" should + * have been added. Depending on the user setting, more drives might have + * been added. + */ + itemCount = SendMessageA(hList, LB_GETCOUNT, 0, 0); + ok (itemCount >= 1, + "SendMessage(LB_DIR, DDL_DRIVES|DDL_EXCLUSIVE, *) filled with %d entries, expected at least %d\n", + itemCount, 1); + itemCount_justDrives = itemCount; + ok(res + 1 == itemCount, "SendMessage(LB_DIR, DDL_DRIVES|DDL_EXCLUSIVE, *) returned incorrect index!\n"); + + /* Every single item in the control should fit the format [-c-] */ + for (i = 0; i < itemCount; i++) + { + memset(pathBuffer, 0, MAX_PATH); + driveletter = '\0'; + SendMessageA(hList, LB_GETTEXT, i, (LPARAM)pathBuffer); + ok( strlen(pathBuffer) == 5, "Length of drive string is not 5\n" ); + ok( sscanf(pathBuffer, "[-%c-]", &driveletter) == 1, "Element %d (%s) does not fit [-X-]\n", i, pathBuffer); + ok( driveletter >= 'a' && driveletter <= 'z', "Drive letter not in range a..z, got ascii %d\n", driveletter); + if (!(driveletter >= 'a' && driveletter <= 'z')) + { + /* Correct after invalid entry is found */ + itemCount_justDrives--; + } + } + + /* This tests behavior when no files match the wildcard */ + strcpy(pathBuffer, BAD_EXTENSION); + SendMessageA(hList, LB_RESETCONTENT, 0, 0); + res = SendMessageA(hList, LB_DIR, DDL_DRIVES|DDL_EXCLUSIVE, (LPARAM)pathBuffer); + ok (res == itemCount_justDrives -1, "SendMessage(LB_DIR, DDL_DRIVES|DDL_EXCLUSIVE, %s) returned %d, expected %d\n", + BAD_EXTENSION, res, itemCount_justDrives -1); + + itemCount = SendMessageA(hList, LB_GETCOUNT, 0, 0); + ok (itemCount == itemCount_justDrives, "SendMessage(LB_DIR) returned %d expected %d\n", + itemCount, itemCount_justDrives); + + /* Test DDL_DRIVES. */ + strcpy(pathBuffer, wildcard); + SendMessageA(hList, LB_RESETCONTENT, 0, 0); + res = SendMessageA(hList, LB_DIR, DDL_DRIVES, (LPARAM)pathBuffer); + ok (res > 0, "SendMessage(LB_DIR, DDL_DRIVES, *) failed - 0x%08x\n", GetLastError()); + + /* There should be some content in the listbox. In particular, there should + * be at least one element before, since the string "[-c-]" should + * have been added. Depending on the user setting, more drives might have + * been added. + */ + itemCount = SendMessageA(hList, LB_GETCOUNT, 0, 0); + ok (itemCount == itemCount_justDrives + itemCount_allFiles, + "SendMessage(LB_DIR, DDL_DRIVES, *) filled with %d entries, expected %d\n", + itemCount, itemCount_justDrives + itemCount_allFiles); + ok(res + 1 == itemCount, "SendMessage(LB_DIR, DDL_DRIVES, *) returned incorrect index!\n"); + + /* This tests behavior when no files match the wildcard */ + strcpy(pathBuffer, BAD_EXTENSION); + SendMessageA(hList, LB_RESETCONTENT, 0, 0); + res = SendMessageA(hList, LB_DIR, DDL_DRIVES, (LPARAM)pathBuffer); + ok (res == itemCount_justDrives -1, "SendMessage(LB_DIR, DDL_DRIVES, %s) returned %d, expected %d\n", + BAD_EXTENSION, res, itemCount_justDrives -1); + + itemCount = SendMessageA(hList, LB_GETCOUNT, 0, 0); + ok (itemCount == res + 1, "SendMessage(LB_DIR) returned %d expected %d\n", itemCount, res + 1); + + /* Test DDL_DRIVES. */ + strcpy(pathBuffer, "w*.c"); + SendMessageA(hList, LB_RESETCONTENT, 0, 0); + res = SendMessageA(hList, LB_DIR, DDL_DRIVES, (LPARAM)pathBuffer); + ok (res > 0, "SendMessage(LB_DIR, DDL_DRIVES, w*.c) failed - 0x%08x\n", GetLastError()); + + /* There should be some content in the listbox. In particular, there should + * be at least one element before, since the string "[-c-]" should + * have been added. Depending on the user setting, more drives might have + * been added. + */ + itemCount = SendMessageA(hList, LB_GETCOUNT, 0, 0); + ok (itemCount == itemCount_justDrives + itemCount_justFiles, + "SendMessage(LB_DIR, DDL_DRIVES, w*.c) filled with %d entries, expected %d\n", + itemCount, itemCount_justDrives + itemCount_justFiles); + ok(res + 1 == itemCount, "SendMessage(LB_DIR, DDL_DRIVES, w*.c) returned incorrect index!\n"); + + /* Every single item in the control should fit the format [-c-], or w*.c */ + for (i = 0; i < itemCount; i++) + { + memset(pathBuffer, 0, MAX_PATH); + driveletter = '\0'; + SendMessageA(hList, LB_GETTEXT, i, (LPARAM)pathBuffer); + p = pathBuffer + strlen(pathBuffer); + if (sscanf(pathBuffer, "[-%c-]", &driveletter) == 1) + { + ok( strlen(pathBuffer) == 5, "Length of drive string is not 5\n" ); + ok( driveletter >= 'a' && driveletter <= 'z', "Drive letter not in range a..z, got ascii %d\n", driveletter); + } + else + { + ok( + ((pathBuffer[0] == 'w' || pathBuffer[0] == 'W') && + (*(p-1) == 'c' || *(p-1) == 'C') && + (*(p-2) == '.')), "Element %d (%s) does not fit requested w*.c\n", i, pathBuffer); + } + } + + /* Test DDL_DIRECTORY|DDL_DRIVES. This does *not* imply DDL_EXCLUSIVE */ + strcpy(pathBuffer, wildcard); + SendMessageA(hList, LB_RESETCONTENT, 0, 0); + res = SendMessageA(hList, LB_DIR, DDL_DIRECTORY|DDL_DRIVES, (LPARAM)pathBuffer); + ok (res > 0, "SendMessage(LB_DIR, DDL_DIRECTORY|DDL_DRIVES, *) failed - 0x%08x\n", GetLastError()); + + /* There should be some content in the listbox. In particular, there should + * be exactly the number of plain files, plus the number of mapped drives. + */ + itemCount = SendMessageA(hList, LB_GETCOUNT, 0, 0); + ok (itemCount == itemCount_allFiles + itemCount_justDrives + itemCount_allDirs, + "SendMessage(LB_DIR, DDL_DIRECTORY|DDL_DRIVES) filled with %d entries, expected %d\n", + itemCount, itemCount_allFiles + itemCount_justDrives + itemCount_allDirs); + ok(res + 1 == itemCount, "SendMessage(LB_DIR, DDL_DIRECTORY|DDL_DRIVES, w*.c) returned incorrect index!\n"); + + /* Every single item in the control should start with a w and end in .c, + * except for the "[..]" string, which should appear exactly as it is, + * and the mapped drives in the format "[-X-]". + */ + for (i = 0; i < itemCount; i++) + { + memset(pathBuffer, 0, MAX_PATH); + driveletter = '\0'; + SendMessageA(hList, LB_GETTEXT, i, (LPARAM)pathBuffer); + if (sscanf(pathBuffer, "[-%c-]", &driveletter) == 1) + ok( driveletter >= 'a' && driveletter <= 'z', "Drive letter not in range a..z, got ascii %d\n", driveletter); + } + + /* This tests behavior when no files match the wildcard */ + strcpy(pathBuffer, BAD_EXTENSION); + SendMessageA(hList, LB_RESETCONTENT, 0, 0); + res = SendMessageA(hList, LB_DIR, DDL_DIRECTORY|DDL_DRIVES, (LPARAM)pathBuffer); + ok (res == itemCount_justDrives -1, "SendMessage(LB_DIR, DDL_DIRECTORY|DDL_DRIVES, %s) returned %d, expected %d\n", + BAD_EXTENSION, res, itemCount_justDrives -1); + + itemCount = SendMessageA(hList, LB_GETCOUNT, 0, 0); + ok (itemCount == res + 1, "SendMessage(LB_DIR) returned %d expected %d\n", itemCount, res + 1); + + /* Test DDL_DIRECTORY|DDL_DRIVES. */ + strcpy(pathBuffer, "w*.c"); + SendMessageA(hList, LB_RESETCONTENT, 0, 0); + res = SendMessageA(hList, LB_DIR, DDL_DIRECTORY|DDL_DRIVES, (LPARAM)pathBuffer); + ok (res > 0, "SendMessage(LB_DIR, DDL_DIRECTORY|DDL_DRIVES, w*.c) failed - 0x%08x\n", GetLastError()); + + /* There should be some content in the listbox. In particular, there should + * be exactly the number of plain files, plus the number of mapped drives. + */ + itemCount = SendMessageA(hList, LB_GETCOUNT, 0, 0); + ok (itemCount == itemCount_justFiles + itemCount_justDrives, + "SendMessage(LB_DIR, DDL_DIRECTORY|DDL_DRIVES) filled with %d entries, expected %d\n", + itemCount, itemCount_justFiles + itemCount_justDrives); + ok(res + 1 == itemCount, "SendMessage(LB_DIR, DDL_DIRECTORY|DDL_DRIVES, w*.c) returned incorrect index!\n"); + + /* Every single item in the control should start with a w and end in .c, + * except the mapped drives in the format "[-X-]". The "[..]" directory + * should not appear. + */ + for (i = 0; i < itemCount; i++) + { + memset(pathBuffer, 0, MAX_PATH); + driveletter = '\0'; + SendMessageA(hList, LB_GETTEXT, i, (LPARAM)pathBuffer); + p = pathBuffer + strlen(pathBuffer); + if (sscanf(pathBuffer, "[-%c-]", &driveletter) == 1) + ok( driveletter >= 'a' && driveletter <= 'z', "Drive letter not in range a..z, got ascii %d\n", driveletter); + else + ok( + ((pathBuffer[0] == 'w' || pathBuffer[0] == 'W') && + (*(p-1) == 'c' || *(p-1) == 'C') && + (*(p-2) == '.')), "Element %d (%s) does not fit requested w*.c\n", i, pathBuffer); + } + + /* Test DDL_DIRECTORY|DDL_EXCLUSIVE. */ + strcpy(pathBuffer, wildcard); + SendMessageA(hList, LB_RESETCONTENT, 0, 0); + res = SendMessageA(hList, LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, (LPARAM)pathBuffer); + ok (res != -1 || broken(res == -1), "SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, *) failed err %u\n", + GetLastError()); + + itemCount = SendMessageA(hList, LB_GETCOUNT, 0, 0); + ok (itemCount == itemCount_allDirs, + "SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE) filled with %d entries, expected %d\n", + itemCount, itemCount_allDirs); + ok(res + 1 == itemCount, "SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, *) returned incorrect index!\n"); + + if (itemCount && GetCurrentDirectoryA( MAX_PATH, pathBuffer ) > 3) /* there's no [..] in drive root */ + { + memset(pathBuffer, 0, MAX_PATH); + SendMessageA(hList, LB_GETTEXT, 0, (LPARAM)pathBuffer); + ok( !strcmp(pathBuffer, "[..]"), "First element is not [..]\n"); + } + + /* This tests behavior when no files match the wildcard */ + strcpy(pathBuffer, BAD_EXTENSION); + SendMessageA(hList, LB_RESETCONTENT, 0, 0); + res = SendMessageA(hList, LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, (LPARAM)pathBuffer); + ok (res == -1, "SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, %s) returned %d, expected %d\n", + BAD_EXTENSION, res, -1); + + itemCount = SendMessageA(hList, LB_GETCOUNT, 0, 0); + ok (itemCount == res + 1, "SendMessage(LB_DIR) returned %d expected %d\n", itemCount, res + 1); + + + /* Test DDL_DIRECTORY|DDL_EXCLUSIVE. */ + strcpy(pathBuffer, "w*.c"); + SendMessageA(hList, LB_RESETCONTENT, 0, 0); + res = SendMessageA(hList, LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, (LPARAM)pathBuffer); + ok (res == LB_ERR, "SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, w*.c) returned %d expected %d\n", res, LB_ERR); + + /* There should be no elements, since "[..]" does not fit w*.c */ + itemCount = SendMessageA(hList, LB_GETCOUNT, 0, 0); + ok (itemCount == 0, + "SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE) filled with %d entries, expected %d\n", + itemCount, 0); + + /* Test DDL_DIRECTORY|DDL_DRIVES|DDL_EXCLUSIVE. */ + strcpy(pathBuffer, wildcard); + SendMessageA(hList, LB_RESETCONTENT, 0, 0); + res = SendMessageA(hList, LB_DIR, DDL_DIRECTORY|DDL_DRIVES|DDL_EXCLUSIVE, (LPARAM)pathBuffer); + ok (res > 0, "SendMessage(LB_DIR, DDL_DIRECTORY|DDL_DRIVES|DDL_EXCLUSIVE, w*.c,) failed - 0x%08x\n", GetLastError()); + + /* There should be no plain files on the listbox */ + itemCount = SendMessageA(hList, LB_GETCOUNT, 0, 0); + ok (itemCount == itemCount_justDrives + itemCount_allDirs, + "SendMessage(LB_DIR, DDL_DIRECTORY|DDL_DRIVES|DDL_EXCLUSIVE) filled with %d entries, expected %d\n", + itemCount, itemCount_justDrives + itemCount_allDirs); + ok(res + 1 == itemCount, "SendMessage(LB_DIR, DDL_DIRECTORY|DDL_DRIVES|DDL_EXCLUSIVE, w*.c) returned incorrect index!\n"); + + for (i = 0; i < itemCount; i++) + { + memset(pathBuffer, 0, MAX_PATH); + driveletter = '\0'; + SendMessageA(hList, LB_GETTEXT, i, (LPARAM)pathBuffer); + if (sscanf(pathBuffer, "[-%c-]", &driveletter) == 1) + ok( driveletter >= 'a' && driveletter <= 'z', "Drive letter not in range a..z, got ascii %d\n", driveletter); + else + ok( pathBuffer[0] == '[' && pathBuffer[strlen(pathBuffer)-1] == ']', + "Element %d (%s) does not fit expected [...]\n", i, pathBuffer); + } + + /* This tests behavior when no files match the wildcard */ + strcpy(pathBuffer, BAD_EXTENSION); + SendMessageA(hList, LB_RESETCONTENT, 0, 0); + res = SendMessageA(hList, LB_DIR, DDL_DIRECTORY|DDL_DRIVES|DDL_EXCLUSIVE, (LPARAM)pathBuffer); + ok (res == itemCount_justDrives -1, "SendMessage(LB_DIR, DDL_DIRECTORY|DDL_DRIVES|DDL_EXCLUSIVE, %s) returned %d, expected %d\n", + BAD_EXTENSION, res, itemCount_justDrives -1); + + itemCount = SendMessageA(hList, LB_GETCOUNT, 0, 0); + ok (itemCount == res + 1, "SendMessage(LB_DIR) returned %d expected %d\n", itemCount, res + 1); + + /* Test DDL_DIRECTORY|DDL_DRIVES|DDL_EXCLUSIVE. */ + strcpy(pathBuffer, "w*.c"); + SendMessageA(hList, LB_RESETCONTENT, 0, 0); + res = SendMessageA(hList, LB_DIR, DDL_DIRECTORY|DDL_DRIVES|DDL_EXCLUSIVE, (LPARAM)pathBuffer); + ok (res >= 0, "SendMessage(LB_DIR, DDL_DIRECTORY|DDL_DRIVES|DDL_EXCLUSIVE, w*.c,) failed - 0x%08x\n", GetLastError()); + + /* There should be no plain files on the listbox, and no [..], since it does not fit w*.c */ + itemCount = SendMessageA(hList, LB_GETCOUNT, 0, 0); + ok (itemCount == itemCount_justDrives, + "SendMessage(LB_DIR, DDL_DIRECTORY|DDL_DRIVES|DDL_EXCLUSIVE) filled with %d entries, expected %d\n", + itemCount, itemCount_justDrives); + ok(res + 1 == itemCount, "SendMessage(LB_DIR, DDL_DIRECTORY|DDL_DRIVES|DDL_EXCLUSIVE, w*.c) returned incorrect index!\n"); + + for (i = 0; i < itemCount; i++) + { + memset(pathBuffer, 0, MAX_PATH); + driveletter = '\0'; + SendMessageA(hList, LB_GETTEXT, i, (LPARAM)pathBuffer); + ok (sscanf(pathBuffer, "[-%c-]", &driveletter) == 1, "Element %d (%s) does not fit [-X-]\n", i, pathBuffer); + ok( driveletter >= 'a' && driveletter <= 'z', "Drive letter not in range a..z, got ascii %d\n", driveletter); + } + DestroyWindow(hList); + + DeleteFileA( "wtest1.tmp.c" ); +} + +static HWND g_listBox; +static HWND g_label; + +#define ID_TEST_LABEL 1001 +#define ID_TEST_LISTBOX 1002 + +static BOOL on_listbox_container_create(HWND hwnd, CREATESTRUCTA *lpcs) +{ + g_label = CreateWindowA("Static", "Contents of static control before DlgDirList.", + WS_CHILD | WS_VISIBLE, 10, 10, 512, 32, hwnd, (HMENU)ID_TEST_LABEL, NULL, 0); + if (!g_label) return FALSE; + + g_listBox = CreateWindowA("ListBox", "DlgDirList test", + WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_BORDER | WS_VSCROLL, 10, 60, 256, 256, + hwnd, (HMENU)ID_TEST_LISTBOX, NULL, 0); + if (!g_listBox) return FALSE; + + return TRUE; +} + +static LRESULT CALLBACK listbox_container_window_procA(HWND hwnd, UINT uiMsg, WPARAM wParam, LPARAM lParam) +{ + LRESULT result = 0; + + switch (uiMsg) + { + case WM_DESTROY: + PostQuitMessage(0); + break; + case WM_CREATE: + result = on_listbox_container_create(hwnd, (CREATESTRUCTA *)lParam) ? 0 : (LRESULT)-1; + break; + default: + result = DefWindowProcA(hwnd, uiMsg, wParam, lParam); + break; + } + return result; +} + +static BOOL RegisterListboxWindowClass(HINSTANCE hInst) +{ + WNDCLASSA cls; + + cls.style = 0; + cls.cbClsExtra = 0; + cls.cbWndExtra = 0; + cls.hInstance = hInst; + cls.hIcon = NULL; + cls.hCursor = LoadCursorA (NULL, (LPCSTR)IDC_ARROW); + cls.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); + cls.lpszMenuName = NULL; + cls.lpfnWndProc = listbox_container_window_procA; + cls.lpszClassName = "ListboxContainerClass"; + if (!RegisterClassA (&cls)) return FALSE; + + return TRUE; +} + +static void test_listbox_dlgdir(void) +{ + HINSTANCE hInst; + HWND hWnd; + int res, itemCount; + int itemCount_allDirs; + int itemCount_justFiles; + int itemCount_justDrives; + int i; + char pathBuffer[MAX_PATH]; + char itemBuffer[MAX_PATH]; + char tempBuffer[MAX_PATH]; + char * p; + char driveletter; + HANDLE file; + + file = CreateFileA( "wtest1.tmp.c", GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL ); + ok(file != INVALID_HANDLE_VALUE, "Error creating the test file: %d\n", GetLastError()); + CloseHandle( file ); + + /* NOTE: for this test to succeed, there must be no subdirectories + under the current directory. In addition, there must be at least + one file that fits the wildcard w*.c . Normally, the test + directory itself satisfies both conditions. + */ + + hInst = GetModuleHandleA(0); + if (!RegisterListboxWindowClass(hInst)) assert(0); + + hWnd = CreateWindowA("ListboxContainerClass", "ListboxContainerClass", + WS_OVERLAPPEDWINDOW | WS_VISIBLE, + CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, + NULL, NULL, hInst, 0); + ok(hWnd != NULL, "Failed to create container window.\n"); + + /* Test for standard usage */ + + /* The following should be overwritten by the directory path */ + SendMessageA(g_label, WM_SETTEXT, 0, (LPARAM)"default contents"); + + /* This should list all the w*.c files in the test directory + * As of this writing, this includes win.c, winstation.c, wsprintf.c + */ + strcpy(pathBuffer, "w*.c"); + res = DlgDirListA(hWnd, pathBuffer, ID_TEST_LISTBOX, ID_TEST_LABEL, 0); + ok (res == 1, "DlgDirList(*.c, 0) returned %d - expected 1 - 0x%08x\n", res, GetLastError()); + + /* Path specification gets converted to uppercase */ + ok (!strcmp(pathBuffer, "W*.C"), + "expected conversion to uppercase, got %s\n", pathBuffer); + + /* Loaded path should have overwritten the label text */ + SendMessageA(g_label, WM_GETTEXT, MAX_PATH, (LPARAM)pathBuffer); + ok (strcmp("default contents", pathBuffer), "DlgDirList() did not modify static control!\n"); + + /* There should be some content in the listbox */ + itemCount = SendMessageA(g_listBox, LB_GETCOUNT, 0, 0); + ok (itemCount > 0, "DlgDirList() did NOT fill the listbox!\n"); + itemCount_justFiles = itemCount; + + /* Every single item in the control should start with a w and end in .c */ + for (i = 0; i < itemCount; i++) + { + memset(pathBuffer, 0, MAX_PATH); + SendMessageA(g_listBox, LB_GETTEXT, i, (LPARAM)pathBuffer); + p = pathBuffer + strlen(pathBuffer); + ok(((pathBuffer[0] == 'w' || pathBuffer[0] == 'W') && + (*(p-1) == 'c' || *(p-1) == 'C') && + (*(p-2) == '.')), "Element %d (%s) does not fit requested w*.c\n", i, pathBuffer); + } + + /* Test behavior when no files match the wildcard */ + strcpy(pathBuffer, BAD_EXTENSION); + res = DlgDirListA(hWnd, pathBuffer, ID_TEST_LISTBOX, ID_TEST_LABEL, 0); + ok (res == 1, "DlgDirList(%s, 0) returned %d expected 1\n", BAD_EXTENSION, res); + + itemCount = SendMessageA(g_listBox, LB_GETCOUNT, 0, 0); + ok (itemCount == 0, "DlgDirList() DID fill the listbox!\n"); + + /* Test DDL_DIRECTORY */ + strcpy(pathBuffer, "w*.c"); + res = DlgDirListA(hWnd, pathBuffer, ID_TEST_LISTBOX, ID_TEST_LABEL, DDL_DIRECTORY); + ok (res == 1, "DlgDirList(*.c, DDL_DIRECTORY) failed - 0x%08x\n", GetLastError()); + + /* There should be some content in the listbox. In particular, there should + * be exactly more elements than before, since the directories should + * have been added. + */ + itemCount = SendMessageA(g_listBox, LB_GETCOUNT, 0, 0); + itemCount_allDirs = itemCount - itemCount_justFiles; + ok (itemCount >= itemCount_justFiles, "DlgDirList(DDL_DIRECTORY) filled with %d entries, expected > %d\n", + itemCount, itemCount_justFiles); + + /* Every single item in the control should start with a w and end in .c, + * except for the "[..]" string, which should appear exactly as it is. + */ + for (i = 0; i < itemCount; i++) + { + memset(pathBuffer, 0, MAX_PATH); + SendMessageA(g_listBox, LB_GETTEXT, i, (LPARAM)pathBuffer); + p = pathBuffer + strlen(pathBuffer); + ok( (pathBuffer[0] == '[' && pathBuffer[strlen(pathBuffer)-1] == ']') || + ((pathBuffer[0] == 'w' || pathBuffer[0] == 'W') && + (*(p-1) == 'c' || *(p-1) == 'C') && + (*(p-2) == '.')), "Element %d (%s) does not fit requested w*.c\n", i, pathBuffer); + } + + /* Test behavior when no files match the wildcard */ + strcpy(pathBuffer, BAD_EXTENSION); + res = DlgDirListA(hWnd, pathBuffer, ID_TEST_LISTBOX, ID_TEST_LABEL, DDL_DIRECTORY); + ok (res == 1, "DlgDirList(%s, DDL_DIRECTORY) returned %d expected 1\n", BAD_EXTENSION, res); + + itemCount = SendMessageA(g_listBox, LB_GETCOUNT, 0, 0); + ok (itemCount == itemCount_allDirs, "DlgDirList() incorrectly filled the listbox! (expected %d got %d)\n", + itemCount_allDirs, itemCount); + for (i = 0; i < itemCount; i++) + { + memset(pathBuffer, 0, MAX_PATH); + SendMessageA(g_listBox, LB_GETTEXT, i, (LPARAM)pathBuffer); + ok( pathBuffer[0] == '[' && pathBuffer[strlen(pathBuffer)-1] == ']', + "Element %d (%s) does not fit requested [...]\n", i, pathBuffer); + } + + /* Test DDL_DRIVES. At least on WinXP-SP2, this implies DDL_EXCLUSIVE */ + strcpy(pathBuffer, "w*.c"); + res = DlgDirListA(hWnd, pathBuffer, ID_TEST_LISTBOX, ID_TEST_LABEL, DDL_DRIVES); + ok (res == 1, "DlgDirList(*.c, DDL_DRIVES) failed - 0x%08x\n", GetLastError()); + + /* There should be some content in the listbox. In particular, there should + * be at least one element before, since the string "[-c-]" should + * have been added. Depending on the user setting, more drives might have + * been added. + */ + itemCount = SendMessageA(g_listBox, LB_GETCOUNT, 0, 0); + ok (itemCount >= 1, + "DlgDirList(DDL_DRIVES) filled with %d entries, expected at least %d\n", + itemCount, 1); + itemCount_justDrives = itemCount; + + /* Every single item in the control should fit the format [-c-] */ + for (i = 0; i < itemCount; i++) + { + memset(pathBuffer, 0, MAX_PATH); + driveletter = '\0'; + SendMessageA(g_listBox, LB_GETTEXT, i, (LPARAM)pathBuffer); + ok( strlen(pathBuffer) == 5, "Length of drive string is not 5\n" ); + ok( sscanf(pathBuffer, "[-%c-]", &driveletter) == 1, "Element %d (%s) does not fit [-X-]\n", i, pathBuffer); + ok( driveletter >= 'a' && driveletter <= 'z', "Drive letter not in range a..z, got ascii %d\n", driveletter); + if (!(driveletter >= 'a' && driveletter <= 'z')) { + /* Correct after invalid entry is found */ + trace("removing count of invalid entry %s\n", pathBuffer); + itemCount_justDrives--; + } + } + + /* Test behavior when no files match the wildcard */ + strcpy(pathBuffer, BAD_EXTENSION); + res = DlgDirListA(hWnd, pathBuffer, ID_TEST_LISTBOX, ID_TEST_LABEL, DDL_DRIVES); + ok (res == 1, "DlgDirList(%s, DDL_DRIVES) returned %d expected 1\n", BAD_EXTENSION, res); + + itemCount = SendMessageA(g_listBox, LB_GETCOUNT, 0, 0); + ok (itemCount == itemCount_justDrives, "DlgDirList() incorrectly filled the listbox!\n"); + + /* Test DDL_DIRECTORY|DDL_DRIVES. This does *not* imply DDL_EXCLUSIVE */ + strcpy(pathBuffer, "w*.c"); + res = DlgDirListA(hWnd, pathBuffer, ID_TEST_LISTBOX, ID_TEST_LABEL, DDL_DIRECTORY|DDL_DRIVES); + ok (res == 1, "DlgDirList(*.c, DDL_DIRECTORY|DDL_DRIVES) failed - 0x%08x\n", GetLastError()); + + /* There should be some content in the listbox. In particular, there should + * be exactly the number of plain files, plus the number of mapped drives, + * plus one "[..]" + */ + itemCount = SendMessageA(g_listBox, LB_GETCOUNT, 0, 0); + ok (itemCount == itemCount_justFiles + itemCount_justDrives + itemCount_allDirs, + "DlgDirList(DDL_DIRECTORY|DDL_DRIVES) filled with %d entries, expected %d\n", + itemCount, itemCount_justFiles + itemCount_justDrives + itemCount_allDirs); + + /* Every single item in the control should start with a w and end in .c, + * except for the "[..]" string, which should appear exactly as it is, + * and the mapped drives in the format "[-X-]". + */ + for (i = 0; i < itemCount; i++) + { + memset(pathBuffer, 0, MAX_PATH); + driveletter = '\0'; + SendMessageA(g_listBox, LB_GETTEXT, i, (LPARAM)pathBuffer); + p = pathBuffer + strlen(pathBuffer); + if (sscanf(pathBuffer, "[-%c-]", &driveletter) == 1) + ok( driveletter >= 'a' && driveletter <= 'z', "Drive letter not in range a..z, got ascii %d\n", driveletter); + else + ok( (pathBuffer[0] == '[' && pathBuffer[strlen(pathBuffer)-1] == ']') || + ((pathBuffer[0] == 'w' || pathBuffer[0] == 'W') && + (*(p-1) == 'c' || *(p-1) == 'C') && + (*(p-2) == '.')), "Element %d (%s) does not fit requested w*.c\n", i, pathBuffer); + } + + /* Test behavior when no files match the wildcard */ + strcpy(pathBuffer, BAD_EXTENSION); + res = DlgDirListA(hWnd, pathBuffer, ID_TEST_LISTBOX, ID_TEST_LABEL, DDL_DIRECTORY|DDL_DRIVES); + ok (res == 1, "DlgDirList(%s, DDL_DIRECTORY|DDL_DRIVES) returned %d expected 1\n", BAD_EXTENSION, res); + + itemCount = SendMessageA(g_listBox, LB_GETCOUNT, 0, 0); + ok (itemCount == itemCount_justDrives + itemCount_allDirs, + "DlgDirList() incorrectly filled the listbox! (expected %d got %d)\n", + itemCount_justDrives + itemCount_allDirs, itemCount); + + /* Test DDL_DIRECTORY|DDL_EXCLUSIVE. */ + strcpy(pathBuffer, "w*.c"); + res = DlgDirListA(hWnd, pathBuffer, ID_TEST_LISTBOX, ID_TEST_LABEL, DDL_DIRECTORY|DDL_EXCLUSIVE); + ok (res == 1, "DlgDirList(*.c, DDL_DIRECTORY|DDL_EXCLUSIVE) failed - 0x%08x\n", GetLastError()); + + /* There should be exactly one element: "[..]" */ + itemCount = SendMessageA(g_listBox, LB_GETCOUNT, 0, 0); + ok (itemCount == itemCount_allDirs, + "DlgDirList(DDL_DIRECTORY|DDL_EXCLUSIVE) filled with %d entries, expected %d\n", + itemCount, itemCount_allDirs); + + if (itemCount && GetCurrentDirectoryA( MAX_PATH, pathBuffer ) > 3) /* there's no [..] in drive root */ + { + memset(pathBuffer, 0, MAX_PATH); + SendMessageA(g_listBox, LB_GETTEXT, 0, (LPARAM)pathBuffer); + ok( !strcmp(pathBuffer, "[..]"), "First (and only) element is not [..]\n"); + } + + /* Test behavior when no files match the wildcard */ + strcpy(pathBuffer, BAD_EXTENSION); + res = DlgDirListA(hWnd, pathBuffer, ID_TEST_LISTBOX, ID_TEST_LABEL, DDL_DIRECTORY|DDL_EXCLUSIVE); + ok (res == 1, "DlgDirList(%s, DDL_DIRECTORY|DDL_EXCLUSIVE) returned %d expected 1\n", BAD_EXTENSION, res); + + itemCount = SendMessageA(g_listBox, LB_GETCOUNT, 0, 0); + ok (itemCount == itemCount_allDirs, "DlgDirList() incorrectly filled the listbox!\n"); + + /* Test DDL_DIRECTORY|DDL_DRIVES|DDL_EXCLUSIVE. */ + strcpy(pathBuffer, "w*.c"); + res = DlgDirListA(hWnd, pathBuffer, ID_TEST_LISTBOX, ID_TEST_LABEL, DDL_DIRECTORY|DDL_DRIVES|DDL_EXCLUSIVE); + ok (res == 1, "DlgDirList(*.c, DDL_DIRECTORY|DDL_DRIVES|DDL_EXCLUSIVE) failed - 0x%08x\n", GetLastError()); + + /* There should be no plain files on the listbox */ + itemCount = SendMessageA(g_listBox, LB_GETCOUNT, 0, 0); + ok (itemCount == itemCount_justDrives + itemCount_allDirs, + "DlgDirList(DDL_DIRECTORY|DDL_EXCLUSIVE) filled with %d entries, expected %d\n", + itemCount, itemCount_justDrives + itemCount_allDirs); + + for (i = 0; i < itemCount; i++) + { + memset(pathBuffer, 0, MAX_PATH); + driveletter = '\0'; + SendMessageA(g_listBox, LB_GETTEXT, i, (LPARAM)pathBuffer); + if (sscanf(pathBuffer, "[-%c-]", &driveletter) == 1) + ok( driveletter >= 'a' && driveletter <= 'z', "Drive letter not in range a..z, got ascii %d\n", driveletter); + else + ok( pathBuffer[0] == '[' && pathBuffer[strlen(pathBuffer)-1] == ']', + "Element %d (%s) does not fit expected [...]\n", i, pathBuffer); + } + + /* Test behavior when no files match the wildcard */ + strcpy(pathBuffer, BAD_EXTENSION); + res = DlgDirListA(hWnd, pathBuffer, ID_TEST_LISTBOX, ID_TEST_LABEL, DDL_DIRECTORY|DDL_DRIVES|DDL_EXCLUSIVE); + ok (res == 1, "DlgDirList(%s, DDL_DIRECTORY|DDL_DRIVES|DDL_EXCLUSIVE) returned %d expected 1\n", BAD_EXTENSION, res); + + itemCount = SendMessageA(g_listBox, LB_GETCOUNT, 0, 0); + ok (itemCount == itemCount_justDrives + itemCount_allDirs, "DlgDirList() incorrectly filled the listbox!\n"); + + /* Now test DlgDirSelectEx() in normal operation */ + /* Fill with everything - drives, directory and all plain files. */ + strcpy(pathBuffer, "*"); + res = DlgDirListA(hWnd, pathBuffer, ID_TEST_LISTBOX, ID_TEST_LABEL, DDL_DIRECTORY|DDL_DRIVES); + ok (res != 0, "DlgDirList(*, DDL_DIRECTORY|DDL_DRIVES) failed - 0x%08x\n", GetLastError()); + + SendMessageA(g_listBox, LB_SETCURSEL, -1, 0); /* Unselect any current selection */ + memset(pathBuffer, 0, MAX_PATH); + SetLastError(0xdeadbeef); + res = DlgDirSelectExA(hWnd, pathBuffer, MAX_PATH, ID_TEST_LISTBOX); + ok (GetLastError() == 0xdeadbeef, + "DlgDirSelectEx() with no selection modified last error code from 0xdeadbeef to 0x%08x\n", + GetLastError()); + ok (res == 0, "DlgDirSelectEx() with no selection returned %d, expected 0\n", res); + /* WinXP-SP2 leaves pathBuffer untouched, but Win98 fills it with garbage. */ + /* + ok (strlen(pathBuffer) == 0, "DlgDirSelectEx() with no selection filled buffer with %s\n", pathBuffer); + */ + /* Test proper drive/dir/file recognition */ + itemCount = SendMessageA(g_listBox, LB_GETCOUNT, 0, 0); + for (i = 0; i < itemCount; i++) + { + memset(itemBuffer, 0, MAX_PATH); + memset(pathBuffer, 0, MAX_PATH); + memset(tempBuffer, 0, MAX_PATH); + driveletter = '\0'; + SendMessageA(g_listBox, LB_GETTEXT, i, (LPARAM)itemBuffer); + res = SendMessageA(g_listBox, LB_SETCURSEL, i, 0); + ok (res == i, "SendMessageA(LB_SETCURSEL, %d) failed\n", i); + if (sscanf(itemBuffer, "[-%c-]", &driveletter) == 1) + { + /* Current item is a drive letter */ + SetLastError(0xdeadbeef); + res = DlgDirSelectExA(hWnd, pathBuffer, MAX_PATH, ID_TEST_LISTBOX); + ok (GetLastError() == 0xdeadbeef, + "DlgDirSelectEx() with selection at %d modified last error code from 0xdeadbeef to 0x%08x\n", + i, GetLastError()); + ok(res == 1, "DlgDirSelectEx() thinks %s (%s) is not a drive/directory!\n", itemBuffer, pathBuffer); + + /* For drive letters, DlgDirSelectEx tacks on a colon */ + ok (pathBuffer[0] == driveletter && pathBuffer[1] == ':' && pathBuffer[2] == '\0', + "%d: got \"%s\" expected \"%c:\"\n", i, pathBuffer, driveletter); + } + else if (itemBuffer[0] == '[') + { + /* Current item is the parent directory */ + SetLastError(0xdeadbeef); + res = DlgDirSelectExA(hWnd, pathBuffer, MAX_PATH, ID_TEST_LISTBOX); + ok (GetLastError() == 0xdeadbeef, + "DlgDirSelectEx() with selection at %d modified last error code from 0xdeadbeef to 0x%08x\n", + i, GetLastError()); + ok(res == 1, "DlgDirSelectEx() thinks %s (%s) is not a drive/directory!\n", itemBuffer, pathBuffer); + + /* For directories, DlgDirSelectEx tacks on a backslash */ + p = pathBuffer + strlen(pathBuffer); + ok (*(p-1) == '\\', "DlgDirSelectEx did NOT tack on a backslash to dir, got %s\n", pathBuffer); + + tempBuffer[0] = '['; + lstrcpynA(tempBuffer + 1, pathBuffer, strlen(pathBuffer)); + strcat(tempBuffer, "]"); + ok (!strcmp(tempBuffer, itemBuffer), "Formatted directory should be %s, got %s\n", tempBuffer, itemBuffer); + } + else + { + /* Current item is a plain file */ + SetLastError(0xdeadbeef); + res = DlgDirSelectExA(hWnd, pathBuffer, MAX_PATH, ID_TEST_LISTBOX); + ok (GetLastError() == 0xdeadbeef, + "DlgDirSelectEx() with selection at %d modified last error code from 0xdeadbeef to 0x%08x\n", + i, GetLastError()); + ok(res == 0, "DlgDirSelectEx() thinks %s (%s) is a drive/directory!\n", itemBuffer, pathBuffer); + + /* NOTE: WinXP tacks a period on all files that lack an extension. This affects + * for example, "Makefile", which gets reported as "Makefile." + */ + strcpy(tempBuffer, itemBuffer); + if (strchr(tempBuffer, '.') == NULL) strcat(tempBuffer, "."); + ok (!strcmp(pathBuffer, tempBuffer), "Formatted file should be %s, got %s\n", tempBuffer, pathBuffer); + } + } + + DeleteFileA( "wtest1.tmp.c" ); + + /* Now test DlgDirSelectEx() in abnormal operation */ + /* Fill list with bogus entries, that look somewhat valid */ + SendMessageA(g_listBox, LB_RESETCONTENT, 0, 0); + SendMessageA(g_listBox, LB_ADDSTRING, 0, (LPARAM)"[notexist.dir]"); + SendMessageA(g_listBox, LB_ADDSTRING, 0, (LPARAM)"notexist.fil"); + itemCount = SendMessageA(g_listBox, LB_GETCOUNT, 0, 0); + for (i = 0; i < itemCount; i++) + { + memset(itemBuffer, 0, MAX_PATH); + memset(pathBuffer, 0, MAX_PATH); + memset(tempBuffer, 0, MAX_PATH); + driveletter = '\0'; + SendMessageA(g_listBox, LB_GETTEXT, i, (LPARAM)itemBuffer); + res = SendMessageA(g_listBox, LB_SETCURSEL, i, 0); + ok (res == i, "SendMessage(LB_SETCURSEL, %d) failed\n", i); + if (sscanf(itemBuffer, "[-%c-]", &driveletter) == 1) + { + /* Current item is a drive letter */ + SetLastError(0xdeadbeef); + res = DlgDirSelectExA(hWnd, pathBuffer, MAX_PATH, ID_TEST_LISTBOX); + ok (GetLastError() == 0xdeadbeef, + "DlgDirSelectEx() with selection at %d modified last error code from 0xdeadbeef to 0x%08x\n", + i, GetLastError()); + ok(res == 1, "DlgDirSelectEx() thinks %s (%s) is not a drive/directory!\n", itemBuffer, pathBuffer); + + /* For drive letters, DlgDirSelectEx tacks on a colon */ + ok (pathBuffer[0] == driveletter && pathBuffer[1] == ':' && pathBuffer[2] == '\0', + "%d: got \"%s\" expected \"%c:\"\n", i, pathBuffer, driveletter); + } + else if (itemBuffer[0] == '[') + { + /* Current item is the parent directory */ + SetLastError(0xdeadbeef); + res = DlgDirSelectExA(hWnd, pathBuffer, MAX_PATH, ID_TEST_LISTBOX); + ok (GetLastError() == 0xdeadbeef, + "DlgDirSelectEx() with selection at %d modified last error code from 0xdeadbeef to 0x%08x\n", + i, GetLastError()); + ok(res == 1, "DlgDirSelectEx() thinks %s (%s) is not a drive/directory!\n", itemBuffer, pathBuffer); + + /* For directories, DlgDirSelectEx tacks on a backslash */ + p = pathBuffer + strlen(pathBuffer); + ok (*(p-1) == '\\', "DlgDirSelectEx did NOT tack on a backslash to dir, got %s\n", pathBuffer); + + tempBuffer[0] = '['; + lstrcpynA(tempBuffer + 1, pathBuffer, strlen(pathBuffer)); + strcat(tempBuffer, "]"); + ok (!strcmp(tempBuffer, itemBuffer), "Formatted directory should be %s, got %s\n", tempBuffer, itemBuffer); + } + else + { + /* Current item is a plain file */ + SetLastError(0xdeadbeef); + res = DlgDirSelectExA(hWnd, pathBuffer, MAX_PATH, ID_TEST_LISTBOX); + ok (GetLastError() == 0xdeadbeef, + "DlgDirSelectEx() with selection at %d modified last error code from 0xdeadbeef to 0x%08x\n", + i, GetLastError()); + ok(res == 0, "DlgDirSelectEx() thinks %s (%s) is a drive/directory!\n", itemBuffer, pathBuffer); + + /* NOTE: WinXP and Win98 tack a period on all files that lack an extension. + * This affects for example, "Makefile", which gets reported as "Makefile." + */ + strcpy(tempBuffer, itemBuffer); + if (strchr(tempBuffer, '.') == NULL) strcat(tempBuffer, "."); + ok (!strcmp(pathBuffer, tempBuffer), "Formatted file should be %s, got %s\n", tempBuffer, pathBuffer); + } + } + + /* Test behavior when loading folders from root with and without wildcard */ + strcpy(pathBuffer, "C:\\"); + res = DlgDirListA(hWnd, pathBuffer, ID_TEST_LISTBOX, 0, DDL_DIRECTORY | DDL_EXCLUSIVE); + ok(res, "DlgDirList failed to list C:\\ folders\n"); + todo_wine ok(!strcmp(pathBuffer, "*"), "DlgDirList set the invalid path spec '%s', expected '*'\n", pathBuffer); + + strcpy(pathBuffer, "C:\\*"); + res = DlgDirListA(hWnd, pathBuffer, ID_TEST_LISTBOX, 0, DDL_DIRECTORY | DDL_EXCLUSIVE); + ok(res, "DlgDirList failed to list C:\\* folders\n"); + ok(!strcmp(pathBuffer, "*"), "DlgDirList set the invalid path spec '%s', expected '*'\n", pathBuffer); + + /* Try loading files from an invalid folder */ + SetLastError(0xdeadbeef); + strcpy(pathBuffer, "C:\\INVALID$$DIR"); + res = DlgDirListA(hWnd, pathBuffer, ID_TEST_LISTBOX, 0, DDL_DIRECTORY | DDL_EXCLUSIVE); + todo_wine ok(!res, "DlgDirList should have failed with 0 but %d was returned\n", res); + todo_wine ok(GetLastError() == ERROR_NO_WILDCARD_CHARACTERS, + "GetLastError should return 0x589, got 0x%X\n",GetLastError()); + + DestroyWindow(hWnd); +} + +static void test_set_count( void ) +{ + HWND parent, listbox; + LONG ret; + RECT r; + + parent = create_parent(); + listbox = create_listbox( LBS_OWNERDRAWFIXED | LBS_NODATA | WS_CHILD | WS_VISIBLE, parent ); + + UpdateWindow( listbox ); + GetUpdateRect( listbox, &r, TRUE ); + ok( IsRectEmpty( &r ), "got non-empty rect\n"); + + ret = SendMessageA( listbox, LB_SETCOUNT, 100, 0 ); + ok( ret == 0, "got %d\n", ret ); + ret = SendMessageA( listbox, LB_GETCOUNT, 0, 0 ); + ok( ret == 100, "got %d\n", ret ); + + GetUpdateRect( listbox, &r, TRUE ); + ok( !IsRectEmpty( &r ), "got empty rect\n"); + + ValidateRect( listbox, NULL ); + GetUpdateRect( listbox, &r, TRUE ); + ok( IsRectEmpty( &r ), "got non-empty rect\n"); + + ret = SendMessageA( listbox, LB_SETCOUNT, 99, 0 ); + ok( ret == 0, "got %d\n", ret ); + + GetUpdateRect( listbox, &r, TRUE ); + ok( !IsRectEmpty( &r ), "got empty rect\n"); + + DestroyWindow( listbox ); + DestroyWindow( parent ); +} + +static int lb_getlistboxinfo; + +static LRESULT WINAPI listbox_subclass_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + WNDPROC oldproc = (WNDPROC)GetWindowLongPtrA(hwnd, GWLP_USERDATA); + + if (message == LB_GETLISTBOXINFO) + lb_getlistboxinfo++; + + return CallWindowProcA(oldproc, hwnd, message, wParam, lParam); +} + +static void test_GetListBoxInfo(void) +{ + HWND listbox, parent; + WNDPROC oldproc; + DWORD ret; + + parent = create_parent(); + listbox = create_listbox(WS_CHILD | WS_VISIBLE, parent); + + oldproc = (WNDPROC)SetWindowLongPtrA(listbox, GWLP_WNDPROC, (LONG_PTR)listbox_subclass_proc); + SetWindowLongPtrA(listbox, GWLP_USERDATA, (LONG_PTR)oldproc); + + lb_getlistboxinfo = 0; + ret = GetListBoxInfo(listbox); + ok(ret > 0, "got %d\n", ret); + ok(lb_getlistboxinfo == 1, "got %d\n", lb_getlistboxinfo); + + DestroyWindow(listbox); + DestroyWindow(parent); +} + +static void test_missing_lbuttonup(void) +{ + HWND listbox, parent, capture; + + parent = create_parent(); + listbox = create_listbox(WS_CHILD | WS_VISIBLE, parent); + + /* Send button down without a corresponding button up */ + SendMessageA(listbox, WM_LBUTTONDOWN, 0, MAKELPARAM(10, 10)); + capture = GetCapture(); + ok(capture == listbox, "got %p expected %p\n", capture, listbox); + + /* Capture is released and LBN_SELCHANGE sent during WM_KILLFOCUS */ + got_selchange = 0; + SetFocus(NULL); + capture = GetCapture(); + ok(capture == NULL, "got %p\n", capture); + ok(got_selchange, "got %d\n", got_selchange); + + DestroyWindow(listbox); + DestroyWindow(parent); +} + +static void test_extents(void) +{ + HWND listbox, parent; + SCROLLINFO sinfo; + DWORD res; + BOOL br; + + parent = create_parent(); + + listbox = create_listbox(WS_CHILD | WS_VISIBLE, parent); + + res = SendMessageA(listbox, LB_GETHORIZONTALEXTENT, 0, 0); + ok(res == 0, "Got wrong initial horizontal extent: %u\n", res); + + sinfo.cbSize = sizeof(sinfo); + sinfo.fMask = SIF_RANGE; + br = GetScrollInfo(listbox, SB_HORZ, &sinfo); + ok(br == TRUE, "GetScrollInfo failed\n"); + ok(sinfo.nMin == 0, "got wrong min: %u\n", sinfo.nMin); + ok(sinfo.nMax == 100, "got wrong max: %u\n", sinfo.nMax); + ok((GetWindowLongA(listbox, GWL_STYLE) & WS_HSCROLL) == 0, + "List box should not have a horizontal scroll bar\n"); + + /* horizontal extent < width */ + SendMessageA(listbox, LB_SETHORIZONTALEXTENT, 64, 0); + + res = SendMessageA(listbox, LB_GETHORIZONTALEXTENT, 0, 0); + ok(res == 64, "Got wrong horizontal extent: %u\n", res); + + sinfo.cbSize = sizeof(sinfo); + sinfo.fMask = SIF_RANGE; + br = GetScrollInfo(listbox, SB_HORZ, &sinfo); + ok(br == TRUE, "GetScrollInfo failed\n"); + ok(sinfo.nMin == 0, "got wrong min: %u\n", sinfo.nMin); + ok(sinfo.nMax == 100, "got wrong max: %u\n", sinfo.nMax); + ok((GetWindowLongA(listbox, GWL_STYLE) & WS_HSCROLL) == 0, + "List box should not have a horizontal scroll bar\n"); + + /* horizontal extent > width */ + SendMessageA(listbox, LB_SETHORIZONTALEXTENT, 184, 0); + + res = SendMessageA(listbox, LB_GETHORIZONTALEXTENT, 0, 0); + ok(res == 184, "Got wrong horizontal extent: %u\n", res); + + sinfo.cbSize = sizeof(sinfo); + sinfo.fMask = SIF_RANGE; + br = GetScrollInfo(listbox, SB_HORZ, &sinfo); + ok(br == TRUE, "GetScrollInfo failed\n"); + ok(sinfo.nMin == 0, "got wrong min: %u\n", sinfo.nMin); + ok(sinfo.nMax == 100, "got wrong max: %u\n", sinfo.nMax); + ok((GetWindowLongA(listbox, GWL_STYLE) & WS_HSCROLL) == 0, + "List box should not have a horizontal scroll bar\n"); + + DestroyWindow(listbox); + + listbox = create_listbox(WS_CHILD | WS_VISIBLE | WS_HSCROLL, parent); + + res = SendMessageA(listbox, LB_GETHORIZONTALEXTENT, 0, 0); + ok(res == 0, "Got wrong initial horizontal extent: %u\n", res); + + sinfo.cbSize = sizeof(sinfo); + sinfo.fMask = SIF_RANGE; + br = GetScrollInfo(listbox, SB_HORZ, &sinfo); + ok(br == TRUE, "GetScrollInfo failed\n"); + ok(sinfo.nMin == 0, "got wrong min: %u\n", sinfo.nMin); + ok(sinfo.nMax == 100, "got wrong max: %u\n", sinfo.nMax); + ok((GetWindowLongA(listbox, GWL_STYLE) & WS_HSCROLL) == 0, + "List box should not have a horizontal scroll bar\n"); + + /* horizontal extent < width */ + SendMessageA(listbox, LB_SETHORIZONTALEXTENT, 64, 0); + + res = SendMessageA(listbox, LB_GETHORIZONTALEXTENT, 0, 0); + ok(res == 64, "Got wrong horizontal extent: %u\n", res); + + sinfo.cbSize = sizeof(sinfo); + sinfo.fMask = SIF_RANGE; + br = GetScrollInfo(listbox, SB_HORZ, &sinfo); + ok(br == TRUE, "GetScrollInfo failed\n"); + ok(sinfo.nMin == 0, "got wrong min: %u\n", sinfo.nMin); + ok(sinfo.nMax == 63, "got wrong max: %u\n", sinfo.nMax); + ok((GetWindowLongA(listbox, GWL_STYLE) & WS_HSCROLL) == 0, + "List box should not have a horizontal scroll bar\n"); + + /* horizontal extent > width */ + SendMessageA(listbox, LB_SETHORIZONTALEXTENT, 184, 0); + + res = SendMessageA(listbox, LB_GETHORIZONTALEXTENT, 0, 0); + ok(res == 184, "Got wrong horizontal extent: %u\n", res); + + sinfo.cbSize = sizeof(sinfo); + sinfo.fMask = SIF_RANGE; + br = GetScrollInfo(listbox, SB_HORZ, &sinfo); + ok(br == TRUE, "GetScrollInfo failed\n"); + ok(sinfo.nMin == 0, "got wrong min: %u\n", sinfo.nMin); + ok(sinfo.nMax == 183, "got wrong max: %u\n", sinfo.nMax); + ok((GetWindowLongA(listbox, GWL_STYLE) & WS_HSCROLL) != 0, + "List box should have a horizontal scroll bar\n"); + + SendMessageA(listbox, LB_SETHORIZONTALEXTENT, 0, 0); + + res = SendMessageA(listbox, LB_GETHORIZONTALEXTENT, 0, 0); + ok(res == 0, "Got wrong horizontal extent: %u\n", res); + + sinfo.cbSize = sizeof(sinfo); + sinfo.fMask = SIF_RANGE; + br = GetScrollInfo(listbox, SB_HORZ, &sinfo); + ok(br == TRUE, "GetScrollInfo failed\n"); + ok(sinfo.nMin == 0, "got wrong min: %u\n", sinfo.nMin); + ok(sinfo.nMax == 0, "got wrong max: %u\n", sinfo.nMax); + ok((GetWindowLongA(listbox, GWL_STYLE) & WS_HSCROLL) == 0, + "List box should not have a horizontal scroll bar\n"); + + DestroyWindow(listbox); + + + listbox = create_listbox(WS_CHILD | WS_VISIBLE | WS_HSCROLL | LBS_DISABLENOSCROLL, parent); + + res = SendMessageA(listbox, LB_GETHORIZONTALEXTENT, 0, 0); + ok(res == 0, "Got wrong initial horizontal extent: %u\n", res); + + sinfo.cbSize = sizeof(sinfo); + sinfo.fMask = SIF_RANGE; + br = GetScrollInfo(listbox, SB_HORZ, &sinfo); + ok(br == TRUE, "GetScrollInfo failed\n"); + ok(sinfo.nMin == 0, "got wrong min: %u\n", sinfo.nMin); + ok(sinfo.nMax == 0, "got wrong max: %u\n", sinfo.nMax); + ok((GetWindowLongA(listbox, GWL_STYLE) & WS_HSCROLL) != 0, + "List box should have a horizontal scroll bar\n"); + + /* horizontal extent < width */ + SendMessageA(listbox, LB_SETHORIZONTALEXTENT, 64, 0); + + res = SendMessageA(listbox, LB_GETHORIZONTALEXTENT, 0, 0); + ok(res == 64, "Got wrong horizontal extent: %u\n", res); + + sinfo.cbSize = sizeof(sinfo); + sinfo.fMask = SIF_RANGE; + br = GetScrollInfo(listbox, SB_HORZ, &sinfo); + ok(br == TRUE, "GetScrollInfo failed\n"); + ok(sinfo.nMin == 0, "got wrong min: %u\n", sinfo.nMin); + ok(sinfo.nMax == 63, "got wrong max: %u\n", sinfo.nMax); + ok((GetWindowLongA(listbox, GWL_STYLE) & WS_HSCROLL) != 0, + "List box should have a horizontal scroll bar\n"); + + /* horizontal extent > width */ + SendMessageA(listbox, LB_SETHORIZONTALEXTENT, 184, 0); + + res = SendMessageA(listbox, LB_GETHORIZONTALEXTENT, 0, 0); + ok(res == 184, "Got wrong horizontal extent: %u\n", res); + + sinfo.cbSize = sizeof(sinfo); + sinfo.fMask = SIF_RANGE; + br = GetScrollInfo(listbox, SB_HORZ, &sinfo); + ok(br == TRUE, "GetScrollInfo failed\n"); + ok(sinfo.nMin == 0, "got wrong min: %u\n", sinfo.nMin); + ok(sinfo.nMax == 183, "got wrong max: %u\n", sinfo.nMax); + ok((GetWindowLongA(listbox, GWL_STYLE) & WS_HSCROLL) != 0, + "List box should have a horizontal scroll bar\n"); + + SendMessageA(listbox, LB_SETHORIZONTALEXTENT, 0, 0); + + res = SendMessageA(listbox, LB_GETHORIZONTALEXTENT, 0, 0); + ok(res == 0, "Got wrong horizontal extent: %u\n", res); + + sinfo.cbSize = sizeof(sinfo); + sinfo.fMask = SIF_RANGE; + br = GetScrollInfo(listbox, SB_HORZ, &sinfo); + ok(br == TRUE, "GetScrollInfo failed\n"); + ok(sinfo.nMin == 0, "got wrong min: %u\n", sinfo.nMin); + ok(sinfo.nMax == 0, "got wrong max: %u\n", sinfo.nMax); + ok((GetWindowLongA(listbox, GWL_STYLE) & WS_HSCROLL) != 0, + "List box should have a horizontal scroll bar\n"); + + DestroyWindow(listbox); + + DestroyWindow(parent); +} + +static void test_listbox(void) +{ + static const struct listbox_test SS = + /* {add_style} */ + {{0}, + {LB_ERR, LB_ERR, 0, LB_ERR}, {0,0,0,0}, + { 1, 1, 1, LB_ERR}, {0,0,0,0}, + { 2, 2, 2, LB_ERR}, {0,0,0,0}, + {LB_ERR, LB_ERR, 0, LB_ERR}, {0,0,0,0}}; + + /* {selected, anchor, caret, selcount}{TODO fields} */ + static const struct listbox_test SS_NS = + {{LBS_NOSEL}, + {LB_ERR, LB_ERR, 0, LB_ERR}, {0,0,0,0}, + { 1, 1, 1, LB_ERR}, {0,0,0,0}, + { 2, 2, 2, LB_ERR}, {0,0,0,0}, + {LB_ERR, LB_ERR, 0, LB_ERR}, {0,0,0,0}}; + + static const struct listbox_test MS = + {{LBS_MULTIPLESEL}, + { 0, LB_ERR, 0, 0}, {0,0,0,0}, + { 1, 1, 1, 1}, {0,0,0,0}, + { 2, 1, 2, 1}, {0,0,0,0}, + { 0, LB_ERR, 0, 2}, {0,0,0,0}}; + + static const struct listbox_test MS_NS = + {{LBS_MULTIPLESEL | LBS_NOSEL}, + {LB_ERR, LB_ERR, 0, LB_ERR}, {0,0,0,0}, + { 1, 1, 1, LB_ERR}, {0,0,0,0}, + { 2, 2, 2, LB_ERR}, {0,0,0,0}, + {LB_ERR, LB_ERR, 0, LB_ERR}, {0,0,0,0}}; + + static const struct listbox_test ES = + {{LBS_EXTENDEDSEL}, + { 0, LB_ERR, 0, 0}, {0,0,0,0}, + { 1, 1, 1, 1}, {0,0,0,0}, + { 2, 2, 2, 1}, {0,0,0,0}, + { 0, LB_ERR, 0, 2}, {0,0,0,0}}; + + static const struct listbox_test ES_NS = + {{LBS_EXTENDEDSEL | LBS_NOSEL}, + {LB_ERR, LB_ERR, 0, LB_ERR}, {0,0,0,0}, + { 1, 1, 1, LB_ERR}, {0,0,0,0}, + { 2, 2, 2, LB_ERR}, {0,0,0,0}, + {LB_ERR, LB_ERR, 0, LB_ERR}, {0,0,0,0}}; + + static const struct listbox_test EMS = + {{LBS_EXTENDEDSEL | LBS_MULTIPLESEL}, + { 0, LB_ERR, 0, 0}, {0,0,0,0}, + { 1, 1, 1, 1}, {0,0,0,0}, + { 2, 2, 2, 1}, {0,0,0,0}, + { 0, LB_ERR, 0, 2}, {0,0,0,0}}; + + static const struct listbox_test EMS_NS = + {{LBS_EXTENDEDSEL | LBS_MULTIPLESEL | LBS_NOSEL}, + {LB_ERR, LB_ERR, 0, LB_ERR}, {0,0,0,0}, + { 1, 1, 1, LB_ERR}, {0,0,0,0}, + { 2, 2, 2, LB_ERR}, {0,0,0,0}, + {LB_ERR, LB_ERR, 0, LB_ERR}, {0,0,0,0}}; + + run_test(SS); + run_test(SS_NS); + run_test(MS); + run_test(MS_NS); + run_test(ES); + run_test(ES_NS); + run_test(EMS); + run_test(EMS_NS); +} + +START_TEST(listbox) +{ + ULONG_PTR ctx_cookie; + HANDLE hCtx; + + if (!load_v6_module(&ctx_cookie, &hCtx)) + return; + + test_listbox(); + test_item_height(); + test_ownerdraw(); + test_LB_SELITEMRANGE(); + test_LB_SETCURSEL(); + test_listbox_height(); + test_itemfrompoint(); + test_listbox_item_data(); + test_listbox_LB_DIR(); + test_listbox_dlgdir(); + test_set_count(); + test_GetListBoxInfo(); + test_missing_lbuttonup(); + test_extents(); + + unload_v6_module(ctx_cookie, hCtx); +} -- 2.15.1

1 0

[PATCH] gdi32/tests: Enable the otmMacLineGap tests
by Alex Henrie 19 Dec '17

19 Dec '17

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/gdi32/tests/font.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index bd04a8b6b1..b732cde854 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1790,17 +1790,18 @@ static void test_GetKerningPairs(void) kd[i].otmMacDescent, otm.otmMacDescent); ok(near_match(kd[i].otmMacAscent, otm.otmMacAscent), "expected %d, got %d\n", kd[i].otmMacAscent, otm.otmMacAscent); -todo_wine { +todo_wine ok(kd[i].otmsCapEmHeight == otm.otmsCapEmHeight, "expected %u, got %u\n", kd[i].otmsCapEmHeight, otm.otmsCapEmHeight); +todo_wine ok(kd[i].otmsXHeight == otm.otmsXHeight, "expected %u, got %u\n", kd[i].otmsXHeight, otm.otmsXHeight); - /* FIXME: this one sometimes succeeds due to expected 0, enable it when removing todo */ - if (0) ok(kd[i].otmMacLineGap == otm.otmMacLineGap, "expected %u, got %u\n", +todo_wine_if(kd[i].otmMacLineGap) + ok(kd[i].otmMacLineGap == otm.otmMacLineGap, "expected %u, got %u\n", kd[i].otmMacLineGap, otm.otmMacLineGap); +todo_wine ok(kd[i].otmusMinimumPPEM == otm.otmusMinimumPPEM, "expected %u, got %u\n", kd[i].otmusMinimumPPEM, otm.otmusMinimumPPEM); -} total_kern_pairs = GetKerningPairsW(hdc, 0, NULL); trace("total_kern_pairs %u\n", total_kern_pairs); -- 2.15.1

2 3

[PATCH] gdi32: Clamp unsigned integers to 32-bit range when scaling fonts
by Alex Henrie 19 Dec '17

19 Dec '17

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Fixes test crash (floating point exception due to double value outside of integer range) with TAMu_Kadampari.ttf from Arch Linux's ttf-indic-otf package. sTypoLineGap is -194 in this font, and Windows 10 sets otmLineGap to 4294967295. Also fixes the crash with GohaTibebZemen.otf from Arch's xorg-fonts-misc package. sCapHeight and sxHeight are -32768 in this font, and Windows 10 refuses to install it. However, Windows XP installs the font without complaint and sets otmsCapEmHeight and otmsXHeight to 4294966903. I think the 0.00000009% difference from UINT_MAX is just rounding error. --- dlls/gdi32/freetype.c | 11 ++++++----- dlls/gdi32/gdi_private.h | 7 +++++++ 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 7c5a7ef979..961f9e5f03 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -7578,19 +7578,20 @@ static void scale_outline_font_metrics(const GdiFont *font, OUTLINETEXTMETRICW * #define SCALE_X(x) (x) = GDI_ROUND((double)(x) * (scale_x)) #define SCALE_Y(y) (y) = GDI_ROUND((double)(y) * (scale_y)) +#define SCALE_YU(y) (y) = GDI_ROUND_UINT((double)(y) * (scale_y)) SCALE_Y(potm->otmAscent); SCALE_Y(potm->otmDescent); - SCALE_Y(potm->otmLineGap); - SCALE_Y(potm->otmsCapEmHeight); - SCALE_Y(potm->otmsXHeight); + SCALE_YU(potm->otmLineGap); + SCALE_YU(potm->otmsCapEmHeight); + SCALE_YU(potm->otmsXHeight); SCALE_Y(potm->otmrcFontBox.top); SCALE_Y(potm->otmrcFontBox.bottom); SCALE_X(potm->otmrcFontBox.left); SCALE_X(potm->otmrcFontBox.right); SCALE_Y(potm->otmMacAscent); SCALE_Y(potm->otmMacDescent); - SCALE_Y(potm->otmMacLineGap); + SCALE_YU(potm->otmMacLineGap); SCALE_X(potm->otmptSubscriptSize.x); SCALE_Y(potm->otmptSubscriptSize.y); SCALE_X(potm->otmptSubscriptOffset.x); @@ -7599,7 +7600,7 @@ static void scale_outline_font_metrics(const GdiFont *font, OUTLINETEXTMETRICW * SCALE_Y(potm->otmptSuperscriptSize.y); SCALE_X(potm->otmptSuperscriptOffset.x); SCALE_Y(potm->otmptSuperscriptOffset.y); - SCALE_Y(potm->otmsStrikeoutSize); + SCALE_YU(potm->otmsStrikeoutSize); SCALE_Y(potm->otmsStrikeoutPosition); SCALE_Y(potm->otmsUnderscoreSize); SCALE_Y(potm->otmsUnderscorePosition); diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 4236aa3690..c591057e3a 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -141,6 +141,13 @@ static inline INT GDI_ROUND(double val) return (int)floor(val + 0.5); } +static inline UINT GDI_ROUND_UINT(double val) +{ + double ret = floor(val + 0.5); + if (ret > UINT_MAX) return UINT_MAX; + return (UINT)ret; +} + #define GET_DC_PHYSDEV(dc,func) \ get_physdev_entry_point( (dc)->physDev, FIELD_OFFSET(struct gdi_dc_funcs,func)) -- 2.15.1

3 4

[PATCH 1/4] testbot: Keep a record of the status of the VMs.
by Francois Gouget 18 Dec '17

18 Dec '17

Each row of the new Records table allows storing part of the details of an event or of the state of the TestBot. These pieces of information are put together into groups and timestamped through the RecordGroups table. Together these tables allow rebuilding the activity of the TestBot. The first user of these new tables is the job scheduler which uses them to store the new VM status if it changed. This will allow rebuilding and visualizing the activity of the TestBot for monitoring or debugging. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This patch requires updating the database with the update29.sql script and then restarting the TestBot Engine and web server. testbot/bin/Janitor.pl | 21 ++ testbot/ddl/update29.sql | 20 ++ testbot/ddl/winetestbot.sql | 19 ++ testbot/doc/winetestbot-schema.dia | 338 ++++++++++++++++++++++++++++++++ testbot/lib/WineTestBot/Jobs.pm | 64 +++++- testbot/lib/WineTestBot/RecordGroups.pm | 117 +++++++++++ testbot/lib/WineTestBot/Records.pm | 126 ++++++++++++ testbot/lib/WineTestBot/VMs.pm | 60 ++++++ 8 files changed, 760 insertions(+), 5 deletions(-) create mode 100644 testbot/ddl/update29.sql create mode 100644 testbot/lib/WineTestBot/RecordGroups.pm create mode 100644 testbot/lib/WineTestBot/Records.pm diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index c07c21bd..4f0e4de0 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -5,6 +5,7 @@ # archives old jobs and purges older jobs and patches. # # Copyright 2009 Ge van Geldorp +# Copyright 2017 Francois Gouget # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -45,6 +46,7 @@ use WineTestBot::Log; use WineTestBot::Patches; use WineTestBot::PendingPatchSets; use WineTestBot::CGI::Sessions; +use WineTestBot::RecordGroups; use WineTestBot::Users; use WineTestBot::VMs; @@ -267,3 +269,22 @@ else { LogMsg "0Unable to open '$DataDir/staging': $!"; } + +# Delete obsolete record groups +if ($JobPurgeDays != 0) +{ + $DeleteBefore = time() - $JobPurgeDays * 86400; + my $RecordGroups = CreateRecordGroups(); + foreach my $RecordGroup (@{$RecordGroups->GetItems()}) + { + if ($RecordGroup->Timestamp < $DeleteBefore) + { + my $ErrMessage = $RecordGroups->DeleteItem($RecordGroup); + if (defined($ErrMessage)) + { + LogMsg $ErrMessage, "\n"; + } + } + } + $RecordGroups = undef; +} diff --git a/testbot/ddl/update29.sql b/testbot/ddl/update29.sql new file mode 100644 index 00000000..af49814f --- /dev/null +++ b/testbot/ddl/update29.sql @@ -0,0 +1,20 @@ +USE winetestbot; + +CREATE TABLE RecordGroups +( + Id INT(6) NOT NULL AUTO_INCREMENT, + Timestamp DATETIME NOT NULL, + PRIMARY KEY (Id) +) +ENGINE=InnoDB DEFAULT CHARSET=utf8; + +CREATE TABLE Records +( + RecordGroupId INT(6) NOT NULL, + Type ENUM('engine', 'tasks', 'vmresult', 'vmstatus') NOT NULL, + Name VARCHAR(96) NOT NULL, + Value VARCHAR(64) NULL, + PRIMARY KEY (RecordGroupId, Type, Name), + FOREIGN KEY (RecordGroupId) REFERENCES RecordGroups(Id) +) +ENGINE=InnoDB DEFAULT CHARSET=utf8; diff --git a/testbot/ddl/winetestbot.sql b/testbot/ddl/winetestbot.sql index 12c1b689..ad8d1a92 100644 --- a/testbot/ddl/winetestbot.sql +++ b/testbot/ddl/winetestbot.sql @@ -158,6 +158,25 @@ CREATE TABLE Tasks ) ENGINE=InnoDB DEFAULT CHARSET=utf8; +CREATE TABLE RecordGroups +( + Id INT(6) NOT NULL AUTO_INCREMENT, + Timestamp DATETIME NOT NULL, + PRIMARY KEY (Id) +) +ENGINE=InnoDB DEFAULT CHARSET=utf8; + +CREATE TABLE Records +( + RecordGroupId INT(6) NOT NULL, + Type ENUM('engine', 'tasks', 'vmresult', 'vmstatus') NOT NULL, + Name VARCHAR(96) NOT NULL, + Value VARCHAR(64) NULL, + PRIMARY KEY (RecordGroupId, Type, Name), + FOREIGN KEY (RecordGroupId) REFERENCES RecordGroups(Id) +) +ENGINE=InnoDB DEFAULT CHARSET=utf8; + INSERT INTO Roles (Name, IsDefaultRole) VALUES('admin', 'N'); INSERT INTO Roles (Name, IsDefaultRole) VALUES('wine-devel', 'Y'); diff --git a/testbot/doc/winetestbot-schema.dia b/testbot/doc/winetestbot-schema.dia index 9092c417..ef7c3ca7 100644 --- a/testbot/doc/winetestbot-schema.dia +++ b/testbot/doc/winetestbot-schema.dia @@ -3218,5 +3218,343 @@ <dia:real val="0.10000000000000001"/> </dia:attribute> </dia:object> + <dia:object type="Database - Table" version="0" id="O23"> + <dia:attribute name="obj_pos"> + <dia:point val="14.12,3.7"/> + </dia:attribute> + <dia:attribute name="obj_bb"> + <dia:rectangle val="14.12,3.7;24.66,8.3"/> + </dia:attribute> + <dia:attribute name="meta"> + <dia:composite type="dict"/> + </dia:attribute> + <dia:attribute name="elem_corner"> + <dia:point val="14.12,3.7"/> + </dia:attribute> + <dia:attribute name="elem_width"> + <dia:real val="10.539999999999999"/> + </dia:attribute> + <dia:attribute name="elem_height"> + <dia:real val="4.6000000000000005"/> + </dia:attribute> + <dia:attribute name="name"> + <dia:string>#Records#</dia:string> + </dia:attribute> + <dia:attribute name="comment"> + <dia:string>##</dia:string> + </dia:attribute> + <dia:attribute name="visible_comment"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="underline_primary_key"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="tagging_comment"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="bold_primary_keys"> + <dia:boolean val="true"/> + </dia:attribute> + <dia:attribute name="attributes"> + <dia:composite type="table_attribute"> + <dia:attribute name="name"> + <dia:string>#RecordGroupId#</dia:string> + </dia:attribute> + <dia:attribute name="type"> + <dia:string>#INT(6)#</dia:string> + </dia:attribute> + <dia:attribute name="comment"> + <dia:string>##</dia:string> + </dia:attribute> + <dia:attribute name="primary_key"> + <dia:boolean val="true"/> + </dia:attribute> + <dia:attribute name="nullable"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="unique"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> + </dia:composite> + <dia:composite type="table_attribute"> + <dia:attribute name="name"> + <dia:string>#Type#</dia:string> + </dia:attribute> + <dia:attribute name="type"> + <dia:string>#ENUM#</dia:string> + </dia:attribute> + <dia:attribute name="comment"> + <dia:string>##</dia:string> + </dia:attribute> + <dia:attribute name="primary_key"> + <dia:boolean val="true"/> + </dia:attribute> + <dia:attribute name="nullable"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="unique"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> + </dia:composite> + <dia:composite type="table_attribute"> + <dia:attribute name="name"> + <dia:string>#Name#</dia:string> + </dia:attribute> + <dia:attribute name="type"> + <dia:string>#VARCHAR(96)#</dia:string> + </dia:attribute> + <dia:attribute name="comment"> + <dia:string>##</dia:string> + </dia:attribute> + <dia:attribute name="primary_key"> + <dia:boolean val="true"/> + </dia:attribute> + <dia:attribute name="nullable"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="unique"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> + </dia:composite> + <dia:composite type="table_attribute"> + <dia:attribute name="name"> + <dia:string>#Value#</dia:string> + </dia:attribute> + <dia:attribute name="type"> + <dia:string>#VARCHAR(64)#</dia:string> + </dia:attribute> + <dia:attribute name="comment"> + <dia:string>##</dia:string> + </dia:attribute> + <dia:attribute name="primary_key"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="nullable"> + <dia:boolean val="true"/> + </dia:attribute> + <dia:attribute name="unique"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> + </dia:composite> + </dia:attribute> + <dia:attribute name="normal_font"> + <dia:font family="monospace" style="0" name="Courier"/> + </dia:attribute> + <dia:attribute name="name_font"> + <dia:font family="sans" style="80" name="Helvetica-Bold"/> + </dia:attribute> + <dia:attribute name="comment_font"> + <dia:font family="sans" style="8" name="Helvetica-Oblique"/> + </dia:attribute> + <dia:attribute name="normal_font_height"> + <dia:real val="0.80000000000000004"/> + </dia:attribute> + <dia:attribute name="name_font_height"> + <dia:real val="0.99999999999999989"/> + </dia:attribute> + <dia:attribute name="comment_font_height"> + <dia:real val="0.69999999999999996"/> + </dia:attribute> + <dia:attribute name="text_colour"> + <dia:color val="#000000ff"/> + </dia:attribute> + <dia:attribute name="line_colour"> + <dia:color val="#000000ff"/> + </dia:attribute> + <dia:attribute name="fill_colour"> + <dia:color val="#ffffffff"/> + </dia:attribute> + <dia:attribute name="line_width"> + <dia:real val="0.10000000000000001"/> + </dia:attribute> + </dia:object> + <dia:object type="Database - Table" version="0" id="O24"> + <dia:attribute name="obj_pos"> + <dia:point val="2.61,3.7125"/> + </dia:attribute> + <dia:attribute name="obj_bb"> + <dia:rectangle val="2.61,3.7125;10.455,6.7125"/> + </dia:attribute> + <dia:attribute name="meta"> + <dia:composite type="dict"/> + </dia:attribute> + <dia:attribute name="elem_corner"> + <dia:point val="2.61,3.7125"/> + </dia:attribute> + <dia:attribute name="elem_width"> + <dia:real val="7.8449999999999998"/> + </dia:attribute> + <dia:attribute name="elem_height"> + <dia:real val="3"/> + </dia:attribute> + <dia:attribute name="name"> + <dia:string>#RecordGroups#</dia:string> + </dia:attribute> + <dia:attribute name="comment"> + <dia:string>##</dia:string> + </dia:attribute> + <dia:attribute name="visible_comment"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="underline_primary_key"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="tagging_comment"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="bold_primary_keys"> + <dia:boolean val="true"/> + </dia:attribute> + <dia:attribute name="attributes"> + <dia:composite type="table_attribute"> + <dia:attribute name="name"> + <dia:string>#Id#</dia:string> + </dia:attribute> + <dia:attribute name="type"> + <dia:string>#INT(6)#</dia:string> + </dia:attribute> + <dia:attribute name="comment"> + <dia:string>##</dia:string> + </dia:attribute> + <dia:attribute name="primary_key"> + <dia:boolean val="true"/> + </dia:attribute> + <dia:attribute name="nullable"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="unique"> + <dia:boolean val="true"/> + </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> + </dia:composite> + <dia:composite type="table_attribute"> + <dia:attribute name="name"> + <dia:string>#Timestamp#</dia:string> + </dia:attribute> + <dia:attribute name="type"> + <dia:string>#DATETIME#</dia:string> + </dia:attribute> + <dia:attribute name="comment"> + <dia:string>##</dia:string> + </dia:attribute> + <dia:attribute name="primary_key"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="nullable"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="unique"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> + </dia:composite> + </dia:attribute> + <dia:attribute name="normal_font"> + <dia:font family="monospace" style="0" name="Courier"/> + </dia:attribute> + <dia:attribute name="name_font"> + <dia:font family="sans" style="80" name="Helvetica-Bold"/> + </dia:attribute> + <dia:attribute name="comment_font"> + <dia:font family="sans" style="8" name="Helvetica-Oblique"/> + </dia:attribute> + <dia:attribute name="normal_font_height"> + <dia:real val="0.80000000000000004"/> + </dia:attribute> + <dia:attribute name="name_font_height"> + <dia:real val="0.99999999999999989"/> + </dia:attribute> + <dia:attribute name="comment_font_height"> + <dia:real val="0.69999999999999996"/> + </dia:attribute> + <dia:attribute name="text_colour"> + <dia:color val="#000000ff"/> + </dia:attribute> + <dia:attribute name="line_colour"> + <dia:color val="#000000ff"/> + </dia:attribute> + <dia:attribute name="fill_colour"> + <dia:color val="#ffffffff"/> + </dia:attribute> + <dia:attribute name="line_width"> + <dia:real val="0.10000000000000001"/> + </dia:attribute> + </dia:object> + <dia:object type="Database - Reference" version="0" id="O25"> + <dia:attribute name="obj_pos"> + <dia:point val="10.455,5.4125"/> + </dia:attribute> + <dia:attribute name="obj_bb"> + <dia:rectangle val="10.405,4.75;14.17,5.4625"/> + </dia:attribute> + <dia:attribute name="meta"> + <dia:composite type="dict"/> + </dia:attribute> + <dia:attribute name="orth_points"> + <dia:point val="10.455,5.4125"/> + <dia:point val="11.95,5.4125"/> + <dia:point val="11.95,5.4"/> + <dia:point val="14.12,5.4"/> + </dia:attribute> + <dia:attribute name="orth_orient"> + <dia:enum val="0"/> + <dia:enum val="1"/> + <dia:enum val="0"/> + </dia:attribute> + <dia:attribute name="orth_autoroute"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="text_colour"> + <dia:color val="#000000ff"/> + </dia:attribute> + <dia:attribute name="line_colour"> + <dia:color val="#000000ff"/> + </dia:attribute> + <dia:attribute name="line_width"> + <dia:real val="0.10000000000000001"/> + </dia:attribute> + <dia:attribute name="line_style"> + <dia:enum val="0"/> + <dia:real val="1"/> + </dia:attribute> + <dia:attribute name="corner_radius"> + <dia:real val="0"/> + </dia:attribute> + <dia:attribute name="end_arrow"> + <dia:enum val="0"/> + </dia:attribute> + <dia:attribute name="start_point_desc"> + <dia:string>#1#</dia:string> + </dia:attribute> + <dia:attribute name="end_point_desc"> + <dia:string>#1..n#</dia:string> + </dia:attribute> + <dia:attribute name="normal_font"> + <dia:font family="monospace" style="0" name="Courier"/> + </dia:attribute> + <dia:attribute name="normal_font_height"> + <dia:real val="0.59999999999999998"/> + </dia:attribute> + <dia:connections> + <dia:connection handle="0" to="O24" connection="13"/> + <dia:connection handle="1" to="O23" connection="12"/> + </dia:connections> + </dia:object> </dia:layer> </dia:diagram> diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index 0144ddec..73fc34eb 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -377,6 +377,7 @@ use WineTestBot::WineTestBotObjects; use WineTestBot::Branches; use WineTestBot::Config; use WineTestBot::Patches; +use WineTestBot::RecordGroups; use WineTestBot::Steps; use WineTestBot::Users; use WineTestBot::VMs; @@ -488,10 +489,9 @@ kept on standby so they are ready when their turn comes. =back =cut -sub ScheduleOnHost($$$) +sub ScheduleOnHost($$$$) { - my ($ScopeObject, $SortedJobs, $Hypervisors) = @_; - + my ($ScopeObject, $SortedJobs, $Hypervisors, $Records) = @_; my $HostVMs = CreateVMs($ScopeObject); $HostVMs->FilterEnabledRole(); @@ -580,7 +580,7 @@ sub ScheduleOnHost($$$) { my $ErrMessage = $Task->Run($Step); return $ErrMessage if (defined $ErrMessage); - + $VM->RecordStatus($Records, join(" ", "running", $Job->Id, $Step->No, $Task->No)); $Job->UpdateStatus(); $IdleCount--; $RunningCount++; @@ -655,6 +655,7 @@ sub ScheduleOnHost($$$) my $ErrMessage = $VM->RunPowerOff(); return $ErrMessage if (defined $ErrMessage); + $VM->RecordStatus($Records, "dirty poweroff"); } # Power off some idle VMs we don't need immediately so we can revert more @@ -672,6 +673,7 @@ sub ScheduleOnHost($$$) my $ErrMessage = $VM->RunPowerOff(); return $ErrMessage if (defined $ErrMessage); + $VM->RecordStatus($Records, "dirty poweroff"); $PlannedActiveCount--; last if ($PlannedActiveCount <= $MaxActiveVMs); } @@ -733,6 +735,8 @@ sub ScheduleOnHost($$$) return undef; } +my $_LastTaskCounts = ""; + =pod =over 12 @@ -746,12 +750,40 @@ them using WineTestBot::Jobs::ScheduleOnHost(). sub ScheduleJobs() { + my $RecordGroups = CreateRecordGroups(); + my $RecordGroup = $RecordGroups->Add(); + my $Records = $RecordGroup->Records; + # Save the new RecordGroup now so its Id is lower than those of the groups + # created by the scripts called from the scheduler. + $RecordGroups->Save(); + my $Jobs = CreateJobs(); $Jobs->AddFilter("Status", ["queued", "running"]); my @SortedJobs = sort CompareJobPriority @{$Jobs->GetItems()}; # Note that even if there are no jobs to schedule # we should check if there are VMs to revert + # Count the runnable and queued tasks for the record + my ($RunnableTasks, $QueuedTasks) = (0, 0); + foreach my $Job (@SortedJobs) + { + my $Steps = $Job->Steps; + $Steps->AddFilter("Status", ["queued", "running"]); + my @SortedSteps = sort { $a->No <=> $b->No } @{$Steps->GetItems()}; + next if (!@SortedSteps); + + my $Tasks = $SortedSteps[0]->Tasks; + $Tasks->AddFilter("Status", ["queued"]); + $RunnableTasks += @{$Tasks->GetItems()}; + + foreach my $Step (@SortedSteps) + { + my $Tasks = $Step->Tasks; + $Tasks->AddFilter("Status", ["queued"]); + $QueuedTasks += scalar(@{$Tasks->GetItems()}); + } + } + my %Hosts; my $VMs = CreateVMs($Jobs); $VMs->FilterEnabledRole(); @@ -765,9 +797,31 @@ sub ScheduleJobs() foreach my $Host (keys %Hosts) { my @HostHypervisors = keys %{$Hosts{$Host}}; - my $HostErrMessage = ScheduleOnHost($Jobs, \@SortedJobs, \@HostHypervisors); + my $HostErrMessage = ScheduleOnHost($Jobs, \@SortedJobs, \@HostHypervisors, $Records); push @ErrMessages, $HostErrMessage if (defined $HostErrMessage); } + + # Note that any VM Status or Role change will trigger ScheduleJobs() so this + # records all VM state changes. + $VMs = CreateVMs(); + map { $_->RecordStatus($Records) } (@{$VMs->GetItems()}); + if (@{$Records->GetItems()}) + { + # FIXME Add the number of tasks scheduled to run on a maintenance, retired + # or deleted VM... + my $TaskCounts = "$RunnableTasks $QueuedTasks 0"; + if ($TaskCounts ne $_LastTaskCounts) + { + $Records->AddRecord('tasks', 'counters', $TaskCounts); + $_LastTaskCounts = $TaskCounts; + } + $RecordGroups->Save(); + } + else + { + $RecordGroups->DeleteItem($RecordGroup); + } + return @ErrMessages ? join("\n", @ErrMessages) : undef; } diff --git a/testbot/lib/WineTestBot/RecordGroups.pm b/testbot/lib/WineTestBot/RecordGroups.pm new file mode 100644 index 00000000..b33d16eb --- /dev/null +++ b/testbot/lib/WineTestBot/RecordGroups.pm @@ -0,0 +1,117 @@ +# -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- +# Copyright 2017 Francois Gouget +# +# 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 + +use strict; + +package WineTestBot::RecordGroup; + +=head1 NAME + +WineTestBot::RecordGroup - a group of related history records + +=head1 DESCRIPTION + +A RecordGroup is a group of WineTestBot::Record objects describing an event +or the state of the TestBot at at a given time. + +=cut + +use WineTestBot::WineTestBotObjects; +use WineTestBot::Config; + +use vars qw (@ISA @EXPORT); + +require Exporter; +@ISA = qw(WineTestBot::WineTestBotItem Exporter); + +sub InitializeNew($$) +{ + my ($self, $Collection) = @_; + + $self->Timestamp(time()); + + $self->SUPER::InitializeNew($Collection); +} + + +package WineTestBot::RecordGroups; + +=head1 NAME + +WineTestBot::RecordGroups - A collection of WineTestBot::RecordGroup objects + +=cut + +use ObjectModel::BasicPropertyDescriptor; +use ObjectModel::EnumPropertyDescriptor; +use ObjectModel::DetailrefPropertyDescriptor; +use ObjectModel::PropertyDescriptor; +use WineTestBot::WineTestBotObjects; +use WineTestBot::Records; + +use vars qw (@ISA @EXPORT @PropertyDescriptors); + +require Exporter; +@ISA = qw(WineTestBot::WineTestBotCollection Exporter); +@EXPORT = qw(&CreateRecordGroups &SaveRecord); + + +BEGIN +{ + @PropertyDescriptors = ( + CreateBasicPropertyDescriptor("Id", "Group id", 1, 1, "S", 6), + CreateBasicPropertyDescriptor("Timestamp", "Timestamp", !1, 1, "DT", 19), + CreateDetailrefPropertyDescriptor("Records", "Records", !1, !1, \&CreateRecords), + ); +} + +sub CreateItem($) +{ + my ($self) = @_; + + return WineTestBot::RecordGroup->new($self); +} + +sub CreateRecordGroups(;$) +{ + my ($ScopeObject) = @_; + return WineTestBot::RecordGroups->new("RecordGroups", "RecordGroups", "RecordGroup", + \@PropertyDescriptors, $ScopeObject); +} + +=pod +=over 12 + +=item C<SaveRecord()> + +Creates and saves a standalone record. + +=back +=cut + +sub SaveRecord($$;$) +{ + my ($Type, $Name, $Value) = @_; + + my $RecordGroups = CreateRecordGroups(); + my $Records = $RecordGroups->Add()->Records; + $Records->AddRecord($Type, $Name, $Value); + + return $RecordGroups->Save(); +} + +1; diff --git a/testbot/lib/WineTestBot/Records.pm b/testbot/lib/WineTestBot/Records.pm new file mode 100644 index 00000000..dd0fec97 --- /dev/null +++ b/testbot/lib/WineTestBot/Records.pm @@ -0,0 +1,126 @@ +# -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- +# Copyright 2017 Francois Gouget +# +# 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 + +use strict; + +package WineTestBot::Record; + +=head1 NAME + +WineTestBot::Record - records part of an event or the state of the TestBot. + +=head1 DESCRIPTION + +A Record is created to save information about an event or part of the state of +the TestBot at a given time. A full description of said event or state may +require a variable number of Records so they are part of a RecordGroup which +identifies which other Records relate to the same event or state. +The RecordGroup also stores the timestamp of the event or state. + +The point of the Record objects is to keep a record of the activity of the +TestBot. By putting them together it is possible to rebuild what the TestBot +did and when, for debugging or performance analysis. The amount of details is +only limited by the amount of data dumped into the Records table. + +=cut + +use WineTestBot::Config; +use WineTestBot::WineTestBotObjects; + +use vars qw (@ISA @EXPORT); + +require Exporter; +@ISA = qw(WineTestBot::WineTestBotItem Exporter); + +sub InitializeNew($$) +{ + my ($self, $Collection) = @_; + + $self->SUPER::InitializeNew($Collection); +} + + +package WineTestBot::Records; + +=head1 NAME + +WineTestBot::Records - A collection of WineTestBot::Record objects + +=cut + +use ObjectModel::BasicPropertyDescriptor; +use ObjectModel::EnumPropertyDescriptor; +use ObjectModel::PropertyDescriptor; +use WineTestBot::WineTestBotObjects; + +use vars qw (@ISA @EXPORT @PropertyDescriptors); + +require Exporter; +@ISA = qw(WineTestBot::WineTestBotCollection Exporter); +@EXPORT = qw(&CreateRecords); + + +BEGIN +{ + @PropertyDescriptors = ( + CreateEnumPropertyDescriptor("Type", "Type", 1, 1, ['engine', 'tasks', 'vmresult', 'vmstatus']), + CreateBasicPropertyDescriptor("Name", "Name", 1, 1, "A", 96), + CreateBasicPropertyDescriptor("Value", "Value", !1, !1, "A", 64), + ); +} + +sub CreateItem($) +{ + my ($self) = @_; + + return WineTestBot::Record->new($self); +} + +sub CreateRecords(;$$) +{ + my ($ScopeObject, $RecordGroup) = @_; + return WineTestBot::Records->new("Records", "Records", "Record", + \@PropertyDescriptors, $ScopeObject, + $RecordGroup); +} + +=pod +=over 12 + +=item C<AddRecord()> + +This is a convenience function for adding a new record to a Records collection +and setting its properties at the same time. + +=back +=cut + +sub AddRecord($$$;$) +{ + my ($self, $Type, $Name, $Value) = @_; + + my $Record = $self->Add(); + my $TemporaryKey = $Record->GetKey(); + $Record->Type($Type); + $Record->Name($Name); + $Record->Value($Value) if (defined $Value); + $self->KeyChanged($TemporaryKey, $Record->GetKey()); + + return $Record; +} + +1; diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 7db0aa51..a8da842b 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -148,6 +148,7 @@ use ObjectModel::BackEnd; use WineTestBot::Config; use WineTestBot::Engine::Notify; use WineTestBot::LibvirtDomain; +use WineTestBot::RecordGroups; use WineTestBot::TestAgent; use WineTestBot::WineTestBotObjects; @@ -175,6 +176,13 @@ sub InitializeNew($$) $self->SUPER::InitializeNew($Collection); } +sub HasEnabledRole($) +{ + my ($self) = @_; + # Filter out the disabled VMs, that is the retired and deleted ones + return $self->Role ne "retired" && $self->Role ne "deleted"; +} + sub GetHost($) { my ($self) = @_; @@ -499,6 +507,58 @@ sub RunRevert($) return $self->_RunVMTool("reverting", ["--log-only", "revert", $self->GetKey()]); } +=pod +=over 12 + +=item C<GetRecordName()> + +Provides the name to use for history records related to this VM. + +=back +=cut + +sub GetRecordName($) +{ + my ($self) = @_; + return $self->Name ." ". $self->GetHost(); +} + +my %_VMStatuses; + +=pod +=over 12 + +=item C<RecordStatus()> + +Adds a Record if the status of the VM changed since the last recorded status. + +=back +=cut + +sub RecordStatus($$;$) +{ + my ($self, $Records, $RecordStatus) = @_; + + $RecordStatus ||= $self->HasEnabledRole() ? $self->Status : $self->Role; + my $NewStatus = $self->GetHost() ." $RecordStatus"; + + my $LastStatus = $_VMStatuses{$self->Name} || ""; + # Don't add a record if nothing changed + return if ($LastStatus eq $NewStatus); + # Or if the new status is less complete + return if ($LastStatus =~ /^\Q$NewStatus \E/); + + $_VMStatuses{$self->Name} = $NewStatus; + if ($Records) + { + $Records->AddRecord('vmstatus', $self->GetRecordName(), $RecordStatus); + } + else + { + SaveRecord('vmstatus', $self->GetRecordName(), $RecordStatus); + } +} + package WineTestBot::VMs; -- 2.15.1

1 3

[PATCH] po: Update Simplified Chinese translation.
by Jactry Zeng 18 Dec '17

18 Dec '17

From: Mingcong Bai <jeffbai(a)aosc.xyz> Signed-off-by: Mingcong Bai <jeffbai(a)aosc.xyz> Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- po/zh_CN.po | 107 ++++++++++++++++-------------------------------------------- 1 file changed, 29 insertions(+), 78 deletions(-)

3 2

[PATCH] po: Update Simplified Chinese translation.
by Jactry Zeng 18 Dec '17

18 Dec '17

Superseded patch 139632. From: Mingcong Bai <jeffbai(a)aosc.xyz> Signed-off-by: Mingcong Bai <jeffbai(a)aosc.xyz> Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- po/zh_CN.po | 99 ++++++++++++++++--------------------------------------------- 1 file changed, 25 insertions(+), 74 deletions(-)

1 0

[PATCH] msvcp90/tests: Use the correct return type for basic_istream::ipfx.
by Alexandre Julliard 18 Dec '17

18 Dec '17

Fixes a test on Android; msvcp60 already contains the fixed version. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/tests/ios.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/tests/ios.c b/dlls/msvcp90/tests/ios.c index 5dcb1d4e0f48..c075f01f8c06 100644 --- a/dlls/msvcp90/tests/ios.c +++ b/dlls/msvcp90/tests/ios.c @@ -1472,7 +1472,8 @@ static void test_istream_ipfx(void) basic_string_char str; IOSB_iostate state; wchar_t wide[64]; - int i, ret, next; + int i, next; + MSVCP_bool ret; /* makes tables narrower */ const IOSB_iostate IOSTATE_faileof = IOSTATE_failbit|IOSTATE_eofbit; @@ -1481,7 +1482,7 @@ static void test_istream_ipfx(void) const char *str; int unset_skipws; int noskip; - int ret; + MSVCP_bool ret; IOSB_iostate state; int next; } tests[] = { @@ -1507,7 +1508,7 @@ static void test_istream_ipfx(void) if(tests[i].unset_skipws) call_func2(p_ios_base_unsetf, &ss.basic_ios.base, TRUE); - ret = (int)call_func2(p_basic_istream_char_ipfx, &ss.base.base1, tests[i].noskip); + ret = (MSVCP_bool)(INT_PTR)call_func2(p_basic_istream_char_ipfx, &ss.base.base1, tests[i].noskip); state = (IOSB_iostate)call_func1(p_ios_base_rdstate, &ss.basic_ios.base); next = (int)call_func1(p_basic_istream_char_get, &ss.base.base1); @@ -1527,7 +1528,7 @@ static void test_istream_ipfx(void) if(tests[i].unset_skipws) call_func2(p_ios_base_unsetf, &wss.basic_ios.base, TRUE); - ret = (int)call_func2(p_basic_istream_wchar_ipfx, &wss.base.base1, tests[i].noskip); + ret = (MSVCP_bool)(INT_PTR)call_func2(p_basic_istream_wchar_ipfx, &wss.base.base1, tests[i].noskip); state = (IOSB_iostate)call_func1(p_ios_base_rdstate, &wss.basic_ios.base); nextus = (unsigned short)(int)call_func1(p_basic_istream_wchar_get, &wss.base.base1); -- 2.15.0 -- Alexandre Julliard julliard(a)winehq.org

2 1

[PATCH 2/2] mshtml.idl: Added events dispinterfaces declarations.
by Jacek Caban 18 Dec '17

18 Dec '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/mshtmdid.h | 5 + include/mshtml.idl | 263 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 268 insertions(+)

1 0

[PATCH 1/2] mshtml.idl: Added IDOMMouseEvent declaration.
by Jacek Caban 18 Dec '17

18 Dec '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/mshtmdid.h | 26 ++++++++++++++ include/mshtml.idl | 101 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 127 insertions(+)

1 0

[PATCH] winecfg: Fix a crash when inputting non-ASCII dll override name.
by Zhiyi Zhang 18 Dec '17

18 Dec '17

Signed-off-by: Zhiyi Zhang <yi.gd.cn(a)gmail.com> --- programs/winecfg/winecfg.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)

1 0

[PATCH] msvcrt: Correctly set rounding mode in _ftol implementation
by Piotr Caban 18 Dec '17

18 Dec '17

For bug 44168 (hopefully it will also fix bug 44170). Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH] user32/tests: Class API tests for interaction with activation contexts
by Nikolay Sivov 18 Dec '17

18 Dec '17

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/user32/tests/class.c | 161 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 161 insertions(+) diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index 6ab4cfe0c0..88bf3769f8 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -1161,6 +1161,166 @@ static void test_IME(void) ok(!lstrcmpiA(ptr, "user32.dll") || !lstrcmpiA(ptr, "ntdll.dll"), "IME window proc implemented in %s\n", ptr); } +static void create_manifest_file(const char *filename, const char *manifest) +{ + WCHAR path[MAX_PATH]; + HANDLE file; + DWORD size; + + MultiByteToWideChar( CP_ACP, 0, filename, -1, path, MAX_PATH ); + file = CreateFileW(path, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + ok(file != INVALID_HANDLE_VALUE, "CreateFile failed: %u\n", GetLastError()); + WriteFile(file, manifest, strlen(manifest), &size, NULL); + CloseHandle(file); +} + +static HANDLE create_test_actctx(const char *file) +{ + WCHAR path[MAX_PATH]; + ACTCTXW actctx; + HANDLE handle; + + MultiByteToWideChar(CP_ACP, 0, file, -1, path, MAX_PATH); + memset(&actctx, 0, sizeof(ACTCTXW)); + actctx.cbSize = sizeof(ACTCTXW); + actctx.lpSource = path; + + handle = CreateActCtxW(&actctx); + ok(handle != INVALID_HANDLE_VALUE, "failed to create context, error %u\n", GetLastError()); + + ok(actctx.cbSize == sizeof(actctx), "cbSize=%d\n", actctx.cbSize); + ok(actctx.dwFlags == 0, "dwFlags=%d\n", actctx.dwFlags); + ok(actctx.lpSource == path, "lpSource=%p\n", actctx.lpSource); + ok(actctx.wProcessorArchitecture == 0, "wProcessorArchitecture=%d\n", actctx.wProcessorArchitecture); + ok(actctx.wLangId == 0, "wLangId=%d\n", actctx.wLangId); + ok(actctx.lpAssemblyDirectory == NULL, "lpAssemblyDirectory=%p\n", actctx.lpAssemblyDirectory); + ok(actctx.lpResourceName == NULL, "lpResourceName=%p\n", actctx.lpResourceName); + ok(actctx.lpApplicationName == NULL, "lpApplicationName=%p\n", actctx.lpApplicationName); + ok(actctx.hModule == NULL, "hModule=%p\n", actctx.hModule); + + return handle; +} + +static void test_actctx_classes(void) +{ + static const char main_manifest[] = + "<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">" + "<assemblyIdentity version=\"4.3.2.1\" name=\"Wine.WndClass.Test\" type=\"win32\" />" + "<file name=\"file.exe\">" + "<windowClass>MyTestClass</windowClass>" + "</file>" + "</assembly>"; + WNDCLASSA wc; + ULONG_PTR cookie; + HANDLE context; + BOOL ret; + ATOM class; + HINSTANCE hinst; + + create_manifest_file("main.manifest", main_manifest); + context = create_test_actctx("main.manifest"); + DeleteFileA("main.manifest"); + + ret = ActivateActCtx(context, &cookie); + ok(ret, "Failed to activate context.\n"); + + memset(&wc, 0, sizeof(wc)); + wc.lpfnWndProc = ClassTest_WndProc; + wc.hIcon = LoadIconW(0, (LPCWSTR)IDI_APPLICATION); + wc.lpszClassName = "MyTestClass"; + + hinst = GetModuleHandleW(0); + + ret = GetClassInfoA(hinst, "MyTestClass", &wc); + ok(!ret, "Expected failure.\n"); + + class = RegisterClassA(&wc); + ok(class != 0, "Failed to register class.\n"); + + /* Class info is available by versioned and regular names. */ + ret = GetClassInfoA(hinst, "MyTestClass", &wc); + ok(ret, "Failed to get class info.\n"); + + ret = GetClassInfoA(hinst, "4.3.2.1!MyTestClass", &wc); +todo_wine + ok(ret, "Failed to get class info.\n"); + + ret = UnregisterClassA("MyTestClass", hinst); + ok(ret, "Failed to unregister class.\n"); + + ret = DeactivateActCtx(0, cookie); + ok(ret, "Failed to deactivate context.\n"); + + /* Register versioned class without active context. */ + wc.lpszClassName = "4.3.2.1!MyTestClass"; + class = RegisterClassA(&wc); + ok(class != 0, "Failed to register class.\n"); + + ret = ActivateActCtx(context, &cookie); + ok(ret, "Failed to activate context.\n"); + + wc.lpszClassName = "MyTestClass"; + class = RegisterClassA(&wc); +todo_wine + ok(class == 0, "Expected failure.\n"); + + ret = DeactivateActCtx(0, cookie); + ok(ret, "Failed to deactivate context.\n"); + + ret = UnregisterClassA("4.3.2.1!MyTestClass", hinst); + ok(ret, "Failed to unregister class.\n"); + + /* Only versioned name is registered. */ + ret = ActivateActCtx(context, &cookie); + ok(ret, "Failed to activate context.\n"); + + wc.lpszClassName = "MyTestClass"; + class = RegisterClassA(&wc); +todo_wine + ok(class != 0, "Failed to register class\n"); + + ret = DeactivateActCtx(0, cookie); + ok(ret, "Failed to deactivate context.\n"); + + ret = GetClassInfoA(hinst, "MyTestClass", &wc); +todo_wine + ok(!ret, "Expected failure.\n"); + + ret = GetClassInfoA(hinst, "4.3.2.1!MyTestClass", &wc); +todo_wine + ok(ret, "Failed to get class info.\n"); + + ret = UnregisterClassA("4.3.2.1!MyTestClass", hinst); +todo_wine + ok(ret, "Failed to unregister class.\n"); + + /* Register regular name first, it's not considered when versioned name is registered. */ + wc.lpszClassName = "MyTestClass"; + class = RegisterClassA(&wc); +todo_wine + ok(class != 0, "Failed to register class.\n"); + + ret = ActivateActCtx(context, &cookie); + ok(ret, "Failed to activate context.\n"); + + wc.lpszClassName = "MyTestClass"; + class = RegisterClassA(&wc); +todo_wine + ok(class != 0, "Failed to register class.\n"); + + ret = DeactivateActCtx(0, cookie); + ok(ret, "Failed to deactivate context.\n"); + + ret = UnregisterClassA("4.3.2.1!MyTestClass", hinst); +todo_wine + ok(ret, "Failed to unregister class.\n"); + + ret = UnregisterClassA("MyTestClass", hinst); + ok(ret, "Failed to unregister class.\n"); + + ReleaseActCtx(context); +} + START_TEST(class) { char **argv; @@ -1190,6 +1350,7 @@ START_TEST(class) test_builtinproc(); test_icons(); test_comctl32_classes(); + test_actctx_classes(); /* this test unregisters the Button class so it should be executed at the end */ test_instances(); -- 2.15.1

1 0

[PATCH 2/2] webservices/tests: Register an exception with the firewall to avoid a dialog.
by Hans Leidekker 18 Dec '17

18 Dec '17

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/tests/Makefile.in | 2 +- dlls/webservices/tests/channel.c | 142 +++++++++++++++++++++++++++++++++++++ 2 files changed, 143 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/tests/Makefile.in b/dlls/webservices/tests/Makefile.in index a7c93a7f5f..63e24e66db 100644 --- a/dlls/webservices/tests/Makefile.in +++ b/dlls/webservices/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = webservices.dll -IMPORTS = webservices user32 rpcrt4 ws2_32 +IMPORTS = webservices oleaut32 ole32 user32 rpcrt4 ws2_32 advapi32 C_SRCS = \ channel.c \ diff --git a/dlls/webservices/tests/channel.c b/dlls/webservices/tests/channel.c index 206f76def1..32820fed1f 100644 --- a/dlls/webservices/tests/channel.c +++ b/dlls/webservices/tests/channel.c @@ -17,8 +17,11 @@ */ #include <stdio.h> +#define COBJMACROS #include "windows.h" #include "webservices.h" +#include "initguid.h" +#include "netfw.h" #include "wine/test.h" static void test_WsCreateChannel(void) @@ -814,10 +817,147 @@ static HANDLE start_listener( struct listener_info *info ) return thread; } +enum firewall_op +{ + APP_ADD, + APP_REMOVE +}; + +static BOOL is_process_elevated(void) +{ + HANDLE token; + if (OpenProcessToken( GetCurrentProcess(), TOKEN_QUERY, &token )) + { + TOKEN_ELEVATION_TYPE type; + DWORD size; + BOOL ret; + + ret = GetTokenInformation( token, TokenElevationType, &type, sizeof(type), &size ); + CloseHandle( token ); + return (ret && type == TokenElevationTypeFull); + } + return FALSE; +} + +static BOOL is_firewall_enabled(void) +{ + HRESULT hr, init; + INetFwMgr *mgr = NULL; + INetFwPolicy *policy = NULL; + INetFwProfile *profile = NULL; + VARIANT_BOOL enabled = VARIANT_FALSE; + + init = CoInitializeEx( 0, COINIT_APARTMENTTHREADED ); + + hr = CoCreateInstance( &CLSID_NetFwMgr, NULL, CLSCTX_INPROC_SERVER, &IID_INetFwMgr, + (void **)&mgr ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwMgr_get_LocalPolicy( mgr, &policy ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwPolicy_get_CurrentProfile( policy, &profile ); + if (hr != S_OK) goto done; + + hr = INetFwProfile_get_FirewallEnabled( profile, &enabled ); + ok( hr == S_OK, "got %08x\n", hr ); + +done: + if (policy) INetFwPolicy_Release( policy ); + if (profile) INetFwProfile_Release( profile ); + if (mgr) INetFwMgr_Release( mgr ); + if (SUCCEEDED( init )) CoUninitialize(); + return (enabled == VARIANT_TRUE); +} + +static HRESULT set_firewall( enum firewall_op op ) +{ + static const WCHAR testW[] = {'w','e','b','s','e','r','v','i','c','e','s','_','t','e','s','t',0}; + HRESULT hr, init; + INetFwMgr *mgr = NULL; + INetFwPolicy *policy = NULL; + INetFwProfile *profile = NULL; + INetFwAuthorizedApplication *app = NULL; + INetFwAuthorizedApplications *apps = NULL; + BSTR name, image = SysAllocStringLen( NULL, MAX_PATH ); + + if (!GetModuleFileNameW( NULL, image, MAX_PATH )) + { + SysFreeString( image ); + return E_FAIL; + } + init = CoInitializeEx( 0, COINIT_APARTMENTTHREADED ); + + hr = CoCreateInstance( &CLSID_NetFwMgr, NULL, CLSCTX_INPROC_SERVER, &IID_INetFwMgr, + (void **)&mgr ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwMgr_get_LocalPolicy( mgr, &policy ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwPolicy_get_CurrentProfile( policy, &profile ); + if (hr != S_OK) goto done; + + hr = INetFwProfile_get_AuthorizedApplications( profile, &apps ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = CoCreateInstance( &CLSID_NetFwAuthorizedApplication, NULL, CLSCTX_INPROC_SERVER, + &IID_INetFwAuthorizedApplication, (void **)&app ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwAuthorizedApplication_put_ProcessImageFileName( app, image ); + if (hr != S_OK) goto done; + + name = SysAllocString( testW ); + hr = INetFwAuthorizedApplication_put_Name( app, name ); + SysFreeString( name ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + if (op == APP_ADD) + hr = INetFwAuthorizedApplications_Add( apps, app ); + else if (op == APP_REMOVE) + hr = INetFwAuthorizedApplications_Remove( apps, image ); + else + hr = E_INVALIDARG; + +done: + if (app) INetFwAuthorizedApplication_Release( app ); + if (apps) INetFwAuthorizedApplications_Release( apps ); + if (policy) INetFwPolicy_Release( policy ); + if (profile) INetFwProfile_Release( profile ); + if (mgr) INetFwMgr_Release( mgr ); + if (SUCCEEDED( init )) CoUninitialize(); + SysFreeString( image ); + return hr; +} + START_TEST(channel) { + BOOL firewall_enabled = is_firewall_enabled(); struct listener_info info; HANDLE thread; + HRESULT hr; + + if (firewall_enabled) + { + if (!is_process_elevated()) + { + skip( "no privileges, skipping tests to avoid firewall dialog\n" ); + return; + } + if ((hr = set_firewall( APP_ADD )) != S_OK) + { + skip( "can't authorize app in firewall %08x\n", hr ); + return; + } + } test_WsCreateChannel(); test_WsOpenChannel(); @@ -859,4 +999,6 @@ START_TEST(channel) thread = start_listener( &info ); test_WsAcceptChannel( &info ); WaitForSingleObject( thread, 3000 ); + + if (firewall_enabled) set_firewall( APP_REMOVE ); } -- 2.11.0

1 0

[PATCH 1/2] webservices/tests: Merge the listener tests into channel.c.
by Hans Leidekker 18 Dec '17

18 Dec '17

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/tests/Makefile.in | 1 - dlls/webservices/tests/channel.c | 336 +++++++++++++++++++++++++++++ dlls/webservices/tests/listener.c | 424 ------------------------------------- 3 files changed, 336 insertions(+), 425 deletions(-) delete mode 100644 dlls/webservices/tests/listener.c diff --git a/dlls/webservices/tests/Makefile.in b/dlls/webservices/tests/Makefile.in index 9b2e68812b..a7c93a7f5f 100644 --- a/dlls/webservices/tests/Makefile.in +++ b/dlls/webservices/tests/Makefile.in @@ -3,7 +3,6 @@ IMPORTS = webservices user32 rpcrt4 ws2_32 C_SRCS = \ channel.c \ - listener.c \ msg.c \ proxy.c \ reader.c \ diff --git a/dlls/webservices/tests/channel.c b/dlls/webservices/tests/channel.c index 91cf2362c2..206f76def1 100644 --- a/dlls/webservices/tests/channel.c +++ b/dlls/webservices/tests/channel.c @@ -211,6 +211,225 @@ static void test_WsResetChannel(void) WsFreeChannel( channel ); } +static void test_WsCreateListener(void) +{ + HRESULT hr; + WS_LISTENER *listener; + WS_CHANNEL_TYPE type; + WS_CHANNEL_BINDING binding; + WS_LISTENER_STATE state; + WS_IP_VERSION version; + ULONG size, backlog; + + hr = WsCreateListener( WS_CHANNEL_TYPE_DUPLEX_SESSION, WS_TCP_CHANNEL_BINDING, NULL, 0, NULL, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + listener = NULL; + hr = WsCreateListener( WS_CHANNEL_TYPE_DUPLEX_SESSION, WS_TCP_CHANNEL_BINDING, NULL, 0, NULL, &listener, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( listener != NULL, "listener not set\n" ); + + backlog = 1000; + size = sizeof(backlog); + hr = WsSetListenerProperty( listener, WS_LISTENER_PROPERTY_LISTEN_BACKLOG, &backlog, size, NULL ); + todo_wine ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + version = WS_IP_VERSION_4; + size = sizeof(version); + hr = WsSetListenerProperty( listener, WS_LISTENER_PROPERTY_IP_VERSION, &version, size, NULL ); + todo_wine ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + type = 0xdeadbeef; + hr = WsGetListenerProperty( listener, WS_LISTENER_PROPERTY_CHANNEL_TYPE, &type, sizeof(type), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( type == WS_CHANNEL_TYPE_DUPLEX_SESSION, "got %u\n", type ); + + binding = 0xdeadbeef; + hr = WsGetListenerProperty( listener, WS_LISTENER_PROPERTY_CHANNEL_BINDING, &binding, sizeof(binding), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( binding == WS_TCP_CHANNEL_BINDING, "got %u\n", binding ); + + version = 0; + size = sizeof(version); + hr = WsGetListenerProperty( listener, WS_LISTENER_PROPERTY_IP_VERSION, &version, size, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + todo_wine ok( version == WS_IP_VERSION_AUTO, "got %u\n", version ); + + state = 0xdeadbeef; + size = sizeof(state); + hr = WsGetListenerProperty( listener, WS_LISTENER_PROPERTY_STATE, &state, size, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( state == WS_LISTENER_STATE_CREATED, "got %u\n", state ); + + state = WS_LISTENER_STATE_CREATED; + size = sizeof(state); + hr = WsSetListenerProperty( listener, WS_LISTENER_PROPERTY_STATE, &state, size, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + WsFreeListener( listener ); +} + +static void test_WsOpenListener(void) +{ + WCHAR str[] = + {'n','e','t','.','t','c','p',':','/','/','+',':','2','0','1','7','/','p','a','t','h'}; + WCHAR str2[] = + {'n','e','t','.','t','c','p',':','/','/','l','o','c','a','l','h','o','s','t',':','2','0','1','7'}; + WCHAR str3[] = + {'n','e','t','.','t','c','p',':','/','/','1','2','7','.','0','.','0','.','1',':','2','0','1','7'}; + WS_STRING url; + WS_LISTENER *listener; + HRESULT hr; + + hr = WsOpenListener( NULL, NULL, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsCreateListener( WS_CHANNEL_TYPE_DUPLEX_SESSION, WS_TCP_CHANNEL_BINDING, NULL, 0, NULL, &listener, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsCloseListener( listener, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + WsFreeListener( listener ); + + hr = WsCreateListener( WS_CHANNEL_TYPE_DUPLEX_SESSION, WS_TCP_CHANNEL_BINDING, NULL, 0, NULL, &listener, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsOpenListener( listener, NULL, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + url.length = sizeof(str)/sizeof(str[0]); + url.chars = str; + hr = WsOpenListener( NULL, &url, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsOpenListener( listener, &url, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsOpenListener( listener, &url, NULL, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + + hr = WsCloseListener( listener, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + WsFreeListener( listener ); + + hr = WsCreateListener( WS_CHANNEL_TYPE_DUPLEX_SESSION, WS_TCP_CHANNEL_BINDING, NULL, 0, NULL, &listener, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + url.length = sizeof(str2)/sizeof(str2[0]); + url.chars = str2; + hr = WsOpenListener( listener, &url, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsCloseListener( listener, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + WsFreeListener( listener ); + + hr = WsCreateListener( WS_CHANNEL_TYPE_DUPLEX_SESSION, WS_TCP_CHANNEL_BINDING, NULL, 0, NULL, &listener, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + url.length = sizeof(str3)/sizeof(str3[0]); + url.chars = str3; + hr = WsOpenListener( listener, &url, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsCloseListener( listener, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsCloseListener( NULL, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + WsFreeListener( listener ); +} + +static void test_WsCreateChannelForListener(void) +{ + WS_LISTENER *listener; + WS_CHANNEL *channel; + WS_CHANNEL_TYPE type; + WS_CHANNEL_STATE state; + HRESULT hr; + + hr = WsCreateChannelForListener( NULL, NULL, 0, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsCreateChannelForListener( NULL, NULL, 0, &channel, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsCreateListener( WS_CHANNEL_TYPE_DUPLEX_SESSION, WS_TCP_CHANNEL_BINDING, NULL, 0, NULL, &listener, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + channel = NULL; + hr = WsCreateChannelForListener( listener, NULL, 0, &channel, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( channel != NULL, "channel not set\n" ); + + type = 0xdeadbeef; + hr = WsGetChannelProperty( channel, WS_CHANNEL_PROPERTY_CHANNEL_TYPE, &type, sizeof(type), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( type == WS_CHANNEL_TYPE_DUPLEX_SESSION, "got %u\n", type ); + + state = 0xdeadbeef; + hr = WsGetChannelProperty( channel, WS_CHANNEL_PROPERTY_STATE, &state, sizeof(state), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( state == WS_CHANNEL_STATE_CREATED, "got %u\n", state ); + + WsFreeChannel( channel ); + WsFreeListener( listener ); +} + +static void test_WsResetListener(void) +{ + WCHAR str[] = + {'n','e','t','.','t','c','p',':','/','/','+',':','2','0','1','7','/','p','a','t','h'}; + WS_STRING url = { sizeof(str)/sizeof(str[0]), str }; + WS_LISTENER *listener; + WS_LISTENER_STATE state; + WS_LISTENER_PROPERTY prop; + ULONG size, timeout = 1000; + HRESULT hr; + + hr = WsResetListener( NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + prop.id = WS_LISTENER_PROPERTY_CONNECT_TIMEOUT; + prop.value = &timeout; + prop.valueSize = sizeof(timeout); + hr = WsCreateListener( WS_CHANNEL_TYPE_DUPLEX_SESSION, WS_TCP_CHANNEL_BINDING, &prop, 1, NULL, &listener, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsResetListener( listener, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsOpenListener( listener, &url, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsResetListener( listener, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + + hr = WsCloseListener( listener, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsResetListener( listener, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + state = 0xdeadbeef; + size = sizeof(state); + hr = WsGetListenerProperty( listener, WS_LISTENER_PROPERTY_STATE, &state, size, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( state == WS_LISTENER_STATE_CREATED, "got %u\n", state ); + + timeout = 0xdeadbeef; + size = sizeof(timeout); + hr = WsGetListenerProperty( listener, WS_LISTENER_PROPERTY_CONNECT_TIMEOUT, &timeout, size, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( timeout == 1000, "got %u\n", timeout ); + + WsFreeListener( listener ); +} + struct listener_info { int port; @@ -441,6 +660,104 @@ static void test_duplex_session( const struct listener_info *info ) WsFreeChannel( channel ); } +static void client_accept_channel( WS_CHANNEL *channel ) +{ + WS_XML_STRING localname = {9, (BYTE *)"localname"}, ns = {2, (BYTE *)"ns"}, action = {6, (BYTE *)"action"}; + WS_ELEMENT_DESCRIPTION body; + WS_MESSAGE_DESCRIPTION desc_resp; + const WS_MESSAGE_DESCRIPTION *desc[1]; + WS_MESSAGE *msg; + INT32 val = 0; + HRESULT hr; + + hr = WsCreateMessageForChannel( channel, NULL, 0, &msg, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + body.elementLocalName = &localname; + body.elementNs = &ns; + body.type = WS_INT32_TYPE; + body.typeDescription = NULL; + + desc_resp.action = &action; + desc_resp.bodyElementDescription = &body; + desc[0] = &desc_resp; + + hr = WsReceiveMessage( channel, msg, desc, 1, WS_RECEIVE_REQUIRED_MESSAGE, WS_READ_REQUIRED_VALUE, + NULL, &val, sizeof(val), NULL, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( val == -1, "got %d\n", val ); + WsFreeMessage( msg ); +} + +static void test_WsAcceptChannel( const struct listener_info *info ) +{ + static const WCHAR fmt_tcp[] = + {'n','e','t','.','t','c','p',':','/','/','l','o','c','a','l','h','o','s','t',':','%','u',0}; + static const WCHAR fmt_udp[] = + {'s','o','a','p','.','u','d','p',':','/','/','l','o','c','a','l','h','o','s','t',':','%','u',0}; + const WCHAR *fmt = (info->binding == WS_TCP_CHANNEL_BINDING) ? fmt_tcp : fmt_udp; + WS_XML_STRING localname = {9, (BYTE *)"localname"}, ns = {2, (BYTE *)"ns"}, action = {6, (BYTE *)"action"}; + WCHAR buf[64]; + WS_LISTENER *listener; + WS_CHANNEL *channel; + WS_MESSAGE *msg; + WS_ENDPOINT_ADDRESS addr; + WS_ELEMENT_DESCRIPTION body; + WS_MESSAGE_DESCRIPTION desc; + INT32 val = -1; + HRESULT hr; + DWORD err; + + hr = WsAcceptChannel( NULL, NULL, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsCreateListener( info->type, info->binding, NULL, 0, NULL, &listener, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsAcceptChannel( listener, NULL, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsCreateChannelForListener( listener, NULL, 0, &channel, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsAcceptChannel( listener, channel, NULL, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + WsFreeChannel( channel ); + WsFreeListener( listener ); + + hr = WsCreateChannel( info->type, info->binding, NULL, 0, NULL, &channel, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + memset( &addr, 0, sizeof(addr) ); + addr.url.length = wsprintfW( buf, fmt, info->port ); + addr.url.chars = buf; + hr = WsOpenChannel( channel, &addr, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsCreateMessageForChannel( channel, NULL, 0, &msg, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + body.elementLocalName = &localname; + body.elementNs = &ns; + body.type = WS_INT32_TYPE; + body.typeDescription = NULL; + + desc.action = &action; + desc.bodyElementDescription = &body; + + hr = WsSendMessage( channel, msg, &desc, WS_WRITE_REQUIRED_VALUE, &val, sizeof(val), NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + err = WaitForSingleObject( info->wait, 3000 ); + ok( err == WAIT_OBJECT_0, "wait failed %u\n", err ); + + hr = WsCloseChannel( channel, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + WsFreeMessage( msg ); + WsFreeChannel( channel ); +} + static DWORD CALLBACK listener_proc( void *arg ) { static const WCHAR fmt_tcp[] = @@ -505,6 +822,10 @@ START_TEST(channel) test_WsCreateChannel(); test_WsOpenChannel(); test_WsResetChannel(); + test_WsCreateListener(); + test_WsOpenListener(); + test_WsCreateChannelForListener(); + test_WsResetListener(); info.port = 7533; info.wait = CreateEventW( NULL, 0, 0, NULL ); @@ -523,4 +844,19 @@ START_TEST(channel) thread = start_listener( &info ); test_duplex_session( &info ); WaitForSingleObject( thread, 3000 ); + + info.type = WS_CHANNEL_TYPE_DUPLEX; + info.binding = WS_UDP_CHANNEL_BINDING; + info.test_func = client_accept_channel; + + thread = start_listener( &info ); + test_WsAcceptChannel( &info ); + WaitForSingleObject( thread, 3000 ); + + info.type = WS_CHANNEL_TYPE_DUPLEX_SESSION; + info.binding = WS_TCP_CHANNEL_BINDING; + + thread = start_listener( &info ); + test_WsAcceptChannel( &info ); + WaitForSingleObject( thread, 3000 ); } diff --git a/dlls/webservices/tests/listener.c b/dlls/webservices/tests/listener.c deleted file mode 100644 index 10539f9d9c..0000000000 --- a/dlls/webservices/tests/listener.c +++ /dev/null @@ -1,424 +0,0 @@ -/* - * Copyright 2017 Hans Leidekker for CodeWeavers - * - * 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 - */ - -#include <stdio.h> -#include "windows.h" -#include "webservices.h" -#include "wine/test.h" - -static void test_WsCreateListener(void) -{ - HRESULT hr; - WS_LISTENER *listener; - WS_CHANNEL_TYPE type; - WS_CHANNEL_BINDING binding; - WS_LISTENER_STATE state; - WS_IP_VERSION version; - ULONG size, backlog; - - hr = WsCreateListener( WS_CHANNEL_TYPE_DUPLEX_SESSION, WS_TCP_CHANNEL_BINDING, NULL, 0, NULL, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); - - listener = NULL; - hr = WsCreateListener( WS_CHANNEL_TYPE_DUPLEX_SESSION, WS_TCP_CHANNEL_BINDING, NULL, 0, NULL, &listener, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( listener != NULL, "listener not set\n" ); - - backlog = 1000; - size = sizeof(backlog); - hr = WsSetListenerProperty( listener, WS_LISTENER_PROPERTY_LISTEN_BACKLOG, &backlog, size, NULL ); - todo_wine ok( hr == E_INVALIDARG, "got %08x\n", hr ); - - version = WS_IP_VERSION_4; - size = sizeof(version); - hr = WsSetListenerProperty( listener, WS_LISTENER_PROPERTY_IP_VERSION, &version, size, NULL ); - todo_wine ok( hr == E_INVALIDARG, "got %08x\n", hr ); - - type = 0xdeadbeef; - hr = WsGetListenerProperty( listener, WS_LISTENER_PROPERTY_CHANNEL_TYPE, &type, sizeof(type), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( type == WS_CHANNEL_TYPE_DUPLEX_SESSION, "got %u\n", type ); - - binding = 0xdeadbeef; - hr = WsGetListenerProperty( listener, WS_LISTENER_PROPERTY_CHANNEL_BINDING, &binding, sizeof(binding), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( binding == WS_TCP_CHANNEL_BINDING, "got %u\n", binding ); - - version = 0; - size = sizeof(version); - hr = WsGetListenerProperty( listener, WS_LISTENER_PROPERTY_IP_VERSION, &version, size, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - todo_wine ok( version == WS_IP_VERSION_AUTO, "got %u\n", version ); - - state = 0xdeadbeef; - size = sizeof(state); - hr = WsGetListenerProperty( listener, WS_LISTENER_PROPERTY_STATE, &state, size, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( state == WS_LISTENER_STATE_CREATED, "got %u\n", state ); - - state = WS_LISTENER_STATE_CREATED; - size = sizeof(state); - hr = WsSetListenerProperty( listener, WS_LISTENER_PROPERTY_STATE, &state, size, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); - - WsFreeListener( listener ); -} - -static void test_WsOpenListener(void) -{ - WCHAR str[] = - {'n','e','t','.','t','c','p',':','/','/','+',':','2','0','1','7','/','p','a','t','h'}; - WCHAR str2[] = - {'n','e','t','.','t','c','p',':','/','/','l','o','c','a','l','h','o','s','t',':','2','0','1','7'}; - WCHAR str3[] = - {'n','e','t','.','t','c','p',':','/','/','1','2','7','.','0','.','0','.','1',':','2','0','1','7'}; - WS_STRING url; - WS_LISTENER *listener; - HRESULT hr; - - hr = WsOpenListener( NULL, NULL, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); - - hr = WsCreateListener( WS_CHANNEL_TYPE_DUPLEX_SESSION, WS_TCP_CHANNEL_BINDING, NULL, 0, NULL, &listener, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - - hr = WsCloseListener( listener, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - - WsFreeListener( listener ); - - hr = WsCreateListener( WS_CHANNEL_TYPE_DUPLEX_SESSION, WS_TCP_CHANNEL_BINDING, NULL, 0, NULL, &listener, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - - hr = WsOpenListener( listener, NULL, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); - - url.length = sizeof(str)/sizeof(str[0]); - url.chars = str; - hr = WsOpenListener( NULL, &url, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); - - hr = WsOpenListener( listener, &url, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - - hr = WsOpenListener( listener, &url, NULL, NULL ); - ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); - - hr = WsCloseListener( listener, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - - WsFreeListener( listener ); - - hr = WsCreateListener( WS_CHANNEL_TYPE_DUPLEX_SESSION, WS_TCP_CHANNEL_BINDING, NULL, 0, NULL, &listener, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - - url.length = sizeof(str2)/sizeof(str2[0]); - url.chars = str2; - hr = WsOpenListener( listener, &url, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - - hr = WsCloseListener( listener, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - - WsFreeListener( listener ); - - hr = WsCreateListener( WS_CHANNEL_TYPE_DUPLEX_SESSION, WS_TCP_CHANNEL_BINDING, NULL, 0, NULL, &listener, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - - url.length = sizeof(str3)/sizeof(str3[0]); - url.chars = str3; - hr = WsOpenListener( listener, &url, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - - hr = WsCloseListener( listener, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - - hr = WsCloseListener( NULL, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); - - WsFreeListener( listener ); -} - -static void test_WsCreateChannelForListener(void) -{ - WS_LISTENER *listener; - WS_CHANNEL *channel; - WS_CHANNEL_TYPE type; - WS_CHANNEL_STATE state; - HRESULT hr; - - hr = WsCreateChannelForListener( NULL, NULL, 0, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); - - hr = WsCreateChannelForListener( NULL, NULL, 0, &channel, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); - - hr = WsCreateListener( WS_CHANNEL_TYPE_DUPLEX_SESSION, WS_TCP_CHANNEL_BINDING, NULL, 0, NULL, &listener, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - - channel = NULL; - hr = WsCreateChannelForListener( listener, NULL, 0, &channel, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( channel != NULL, "channel not set\n" ); - - type = 0xdeadbeef; - hr = WsGetChannelProperty( channel, WS_CHANNEL_PROPERTY_CHANNEL_TYPE, &type, sizeof(type), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( type == WS_CHANNEL_TYPE_DUPLEX_SESSION, "got %u\n", type ); - - state = 0xdeadbeef; - hr = WsGetChannelProperty( channel, WS_CHANNEL_PROPERTY_STATE, &state, sizeof(state), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( state == WS_CHANNEL_STATE_CREATED, "got %u\n", state ); - - WsFreeChannel( channel ); - WsFreeListener( listener ); -} - -static void test_WsResetListener(void) -{ - WCHAR str[] = - {'n','e','t','.','t','c','p',':','/','/','+',':','2','0','1','7','/','p','a','t','h'}; - WS_STRING url = { sizeof(str)/sizeof(str[0]), str }; - WS_LISTENER *listener; - WS_LISTENER_STATE state; - WS_LISTENER_PROPERTY prop; - ULONG size, timeout = 1000; - HRESULT hr; - - hr = WsResetListener( NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); - - prop.id = WS_LISTENER_PROPERTY_CONNECT_TIMEOUT; - prop.value = &timeout; - prop.valueSize = sizeof(timeout); - hr = WsCreateListener( WS_CHANNEL_TYPE_DUPLEX_SESSION, WS_TCP_CHANNEL_BINDING, &prop, 1, NULL, &listener, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - - hr = WsResetListener( listener, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - - hr = WsOpenListener( listener, &url, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - - hr = WsResetListener( listener, NULL ); - ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); - - hr = WsCloseListener( listener, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - - hr = WsResetListener( listener, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - - state = 0xdeadbeef; - size = sizeof(state); - hr = WsGetListenerProperty( listener, WS_LISTENER_PROPERTY_STATE, &state, size, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( state == WS_LISTENER_STATE_CREATED, "got %u\n", state ); - - timeout = 0xdeadbeef; - size = sizeof(timeout); - hr = WsGetListenerProperty( listener, WS_LISTENER_PROPERTY_CONNECT_TIMEOUT, &timeout, size, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( timeout == 1000, "got %u\n", timeout ); - - WsFreeListener( listener ); -} - -struct listener_info -{ - int port; - HANDLE wait; - WS_CHANNEL_BINDING binding; - WS_CHANNEL_TYPE type; -}; - -static DWORD CALLBACK listener_proc( void *arg ) -{ - static const WCHAR fmt_tcp[] = {'n','e','t','.','t','c','p',':','/','/','+',':','%','u',0}; - static const WCHAR fmt_udp[] = {'s','o','a','p','.','u','d','p',':','/','/','+',':','%','u',0}; - struct listener_info *info = arg; - const WCHAR *fmt = (info->binding == WS_TCP_CHANNEL_BINDING) ? fmt_tcp : fmt_udp; - WS_XML_STRING localname = {9, (BYTE *)"localname"}, ns = {2, (BYTE *)"ns"}, action = {6, (BYTE *)"action"}; - WS_ELEMENT_DESCRIPTION body; - WS_MESSAGE_DESCRIPTION desc_resp; - const WS_MESSAGE_DESCRIPTION *desc[1]; - INT32 val = 0; - WS_LISTENER *listener; - WS_CHANNEL *channel; - WS_MESSAGE *msg; - WCHAR buf[64]; - WS_STRING url; - HRESULT hr; - - hr = WsCreateListener( info->type, info->binding, NULL, 0, NULL, &listener, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - - url.length = wsprintfW( buf, fmt, info->port ); - url.chars = buf; - hr = WsOpenListener( listener, &url, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - - hr = WsCreateChannelForListener( listener, NULL, 0, &channel, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - - SetEvent( info->wait ); - - hr = WsAcceptChannel( listener, channel, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - - hr = WsAcceptChannel( listener, channel, NULL, NULL ); - ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); - - hr = WsCreateMessageForChannel( channel, NULL, 0, &msg, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - - body.elementLocalName = &localname; - body.elementNs = &ns; - body.type = WS_INT32_TYPE; - body.typeDescription = NULL; - - desc_resp.action = &action; - desc_resp.bodyElementDescription = &body; - desc[0] = &desc_resp; - - hr = WsReceiveMessage( channel, msg, desc, 1, WS_RECEIVE_REQUIRED_MESSAGE, WS_READ_REQUIRED_VALUE, - NULL, &val, sizeof(val), NULL, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( val == -1, "got %d\n", val ); - WsFreeMessage( msg ); - - SetEvent( info->wait ); - - hr = WsCloseChannel( channel, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - WsFreeChannel( channel ); - - hr = WsCloseListener( listener, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - WsFreeListener( listener ); - - return 0; -} - -static void test_WsAcceptChannel( const struct listener_info *info ) -{ - static const WCHAR fmt_tcp[] = - {'n','e','t','.','t','c','p',':','/','/','l','o','c','a','l','h','o','s','t',':','%','u',0}; - static const WCHAR fmt_udp[] = - {'s','o','a','p','.','u','d','p',':','/','/','l','o','c','a','l','h','o','s','t',':','%','u',0}; - const WCHAR *fmt = (info->binding == WS_TCP_CHANNEL_BINDING) ? fmt_tcp : fmt_udp; - WS_XML_STRING localname = {9, (BYTE *)"localname"}, ns = {2, (BYTE *)"ns"}, action = {6, (BYTE *)"action"}; - WCHAR buf[64]; - WS_LISTENER *listener; - WS_CHANNEL *channel; - WS_MESSAGE *msg; - WS_ENDPOINT_ADDRESS addr; - WS_ELEMENT_DESCRIPTION body; - WS_MESSAGE_DESCRIPTION desc; - INT32 val = -1; - HRESULT hr; - DWORD err; - - hr = WsAcceptChannel( NULL, NULL, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); - - hr = WsCreateListener( info->type, info->binding, NULL, 0, NULL, &listener, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - - hr = WsAcceptChannel( listener, NULL, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); - - hr = WsCreateChannelForListener( listener, NULL, 0, &channel, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - - hr = WsAcceptChannel( listener, channel, NULL, NULL ); - ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); - WsFreeChannel( channel ); - WsFreeListener( listener ); - - hr = WsCreateChannel( info->type, info->binding, NULL, 0, NULL, &channel, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - - memset( &addr, 0, sizeof(addr) ); - addr.url.length = wsprintfW( buf, fmt, info->port ); - addr.url.chars = buf; - hr = WsOpenChannel( channel, &addr, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - - hr = WsCreateMessageForChannel( channel, NULL, 0, &msg, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - - body.elementLocalName = &localname; - body.elementNs = &ns; - body.type = WS_INT32_TYPE; - body.typeDescription = NULL; - - desc.action = &action; - desc.bodyElementDescription = &body; - - hr = WsSendMessage( channel, msg, &desc, WS_WRITE_REQUIRED_VALUE, &val, sizeof(val), NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - - err = WaitForSingleObject( info->wait, 3000 ); - ok( err == WAIT_OBJECT_0, "wait failed %u\n", err ); - - hr = WsCloseChannel( channel, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - - WsFreeMessage( msg ); - WsFreeChannel( channel ); -} - -static HANDLE start_listener( struct listener_info *info ) -{ - DWORD err; - HANDLE thread = CreateThread( NULL, 0, listener_proc, info, 0, NULL ); - ok( thread != NULL, "failed to create listener thread %u\n", GetLastError() ); - - err = WaitForSingleObject( info->wait, 3000 ); - ok( err == WAIT_OBJECT_0, "failed to start listener %u\n", err ); - return thread; -} - -START_TEST(listener) -{ - struct listener_info info; - HANDLE thread; - - test_WsCreateListener(); - test_WsOpenListener(); - test_WsCreateChannelForListener(); - test_WsResetListener(); - - info.port = 7533; - info.wait = CreateEventW( NULL, 0, 0, NULL ); - info.type = WS_CHANNEL_TYPE_DUPLEX; - info.binding = WS_UDP_CHANNEL_BINDING; - - thread = start_listener( &info ); - test_WsAcceptChannel( &info ); - WaitForSingleObject( thread, 3000 ); - - info.type = WS_CHANNEL_TYPE_DUPLEX_SESSION; - info.binding = WS_TCP_CHANNEL_BINDING; - - thread = start_listener( &info ); - test_WsAcceptChannel( &info ); - WaitForSingleObject( thread, 3000 ); -} -- 2.11.0

1 0

[PATCH] msvcr71: Don't raise exception in _invalid_parameter
by Piotr Caban 18 Dec '17

18 Dec '17

Support for invalid parameter handler was added in msvcr80. For bug 44163. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/errno.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH] comctl32/tests: Add Edit control tests
by Nikolay Sivov 18 Dec '17

18 Dec '17

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/tests/Makefile.in | 1 + dlls/comctl32/tests/edit.c | 2979 +++++++++++++++++++++++++++++++++++++++ dlls/comctl32/tests/rsrc.rc | 60 + 3 files changed, 3040 insertions(+) create mode 100644 dlls/comctl32/tests/edit.c diff --git a/dlls/comctl32/tests/Makefile.in b/dlls/comctl32/tests/Makefile.in index 36d77f0e1c..4fd0f0299e 100644 --- a/dlls/comctl32/tests/Makefile.in +++ b/dlls/comctl32/tests/Makefile.in @@ -7,6 +7,7 @@ C_SRCS = \ combo.c \ datetime.c \ dpa.c \ + edit.c \ header.c \ imagelist.c \ ipaddress.c \ diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c new file mode 100644 index 0000000000..10968957cc --- /dev/null +++ b/dlls/comctl32/tests/edit.c @@ -0,0 +1,2979 @@ +/* Unit test suite for edit control. + * + * Copyright 2004 Vitaliy Margolen + * Copyright 2005 C. Scott Ananian + * + * 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 + */ + +#include <assert.h> +#include <windows.h> +#include <commctrl.h> + +#include "wine/test.h" +#include "v6util.h" + +#ifndef ES_COMBO +#define ES_COMBO 0x200 +#endif + +#define ID_EDITTESTDBUTTON 0x123 +#define ID_EDITTEST2 99 +#define MAXLEN 200 + +struct edit_notify { + int en_change, en_maxtext, en_update; +}; + +static struct edit_notify notifications; + +static INT_PTR CALLBACK multi_edit_dialog_proc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) +{ + static int num_ok_commands = 0; + switch (msg) + { + case WM_INITDIALOG: + { + HWND hedit = GetDlgItem(hdlg, 1000); + SetFocus(hedit); + switch (lparam) + { + /* test cases related to bug 12319 */ + case 0: + PostMessageA(hedit, WM_KEYDOWN, VK_TAB, 0xf0001); + PostMessageA(hdlg, WM_USER, 0xdeadbeef, 0); + break; + case 1: + PostMessageA(hedit, WM_CHAR, VK_TAB, 0xf0001); + PostMessageA(hdlg, WM_USER, 0xdeadbeef, 0); + break; + case 2: + PostMessageA(hedit, WM_KEYDOWN, VK_TAB, 0xf0001); + PostMessageA(hedit, WM_CHAR, VK_TAB, 0xf0001); + PostMessageA(hdlg, WM_USER, 0xdeadbeef, 0); + break; + + /* test cases for pressing enter */ + case 3: + num_ok_commands = 0; + PostMessageA(hedit, WM_KEYDOWN, VK_RETURN, 0x1c0001); + PostMessageA(hdlg, WM_USER, 0xdeadbeef, 1); + break; + + default: + break; + } + break; + } + + case WM_COMMAND: + if (HIWORD(wparam) != BN_CLICKED) + break; + + switch (LOWORD(wparam)) + { + case IDOK: + num_ok_commands++; + break; + + default: + break; + } + break; + + case WM_USER: + { + HWND hfocus = GetFocus(); + HWND hedit = GetDlgItem(hdlg, 1000); + HWND hedit2 = GetDlgItem(hdlg, 1001); + HWND hedit3 = GetDlgItem(hdlg, 1002); + + if (wparam != 0xdeadbeef) + break; + + switch (lparam) + { + case 0: + if (hfocus == hedit) + EndDialog(hdlg, 1111); + else if (hfocus == hedit2) + EndDialog(hdlg, 2222); + else if (hfocus == hedit3) + EndDialog(hdlg, 3333); + else + EndDialog(hdlg, 4444); + break; + case 1: + if ((hfocus == hedit) && (num_ok_commands == 0)) + EndDialog(hdlg, 11); + else + EndDialog(hdlg, 22); + break; + default: + EndDialog(hdlg, 5555); + } + break; + } + + case WM_CLOSE: + EndDialog(hdlg, 333); + break; + + default: + break; + } + + return FALSE; +} + +static INT_PTR CALLBACK edit_dialog_proc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) +{ + switch (msg) + { + case WM_INITDIALOG: + { + HWND hedit = GetDlgItem(hdlg, 1000); + SetFocus(hedit); + switch (lparam) + { + /* from bug 11841 */ + case 0: + PostMessageA(hedit, WM_KEYDOWN, VK_ESCAPE, 0x10001); + break; + case 1: + PostMessageA(hedit, WM_KEYDOWN, VK_RETURN, 0x1c0001); + break; + case 2: + PostMessageA(hedit, WM_KEYDOWN, VK_TAB, 0xf0001); + PostMessageA(hdlg, WM_USER, 0xdeadbeef, 1); + break; + + /* more test cases for WM_CHAR */ + case 3: + PostMessageA(hedit, WM_CHAR, VK_ESCAPE, 0x10001); + PostMessageA(hdlg, WM_USER, 0xdeadbeef, 0); + break; + case 4: + PostMessageA(hedit, WM_CHAR, VK_RETURN, 0x1c0001); + PostMessageA(hdlg, WM_USER, 0xdeadbeef, 0); + break; + case 5: + PostMessageA(hedit, WM_CHAR, VK_TAB, 0xf0001); + PostMessageA(hdlg, WM_USER, 0xdeadbeef, 0); + break; + + /* more test cases for WM_KEYDOWN + WM_CHAR */ + case 6: + PostMessageA(hedit, WM_KEYDOWN, VK_ESCAPE, 0x10001); + PostMessageA(hedit, WM_CHAR, VK_ESCAPE, 0x10001); + PostMessageA(hdlg, WM_USER, 0xdeadbeef, 0); + break; + case 7: + PostMessageA(hedit, WM_KEYDOWN, VK_RETURN, 0x1c0001); + PostMessageA(hedit, WM_CHAR, VK_RETURN, 0x1c0001); + PostMessageA(hdlg, WM_USER, 0xdeadbeef, 1); + break; + case 8: + PostMessageA(hedit, WM_KEYDOWN, VK_TAB, 0xf0001); + PostMessageA(hedit, WM_CHAR, VK_TAB, 0xf0001); + PostMessageA(hdlg, WM_USER, 0xdeadbeef, 1); + break; + + /* multiple tab tests */ + case 9: + PostMessageA(hedit, WM_KEYDOWN, VK_TAB, 0xf0001); + PostMessageA(hedit, WM_KEYDOWN, VK_TAB, 0xf0001); + PostMessageA(hdlg, WM_USER, 0xdeadbeef, 2); + break; + case 10: + PostMessageA(hedit, WM_KEYDOWN, VK_TAB, 0xf0001); + PostMessageA(hedit, WM_KEYDOWN, VK_TAB, 0xf0001); + PostMessageA(hedit, WM_KEYDOWN, VK_TAB, 0xf0001); + PostMessageA(hdlg, WM_USER, 0xdeadbeef, 2); + break; + + default: + break; + } + break; + } + + case WM_COMMAND: + if (HIWORD(wparam) != BN_CLICKED) + break; + + switch (LOWORD(wparam)) + { + case IDOK: + EndDialog(hdlg, 111); + break; + + case IDCANCEL: + EndDialog(hdlg, 222); + break; + + default: + break; + } + break; + + case WM_USER: + { + int len; + HWND hok = GetDlgItem(hdlg, IDOK); + HWND hcancel = GetDlgItem(hdlg, IDCANCEL); + HWND hedit = GetDlgItem(hdlg, 1000); + HWND hfocus = GetFocus(); + + if (wparam != 0xdeadbeef) + break; + + switch (lparam) + { + case 0: + len = SendMessageA(hedit, WM_GETTEXTLENGTH, 0, 0); + if (len == 0) + EndDialog(hdlg, 444); + else + EndDialog(hdlg, 555); + break; + + case 1: + len = SendMessageA(hedit, WM_GETTEXTLENGTH, 0, 0); + if ((hfocus == hok) && len == 0) + EndDialog(hdlg, 444); + else + EndDialog(hdlg, 555); + break; + + case 2: + if (hfocus == hok) + EndDialog(hdlg, 11); + else if (hfocus == hcancel) + EndDialog(hdlg, 22); + else if (hfocus == hedit) + EndDialog(hdlg, 33); + else + EndDialog(hdlg, 44); + break; + + default: + EndDialog(hdlg, 555); + } + break; + } + + case WM_CLOSE: + EndDialog(hdlg, 333); + break; + + default: + break; + } + + return FALSE; +} + +static INT_PTR CALLBACK edit_singleline_dialog_proc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) +{ + switch (msg) + { + case WM_INITDIALOG: + { + HWND hedit = GetDlgItem(hdlg, 1000); + SetFocus(hedit); + switch (lparam) + { + /* test cases for WM_KEYDOWN */ + case 0: + PostMessageA(hedit, WM_KEYDOWN, VK_ESCAPE, 0x10001); + break; + case 1: + PostMessageA(hedit, WM_KEYDOWN, VK_RETURN, 0x1c0001); + break; + case 2: + PostMessageA(hedit, WM_KEYDOWN, VK_TAB, 0xf0001); + PostMessageA(hdlg, WM_USER, 0xdeadbeef, 1); + break; + + /* test cases for WM_CHAR */ + case 3: + PostMessageA(hedit, WM_CHAR, VK_ESCAPE, 0x10001); + PostMessageA(hdlg, WM_USER, 0xdeadbeef, 0); + break; + case 4: + PostMessageA(hedit, WM_CHAR, VK_RETURN, 0x1c0001); + PostMessageA(hdlg, WM_USER, 0xdeadbeef, 0); + break; + case 5: + PostMessageA(hedit, WM_CHAR, VK_TAB, 0xf0001); + PostMessageA(hdlg, WM_USER, 0xdeadbeef, 0); + break; + + /* test cases for WM_KEYDOWN + WM_CHAR */ + case 6: + PostMessageA(hedit, WM_KEYDOWN, VK_ESCAPE, 0x10001); + PostMessageA(hedit, WM_CHAR, VK_ESCAPE, 0x10001); + break; + case 7: + PostMessageA(hedit, WM_KEYDOWN, VK_RETURN, 0x1c0001); + PostMessageA(hedit, WM_CHAR, VK_RETURN, 0x1c0001); + break; + case 8: + PostMessageA(hedit, WM_KEYDOWN, VK_TAB, 0xf0001); + PostMessageA(hedit, WM_CHAR, VK_TAB, 0xf0001); + PostMessageA(hdlg, WM_USER, 0xdeadbeef, 1); + break; + + default: + break; + } + break; + } + + case WM_COMMAND: + if (HIWORD(wparam) != BN_CLICKED) + break; + + switch (LOWORD(wparam)) + { + case IDOK: + EndDialog(hdlg, 111); + break; + + case IDCANCEL: + EndDialog(hdlg, 222); + break; + + default: + break; + } + break; + + case WM_USER: + { + HWND hok = GetDlgItem(hdlg, IDOK); + HWND hedit = GetDlgItem(hdlg, 1000); + HWND hfocus = GetFocus(); + int len = SendMessageA(hedit, WM_GETTEXTLENGTH, 0, 0); + + if (wparam != 0xdeadbeef) + break; + + switch (lparam) + { + case 0: + if ((hfocus == hedit) && len == 0) + EndDialog(hdlg, 444); + else + EndDialog(hdlg, 555); + break; + + case 1: + if ((hfocus == hok) && len == 0) + EndDialog(hdlg, 444); + else + EndDialog(hdlg, 555); + break; + + default: + EndDialog(hdlg, 55); + } + break; + } + + case WM_CLOSE: + EndDialog(hdlg, 333); + break; + + default: + break; + } + + return FALSE; +} + +static INT_PTR CALLBACK edit_wantreturn_dialog_proc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) +{ + switch (msg) + { + case WM_INITDIALOG: + { + HWND hedit = GetDlgItem(hdlg, 1000); + SetFocus(hedit); + switch (lparam) + { + /* test cases for WM_KEYDOWN */ + case 0: + PostMessageA(hedit, WM_KEYDOWN, VK_ESCAPE, 0x10001); + break; + case 1: + PostMessageA(hedit, WM_KEYDOWN, VK_RETURN, 0x1c0001); + PostMessageA(hdlg, WM_USER, 0xdeadbeef, 0); + break; + case 2: + PostMessageA(hedit, WM_KEYDOWN, VK_TAB, 0xf0001); + PostMessageA(hdlg, WM_USER, 0xdeadbeef, 1); + break; + + /* test cases for WM_CHAR */ + case 3: + PostMessageA(hedit, WM_CHAR, VK_ESCAPE, 0x10001); + PostMessageA(hdlg, WM_USER, 0xdeadbeef, 0); + break; + case 4: + PostMessageA(hedit, WM_CHAR, VK_RETURN, 0x1c0001); + PostMessageA(hdlg, WM_USER, 0xdeadbeef, 2); + break; + case 5: + PostMessageA(hedit, WM_CHAR, VK_TAB, 0xf0001); + PostMessageA(hdlg, WM_USER, 0xdeadbeef, 0); + break; + + /* test cases for WM_KEYDOWN + WM_CHAR */ + case 6: + PostMessageA(hedit, WM_KEYDOWN, VK_ESCAPE, 0x10001); + PostMessageA(hedit, WM_CHAR, VK_ESCAPE, 0x10001); + PostMessageA(hdlg, WM_USER, 0xdeadbeef, 0); + break; + case 7: + PostMessageA(hedit, WM_KEYDOWN, VK_RETURN, 0x1c0001); + PostMessageA(hedit, WM_CHAR, VK_RETURN, 0x1c0001); + PostMessageA(hdlg, WM_USER, 0xdeadbeef, 2); + break; + case 8: + PostMessageA(hedit, WM_KEYDOWN, VK_TAB, 0xf0001); + PostMessageA(hedit, WM_CHAR, VK_TAB, 0xf0001); + PostMessageA(hdlg, WM_USER, 0xdeadbeef, 1); + break; + + default: + break; + } + break; + } + + case WM_COMMAND: + if (HIWORD(wparam) != BN_CLICKED) + break; + + switch (LOWORD(wparam)) + { + case IDOK: + EndDialog(hdlg, 111); + break; + + case IDCANCEL: + EndDialog(hdlg, 222); + break; + + default: + break; + } + break; + + case WM_USER: + { + HWND hok = GetDlgItem(hdlg, IDOK); + HWND hedit = GetDlgItem(hdlg, 1000); + HWND hfocus = GetFocus(); + int len = SendMessageA(hedit, WM_GETTEXTLENGTH, 0, 0); + + if (wparam != 0xdeadbeef) + break; + + switch (lparam) + { + case 0: + if ((hfocus == hedit) && len == 0) + EndDialog(hdlg, 444); + else + EndDialog(hdlg, 555); + break; + + case 1: + if ((hfocus == hok) && len == 0) + EndDialog(hdlg, 444); + else + EndDialog(hdlg, 555); + break; + + case 2: + if ((hfocus == hedit) && len == 2) + EndDialog(hdlg, 444); + else + EndDialog(hdlg, 555); + break; + + default: + EndDialog(hdlg, 55); + } + break; + } + + case WM_CLOSE: + EndDialog(hdlg, 333); + break; + + default: + break; + } + + return FALSE; +} + +static HINSTANCE hinst; +static HWND hwndET2; +static const char szEditTest2Class[] = "EditTest2Class"; +static const char szEditTest3Class[] = "EditTest3Class"; +static const char szEditTest4Class[] = "EditTest4Class"; +static const char szEditTextPositionClass[] = "EditTextPositionWindowClass"; + +static HWND create_editcontrol (DWORD style, DWORD exstyle) +{ + HWND handle; + + handle = CreateWindowExA(exstyle, + "EDIT", + "Test Text", + style, + 10, 10, 300, 300, + NULL, NULL, hinst, NULL); + ok (handle != NULL, "CreateWindow EDIT Control failed\n"); + assert (handle); + if (winetest_interactive) + ShowWindow (handle, SW_SHOW); + return handle; +} + +static HWND create_child_editcontrol (DWORD style, DWORD exstyle) +{ + HWND parentWnd; + HWND editWnd; + RECT rect; + BOOL b; + SetRect(&rect, 0, 0, 300, 300); + b = AdjustWindowRect(&rect, WS_OVERLAPPEDWINDOW, FALSE); + ok(b, "AdjustWindowRect failed\n"); + + parentWnd = CreateWindowExA(0, + szEditTextPositionClass, + "Edit Test", + WS_OVERLAPPEDWINDOW, + CW_USEDEFAULT, CW_USEDEFAULT, + rect.right - rect.left, rect.bottom - rect.top, + NULL, NULL, hinst, NULL); + ok (parentWnd != NULL, "CreateWindow EDIT Test failed\n"); + assert(parentWnd); + + editWnd = CreateWindowExA(exstyle, + "EDIT", + "Test Text", + WS_CHILD | style, + 0, 0, 300, 300, + parentWnd, NULL, hinst, NULL); + ok (editWnd != NULL, "CreateWindow EDIT Test Text failed\n"); + assert(editWnd); + if (winetest_interactive) + ShowWindow (parentWnd, SW_SHOW); + return editWnd; +} + +static void destroy_child_editcontrol (HWND hwndEdit) +{ + if (GetParent(hwndEdit)) + DestroyWindow(GetParent(hwndEdit)); + else { + trace("Edit control has no parent!\n"); + DestroyWindow(hwndEdit); + } +} + +static LONG get_edit_style (HWND hwnd) +{ + return GetWindowLongA( hwnd, GWL_STYLE ) & ( + ES_LEFT | +/* FIXME: not implemented + ES_CENTER | + ES_RIGHT | + ES_OEMCONVERT | +*/ + ES_MULTILINE | + ES_UPPERCASE | + ES_LOWERCASE | + ES_PASSWORD | + ES_AUTOVSCROLL | + ES_AUTOHSCROLL | + ES_NOHIDESEL | + ES_COMBO | + ES_READONLY | + ES_WANTRETURN | + ES_NUMBER + ); +} + +static void set_client_height(HWND Wnd, unsigned Height) +{ + RECT ClientRect, WindowRect; + + GetWindowRect(Wnd, &WindowRect); + GetClientRect(Wnd, &ClientRect); + SetWindowPos(Wnd, NULL, 0, 0, + WindowRect.right - WindowRect.left, + Height + (WindowRect.bottom - WindowRect.top) - + (ClientRect.bottom - ClientRect.top), + SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOZORDER); + + /* Workaround for a bug in Windows' edit control + (multi-line mode) */ + GetWindowRect(Wnd, &WindowRect); + SetWindowPos(Wnd, NULL, 0, 0, + WindowRect.right - WindowRect.left + 1, + WindowRect.bottom - WindowRect.top + 1, + SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOZORDER); + SetWindowPos(Wnd, NULL, 0, 0, + WindowRect.right - WindowRect.left, + WindowRect.bottom - WindowRect.top, + SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOZORDER); + + GetClientRect(Wnd, &ClientRect); + ok(ClientRect.bottom - ClientRect.top == Height, + "The client height should be %d, but is %d\n", + Height, ClientRect.bottom - ClientRect.top); +} + +static void test_edit_control_1(void) +{ + HWND hwEdit; + MSG msMessage; + int i; + LONG r; + + msMessage.message = WM_KEYDOWN; + + trace("EDIT: Single line\n"); + hwEdit = create_editcontrol(ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); + r = get_edit_style(hwEdit); + ok(r == (ES_AUTOVSCROLL | ES_AUTOHSCROLL), "Wrong style expected 0xc0 got: 0x%x\n", r); + for (i = 0; i < 65535; i++) + { + msMessage.wParam = i; + r = SendMessageA(hwEdit, WM_GETDLGCODE, 0, (LPARAM) &msMessage); + ok(r == (DLGC_WANTCHARS | DLGC_HASSETSEL | DLGC_WANTARROWS), + "Expected DLGC_WANTCHARS | DLGC_HASSETSEL | DLGC_WANTARROWS got %x\n", r); + } + DestroyWindow(hwEdit); + + trace("EDIT: Single line want returns\n"); + hwEdit = create_editcontrol(ES_WANTRETURN | ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); + r = get_edit_style(hwEdit); + ok(r == (ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_WANTRETURN), "Wrong style expected 0x10c0 got: 0x%x\n", r); + for (i = 0; i < 65535; i++) + { + msMessage.wParam = i; + r = SendMessageA(hwEdit, WM_GETDLGCODE, 0, (LPARAM) &msMessage); + ok(r == (DLGC_WANTCHARS | DLGC_HASSETSEL | DLGC_WANTARROWS), + "Expected DLGC_WANTCHARS | DLGC_HASSETSEL | DLGC_WANTARROWS got %x\n", r); + } + DestroyWindow(hwEdit); + + trace("EDIT: Multiline line\n"); + hwEdit = create_editcontrol(ES_MULTILINE | WS_VSCROLL | ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); + r = get_edit_style(hwEdit); + ok(r == (ES_AUTOHSCROLL | ES_AUTOVSCROLL | ES_MULTILINE), "Wrong style expected 0xc4 got: 0x%x\n", r); + for (i = 0; i < 65535; i++) + { + msMessage.wParam = i; + r = SendMessageA(hwEdit, WM_GETDLGCODE, 0, (LPARAM) &msMessage); + ok(r == (DLGC_WANTCHARS | DLGC_HASSETSEL | DLGC_WANTALLKEYS | DLGC_WANTARROWS), + "Expected DLGC_WANTCHARS | DLGC_HASSETSEL | DLGC_WANTALLKEYS | DLGC_WANTARROWS got %x\n", r); + } + DestroyWindow(hwEdit); + + trace("EDIT: Multi line want returns\n"); + hwEdit = create_editcontrol(ES_MULTILINE | WS_VSCROLL | ES_WANTRETURN | ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); + r = get_edit_style(hwEdit); + ok(r == (ES_WANTRETURN | ES_AUTOHSCROLL | ES_AUTOVSCROLL | ES_MULTILINE), "Wrong style expected 0x10c4 got: 0x%x\n", r); + for (i = 0; i < 65535; i++) + { + msMessage.wParam = i; + r = SendMessageA(hwEdit, WM_GETDLGCODE, 0, (LPARAM) &msMessage); + ok(r == (DLGC_WANTCHARS | DLGC_HASSETSEL | DLGC_WANTALLKEYS | DLGC_WANTARROWS), + "Expected DLGC_WANTCHARS | DLGC_HASSETSEL | DLGC_WANTALLKEYS | DLGC_WANTARROWS got %x\n", r); + } + DestroyWindow(hwEdit); +} + +/* WM_SETTEXT is implemented by selecting all text, and then replacing the + * selection. This test checks that the first 'select all' doesn't generate + * an UPDATE message which can escape and (via a handler) change the + * selection, which would cause WM_SETTEXT to break. This old bug + * was fixed 18-Mar-2005; we check here to ensure it doesn't regress. + */ +static void test_edit_control_2(void) +{ + HWND hwndMain, phwnd; + char szLocalString[MAXLEN]; + LONG r, w = 150, h = 50; + POINT cpos; + + /* Create main and edit windows. */ + hwndMain = CreateWindowA(szEditTest2Class, "ET2", WS_OVERLAPPEDWINDOW, + 0, 0, 200, 200, NULL, NULL, hinst, NULL); + assert(hwndMain); + if (winetest_interactive) + ShowWindow (hwndMain, SW_SHOW); + + hwndET2 = CreateWindowA("EDIT", NULL, + WS_CHILD|WS_BORDER|ES_LEFT|ES_AUTOHSCROLL, + 0, 0, w, h, /* important this not be 0 size. */ + hwndMain, (HMENU) ID_EDITTEST2, hinst, NULL); + assert(hwndET2); + if (winetest_interactive) + ShowWindow (hwndET2, SW_SHOW); + + trace("EDIT: SETTEXT atomicity\n"); + /* Send messages to "type" in the word 'foo'. */ + r = SendMessageA(hwndET2, WM_CHAR, 'f', 1); + ok(1 == r, "Expected: %d, got: %d\n", 1, r); + r = SendMessageA(hwndET2, WM_CHAR, 'o', 1); + ok(1 == r, "Expected: %d, got: %d\n", 1, r); + r = SendMessageA(hwndET2, WM_CHAR, 'o', 1); + ok(1 == r, "Expected: %d, got: %d\n", 1, r); + /* 'foo' should have been changed to 'bar' by the UPDATE handler. */ + GetWindowTextA(hwndET2, szLocalString, MAXLEN); + ok(strcmp(szLocalString, "bar")==0, + "Wrong contents of edit: %s\n", szLocalString); + + /* try setting the caret before it's visible */ + r = SetCaretPos(0, 0); + todo_wine ok(0 == r, "SetCaretPos succeeded unexpectedly, expected: 0, got: %d\n", r); + phwnd = SetFocus(hwndET2); + ok(phwnd != NULL, "SetFocus failed unexpectedly, expected non-zero, got NULL\n"); + r = SetCaretPos(0, 0); + ok(1 == r, "SetCaretPos failed unexpectedly, expected: 1, got: %d\n", r); + r = GetCaretPos(&cpos); + ok(1 == r, "GetCaretPos failed unexpectedly, expected: 1, got: %d\n", r); + ok(cpos.x == 0 && cpos.y == 0, "Wrong caret position, expected: (0,0), got: (%d,%d)\n", cpos.x, cpos.y); + r = SetCaretPos(-1, -1); + ok(1 == r, "SetCaretPos failed unexpectedly, expected: 1, got: %d\n", r); + r = GetCaretPos(&cpos); + ok(1 == r, "GetCaretPos failed unexpectedly, expected: 1, got: %d\n", r); + ok(cpos.x == -1 && cpos.y == -1, "Wrong caret position, expected: (-1,-1), got: (%d,%d)\n", cpos.x, cpos.y); + r = SetCaretPos(w << 1, h << 1); + ok(1 == r, "SetCaretPos failed unexpectedly, expected: 1, got: %d\n", r); + r = GetCaretPos(&cpos); + ok(1 == r, "GetCaretPos failed unexpectedly, expected: 1, got: %d\n", r); + ok(cpos.x == (w << 1) && cpos.y == (h << 1), "Wrong caret position, expected: (%d,%d), got: (%d,%d)\n", w << 1, h << 1, cpos.x, cpos.y); + r = SetCaretPos(w, h); + ok(1 == r, "SetCaretPos failed unexpectedly, expected: 1, got: %d\n", r); + r = GetCaretPos(&cpos); + ok(1 == r, "GetCaretPos failed unexpectedly, expected: 1, got: %d\n", r); + ok(cpos.x == w && cpos.y == h, "Wrong caret position, expected: (%d,%d), got: (%d,%d)\n", w, h, cpos.x, cpos.y); + r = SetCaretPos(w - 1, h - 1); + ok(1 == r, "SetCaretPos failed unexpectedly, expected: 1, got: %d\n", r); + r = GetCaretPos(&cpos); + ok(1 == r, "GetCaretPos failed unexpectedly, expected: 1, got: %d\n", r); + ok(cpos.x == (w - 1) && cpos.y == (h - 1), "Wrong caret position, expected: (%d,%d), got: (%d,%d)\n", w - 1, h - 1, cpos.x, cpos.y); + + DestroyWindow(hwndET2); + DestroyWindow(hwndMain); +} + +static void ET2_check_change(void) +{ + char szLocalString[MAXLEN]; + /* This EN_UPDATE handler changes any 'foo' to 'bar'. */ + GetWindowTextA(hwndET2, szLocalString, MAXLEN); + if (!strcmp(szLocalString, "foo")) + { + strcpy(szLocalString, "bar"); + SendMessageA(hwndET2, WM_SETTEXT, 0, (LPARAM)szLocalString); + } + /* always leave the cursor at the end. */ + SendMessageA(hwndET2, EM_SETSEL, MAXLEN - 1, MAXLEN - 1); +} + +static void ET2_OnCommand(HWND hwnd, int id, HWND hwndCtl, UINT codeNotify) +{ + if (id == ID_EDITTEST2 && codeNotify == EN_UPDATE) + ET2_check_change(); +} + +static LRESULT CALLBACK ET2_WndProc(HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam) +{ + switch (iMsg) + { + case WM_COMMAND: + ET2_OnCommand(hwnd, LOWORD(wParam), (HWND)lParam, HIWORD(wParam)); + break; + } + return DefWindowProcA(hwnd, iMsg, wParam, lParam); +} + +static void zero_notify(void) +{ + notifications.en_change = 0; + notifications.en_maxtext = 0; + notifications.en_update = 0; +} + +#define test_notify(enchange, enmaxtext, enupdate) \ +do { \ + ok(notifications.en_change == enchange, "expected %d EN_CHANGE notifications, " \ + "got %d\n", enchange, notifications.en_change); \ + ok(notifications.en_maxtext == enmaxtext, "expected %d EN_MAXTEXT notifications, " \ + "got %d\n", enmaxtext, notifications.en_maxtext); \ + ok(notifications.en_update == enupdate, "expected %d EN_UPDATE notifications, " \ + "got %d\n", enupdate, notifications.en_update); \ +} while(0) + +static LRESULT CALLBACK edit3_wnd_procA(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + switch (msg) + { + case WM_COMMAND: + switch (HIWORD(wParam)) + { + case EN_MAXTEXT: + notifications.en_maxtext++; + break; + case EN_UPDATE: + notifications.en_update++; + break; + case EN_CHANGE: + notifications.en_change++; + break; + } + break; + } + return DefWindowProcA(hWnd, msg, wParam, lParam); +} + +/* Test behaviour of WM_SETTEXT, WM_REPLACESEL and notifications sent in response + * to these messages. + */ +static void test_edit_control_3(void) +{ + static const char *str = "this is a long string."; + static const char *str2 = "this is a long string.\r\nthis is a long string.\r\nthis is a long string.\r\nthis is a long string."; + HWND hWnd, hParent; + int len, dpi; + HDC hDC; + + hDC = GetDC(NULL); + dpi = GetDeviceCaps(hDC, LOGPIXELSY); + ReleaseDC(NULL, hDC); + + trace("EDIT: Test notifications\n"); + + hParent = CreateWindowExA(0, + szEditTest3Class, + NULL, + 0, + CW_USEDEFAULT, CW_USEDEFAULT, 10, 10, + NULL, NULL, NULL, NULL); + assert(hParent); + + trace("EDIT: Single line, no ES_AUTOHSCROLL\n"); + hWnd = CreateWindowExA(0, + "EDIT", + NULL, + 0, + 10, 10, 50, 50, + hParent, NULL, NULL, NULL); + assert(hWnd); + + zero_notify(); + SendMessageA(hWnd, EM_REPLACESEL, 0, (LPARAM)str); + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + if (len == lstrlenA(str)) /* Win 8 */ + test_notify(1, 0, 1); + else + test_notify(1, 1, 1); + + SendMessageA(hWnd, WM_SETTEXT, 0, (LPARAM)""); + zero_notify(); + SendMessageA(hWnd, EM_REPLACESEL, 0, (LPARAM)"a"); + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + ok(1 == len, "wrong text length, expected 1, got %d\n", len); + test_notify(1, 0, 1); + + zero_notify(); + SendMessageA(hWnd, WM_SETTEXT, 0, (LPARAM)str); + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + ok(lstrlenA(str) == len, "text shouldn't have been truncated\n"); + test_notify(1, 0, 1); + + len = SendMessageA(hWnd, EM_GETSEL, 0, 0); + ok(LOWORD(len)==0, "Unexpected start position for selection %d\n", LOWORD(len)); + ok(HIWORD(len)==0, "Unexpected end position for selection %d\n", HIWORD(len)); + SendMessageA(hParent, WM_SETFOCUS, 0, (LPARAM)hWnd); + len = SendMessageA(hWnd, EM_GETSEL, 0, 0); + ok(LOWORD(len)==0, "Unexpected start position for selection %d\n", LOWORD(len)); + ok(HIWORD(len)==0, "Unexpected end position for selection %d\n", HIWORD(len)); + + SendMessageA(hWnd, EM_SETLIMITTEXT, 5, 0); + + SendMessageA(hWnd, WM_SETTEXT, 0, (LPARAM)""); + zero_notify(); + SendMessageA(hWnd, EM_REPLACESEL, 0, (LPARAM)str); + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + ok(5 == len, "text should have been truncated to limit, expected 5, got %d\n", len); + test_notify(1, 1, 1); + + zero_notify(); + SendMessageA(hWnd, WM_SETTEXT, 0, (LPARAM)str); + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + ok(lstrlenA(str) == len, "text shouldn't have been truncated\n"); + test_notify(1, 0, 1); + + DestroyWindow(hWnd); + + trace("EDIT: Single line, ES_AUTOHSCROLL\n"); + hWnd = CreateWindowExA(0, + "EDIT", + NULL, + ES_AUTOHSCROLL, + 10, 10, 50, 50, + hParent, NULL, NULL, NULL); + assert(hWnd); + + zero_notify(); + SendMessageA(hWnd, EM_REPLACESEL, 0, (LPARAM)str); + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + ok(lstrlenA(str) == len, "text shouldn't have been truncated\n"); + test_notify(1, 0, 1); + + zero_notify(); + SendMessageA(hWnd, WM_SETTEXT, 0, (LPARAM)str); + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + ok(lstrlenA(str) == len, "text shouldn't have been truncated\n"); + test_notify(1, 0, 1); + + SendMessageA(hWnd, WM_SETTEXT, 0, (LPARAM)""); + zero_notify(); + SendMessageA(hWnd, EM_REPLACESEL, 0, (LPARAM)str2); + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + ok(lstrlenA(str2) == len, "text shouldn't have been truncated\n"); + test_notify(1, 0, 1); + + zero_notify(); + SendMessageA(hWnd, WM_SETTEXT, 0, (LPARAM)str2); + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + ok(lstrlenA(str2) == len, "text shouldn't have been truncated\n"); + test_notify(1, 0, 1); + + SendMessageA(hWnd, EM_SETLIMITTEXT, 5, 0); + + SendMessageA(hWnd, WM_SETTEXT, 0, (LPARAM)""); + zero_notify(); + SendMessageA(hWnd, EM_REPLACESEL, 0, (LPARAM)str); + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + ok(5 == len, "text should have been truncated to limit, expected 5, got %d\n", len); + test_notify(1, 1, 1); + + zero_notify(); + SendMessageA(hWnd, WM_SETTEXT, 0, (LPARAM)str); + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + ok(lstrlenA(str) == len, "text shouldn't have been truncated\n"); + test_notify(1, 0, 1); + + DestroyWindow(hWnd); + + trace("EDIT: Multline, no ES_AUTOHSCROLL, no ES_AUTOVSCROLL\n"); + hWnd = CreateWindowExA(0, + "EDIT", + NULL, + ES_MULTILINE, + 10, 10, (50 * dpi) / 96, (50 * dpi) / 96, + hParent, NULL, NULL, NULL); + assert(hWnd); + + zero_notify(); + SendMessageA(hWnd, EM_REPLACESEL, 0, (LPARAM)str); + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + if (len == lstrlenA(str)) /* Win 8 */ + test_notify(1, 0, 1); + else + { + ok(0 == len, "text should have been truncated, expected 0, got %d\n", len); + test_notify(1, 1, 1); + } + + SendMessageA(hWnd, WM_SETTEXT, 0, (LPARAM)""); + zero_notify(); + SendMessageA(hWnd, EM_REPLACESEL, 0, (LPARAM)"a"); + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + ok(1 == SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0), "wrong text length, expected 1, got %d\n", len); + test_notify(1, 0, 1); + + zero_notify(); + SendMessageA(hWnd, WM_SETTEXT, 0, (LPARAM)str); + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + ok(lstrlenA(str) == len, "text shouldn't have been truncated\n"); + test_notify(0, 0, 0); + + SendMessageA(hWnd, EM_SETLIMITTEXT, 5, 0); + + SendMessageA(hWnd, WM_SETTEXT, 0, (LPARAM)""); + zero_notify(); + SendMessageA(hWnd, EM_REPLACESEL, 0, (LPARAM)str); + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + ok(5 == len, "text should have been truncated to limit, expected 5, got %d\n", len); + test_notify(1, 1, 1); + + zero_notify(); + SendMessageA(hWnd, WM_SETTEXT, 0, (LPARAM)str); + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + ok(lstrlenA(str) == len, "text shouldn't have been truncated\n"); + test_notify(0, 0, 0); + + DestroyWindow(hWnd); + + trace("EDIT: Multline, ES_AUTOHSCROLL, no ES_AUTOVSCROLL\n"); + hWnd = CreateWindowExA(0, + "EDIT", + NULL, + ES_MULTILINE | ES_AUTOHSCROLL, + 10, 10, (50 * dpi) / 96, (50 * dpi) / 96, + hParent, NULL, NULL, NULL); + assert(hWnd); + + zero_notify(); + SendMessageA(hWnd, EM_REPLACESEL, 0, (LPARAM)str2); + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + ok(0 == len, "text should have been truncated, expected 0, got %d\n", len); + test_notify(1, 1, 1); + + SendMessageA(hWnd, WM_SETTEXT, 0, (LPARAM)""); + zero_notify(); + SendMessageA(hWnd, EM_REPLACESEL, 0, (LPARAM)"a"); + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + ok(1 == SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0), "wrong text length, expected 1, got %d\n", len); + test_notify(1, 0, 1); + + zero_notify(); + SendMessageA(hWnd, WM_SETTEXT, 0, (LPARAM)str2); + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + ok(lstrlenA(str2) == len, "text shouldn't have been truncated\n"); + test_notify(0, 0, 0); + + SendMessageA(hWnd, EM_SETLIMITTEXT, 5, 0); + + SendMessageA(hWnd, WM_SETTEXT, 0, (LPARAM)""); + zero_notify(); + SendMessageA(hWnd, EM_REPLACESEL, 0, (LPARAM)str2); + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + ok(5 == len, "text should have been truncated to limit, expected 5, got %d\n", len); + test_notify(1, 1, 1); + + zero_notify(); + SendMessageA(hWnd, WM_SETTEXT, 0, (LPARAM)str2); + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + ok(lstrlenA(str2) == len, "text shouldn't have been truncated\n"); + test_notify(0, 0, 0); + + DestroyWindow(hWnd); + + trace("EDIT: Multline, ES_AUTOHSCROLL and ES_AUTOVSCROLL\n"); + hWnd = CreateWindowExA(0, + "EDIT", + NULL, + ES_MULTILINE | ES_AUTOHSCROLL | ES_AUTOVSCROLL, + 10, 10, 50, 50, + hParent, NULL, NULL, NULL); + assert(hWnd); + + zero_notify(); + SendMessageA(hWnd, EM_REPLACESEL, 0, (LPARAM)str2); + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + ok(lstrlenA(str2) == len, "text shouldn't have been truncated\n"); + test_notify(1, 0, 1); + + zero_notify(); + SendMessageA(hWnd, WM_SETTEXT, 0, (LPARAM)str2); + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + ok(lstrlenA(str2) == len, "text shouldn't have been truncated\n"); + test_notify(0, 0, 0); + + SendMessageA(hWnd, EM_SETLIMITTEXT, 5, 0); + + SendMessageA(hWnd, WM_SETTEXT, 0, (LPARAM)""); + zero_notify(); + SendMessageA(hWnd, EM_REPLACESEL, 0, (LPARAM)str2); + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + ok(5 == len, "text should have been truncated to limit, expected 5, got %d\n", len); + test_notify(1, 1, 1); + + zero_notify(); + SendMessageA(hWnd, WM_SETTEXT, 0, (LPARAM)str2); + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + ok(lstrlenA(str2) == len, "text shouldn't have been truncated\n"); + test_notify(0, 0, 0); + + DestroyWindow(hWnd); +} + +static void test_char_from_pos(void) +{ + int lo, hi, mid, ret, i; + HWND hwEdit; + + hwEdit = create_editcontrol(ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); + SendMessageA(hwEdit, WM_SETTEXT, 0, (LPARAM)"aa"); + lo = LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 0, 0)); + hi = LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 1, 0)); + mid = lo + (hi - lo) / 2; + + for (i = lo; i < mid; i++) + { + ret = LOWORD(SendMessageA(hwEdit, EM_CHARFROMPOS, 0, i)); + ok(0 == ret, "expected 0 got %d\n", ret); + } + + for (i = mid; i <= hi; i++) + { + ret = LOWORD(SendMessageA(hwEdit, EM_CHARFROMPOS, 0, i)); + ok(1 == ret, "expected 1 got %d\n", ret); + } + + ret = SendMessageA(hwEdit, EM_POSFROMCHAR, 2, 0); + ok(-1 == ret, "expected -1 got %d\n", ret); + DestroyWindow(hwEdit); + + hwEdit = create_editcontrol(ES_RIGHT | ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); + SendMessageA(hwEdit, WM_SETTEXT, 0, (LPARAM)"aa"); + lo = LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 0, 0)); + hi = LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 1, 0)); + mid = lo + (hi - lo) / 2; + + for (i = lo; i < mid; i++) + { + ret = LOWORD(SendMessageA(hwEdit, EM_CHARFROMPOS, 0, i)); + ok(0 == ret, "expected 0 got %d\n", ret); + } + + for (i = mid; i <= hi; i++) + { + ret = LOWORD(SendMessageA(hwEdit, EM_CHARFROMPOS, 0, i)); + ok(1 == ret, "expected 1 got %d\n", ret); + } + + ret = SendMessageA(hwEdit, EM_POSFROMCHAR, 2, 0); + ok(-1 == ret, "expected -1 got %d\n", ret); + DestroyWindow(hwEdit); + + hwEdit = create_editcontrol(ES_CENTER | ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); + SendMessageA(hwEdit, WM_SETTEXT, 0, (LPARAM)"aa"); + lo = LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 0, 0)); + hi = LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 1, 0)); + mid = lo + (hi - lo) / 2; + + for (i = lo; i < mid; i++) + { + ret = LOWORD(SendMessageA(hwEdit, EM_CHARFROMPOS, 0, i)); + ok(0 == ret, "expected 0 got %d\n", ret); + } + + for (i = mid; i <= hi; i++) + { + ret = LOWORD(SendMessageA(hwEdit, EM_CHARFROMPOS, 0, i)); + ok(1 == ret, "expected 1 got %d\n", ret); + } + + ret = SendMessageA(hwEdit, EM_POSFROMCHAR, 2, 0); + ok(-1 == ret, "expected -1 got %d\n", ret); + DestroyWindow(hwEdit); + + hwEdit = create_editcontrol(ES_MULTILINE | ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); + SendMessageA(hwEdit, WM_SETTEXT, 0, (LPARAM)"aa"); + lo = LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 0, 0)); + hi = LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 1, 0)); + mid = lo + (hi - lo) / 2 + 1; + + for (i = lo; i < mid; i++) + { + ret = LOWORD(SendMessageA(hwEdit, EM_CHARFROMPOS, 0, i)); + ok((0 == ret || 1 == ret /* Vista */), "expected 0 or 1 got %d\n", ret); + } + + for (i = mid; i <= hi; i++) + { + ret = LOWORD(SendMessageA(hwEdit, EM_CHARFROMPOS, 0, i)); + ok(1 == ret, "expected 1 got %d\n", ret); + } + + ret = SendMessageA(hwEdit, EM_POSFROMCHAR, 2, 0); + ok(-1 == ret, "expected -1 got %d\n", ret); + DestroyWindow(hwEdit); + + hwEdit = create_editcontrol(ES_MULTILINE | ES_RIGHT | ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); + SendMessageA(hwEdit, WM_SETTEXT, 0, (LPARAM)"aa"); + lo = LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 0, 0)); + hi = LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 1, 0)); + mid = lo + (hi - lo) / 2 + 1; + + for (i = lo; i < mid; i++) + { + ret = LOWORD(SendMessageA(hwEdit, EM_CHARFROMPOS, 0, i)); + ok((0 == ret || 1 == ret /* Vista */), "expected 0 or 1 got %d\n", ret); + } + + for (i = mid; i <= hi; i++) + { + ret = LOWORD(SendMessageA(hwEdit, EM_CHARFROMPOS, 0, i)); + ok(1 == ret, "expected 1 got %d\n", ret); + } + + ret = SendMessageA(hwEdit, EM_POSFROMCHAR, 2, 0); + ok(-1 == ret, "expected -1 got %d\n", ret); + DestroyWindow(hwEdit); + + hwEdit = create_editcontrol(ES_MULTILINE | ES_CENTER | ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); + SendMessageA(hwEdit, WM_SETTEXT, 0, (LPARAM)"aa"); + lo = LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 0, 0)); + hi = LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 1, 0)); + mid = lo + (hi - lo) / 2 + 1; + + for (i = lo; i < mid; i++) + { + ret = LOWORD(SendMessageA(hwEdit, EM_CHARFROMPOS, 0, i)); + ok((0 == ret || 1 == ret /* Vista */), "expected 0 or 1 got %d\n", ret); + } + + for (i = mid; i <= hi; i++) + { + ret = LOWORD(SendMessageA(hwEdit, EM_CHARFROMPOS, 0, i)); + ok(1 == ret, "expected 1 got %d\n", ret); + } + + ret = SendMessageA(hwEdit, EM_POSFROMCHAR, 2, 0); + ok(-1 == ret, "expected -1 got %d\n", ret); + DestroyWindow(hwEdit); +} + +/* Test if creating edit control without ES_AUTOHSCROLL and ES_AUTOVSCROLL + * truncates text that doesn't fit. + */ +static void test_edit_control_5(void) +{ + static const char *str = "test\r\ntest"; + HWND parentWnd; + HWND hWnd; + int len; + RECT rc1 = { 10, 10, 11, 11}; + RECT rc; + + /* first show that a non-child won't do for this test */ + hWnd = CreateWindowExA(0, + "EDIT", + str, + 0, + 10, 10, 1, 1, + NULL, NULL, NULL, NULL); + assert(hWnd); + /* size of non-child edit control is (much) bigger than requested */ + GetWindowRect( hWnd, &rc); + ok( rc.right - rc.left > 20, "size of the window (%d) is smaller than expected\n", + rc.right - rc.left); + DestroyWindow(hWnd); + /* so create a parent, and give it edit controls children to test with */ + parentWnd = CreateWindowExA(0, + szEditTextPositionClass, + "Edit Test", WS_VISIBLE | + WS_OVERLAPPEDWINDOW, + CW_USEDEFAULT, CW_USEDEFAULT, + 250, 250, + NULL, NULL, hinst, NULL); + assert(parentWnd); + ShowWindow( parentWnd, SW_SHOW); + /* single line */ + hWnd = CreateWindowExA(0, + "EDIT", + str, WS_VISIBLE | WS_BORDER | + WS_CHILD, + rc1.left, rc1.top, rc1.right - rc1.left, rc1.bottom - rc1.top, + parentWnd, NULL, NULL, NULL); + assert(hWnd); + GetClientRect( hWnd, &rc); + ok( rc.right == rc1.right - rc1.left && rc.bottom == rc1.bottom - rc1.top, + "Client rectangle not the expected size %s\n", wine_dbgstr_rect( &rc )); + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + ok(lstrlenA(str) == len, "text shouldn't have been truncated\n"); + DestroyWindow(hWnd); + /* multi line */ + hWnd = CreateWindowExA(0, + "EDIT", + str, + WS_CHILD | ES_MULTILINE, + rc1.left, rc1.top, rc1.right - rc1.left, rc1.bottom - rc1.top, + parentWnd, NULL, NULL, NULL); + assert(hWnd); + GetClientRect( hWnd, &rc); + ok( rc.right == rc1.right - rc1.left && rc.bottom == rc1.bottom - rc1.top, + "Client rectangle not the expected size %s\n", wine_dbgstr_rect( &rc )); + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + ok(lstrlenA(str) == len, "text shouldn't have been truncated\n"); + DestroyWindow(hWnd); + DestroyWindow(parentWnd); +} + +/* Test WM_GETTEXT processing + * after destroy messages + */ +static void test_edit_control_6(void) +{ + static const char *str = "test\r\ntest"; + char buf[MAXLEN]; + HWND hWnd; + LONG ret; + + hWnd = CreateWindowExA(0, "EDIT", "Test", 0, 10, 10, 1, 1, NULL, NULL, hinst, NULL); + ok(hWnd != NULL, "Failed to create edit control.\n"); + + ret = SendMessageA(hWnd, WM_SETTEXT, 0, (LPARAM)str); + ok(ret == TRUE, "Expected %d, got %d\n", TRUE, ret); + ret = SendMessageA(hWnd, WM_GETTEXT, MAXLEN, (LPARAM)buf); + ok(ret == strlen(str), "Expected %s, got len %d\n", str, ret); + ok(!strcmp(buf, str), "Expected %s, got %s\n", str, buf); + + buf[0] = 0; + ret = SendMessageA(hWnd, WM_DESTROY, 0, 0); +todo_wine + ok(ret == 1, "Unexpected return value %d\n", ret); + ret = SendMessageA(hWnd, WM_GETTEXT, MAXLEN, (LPARAM)buf); + ok(ret == strlen(str), "Expected %s, got len %d\n", str, ret); + ok(!strcmp(buf, str), "Expected %s, got %s\n", str, buf); + + buf[0] = 0; + ret = SendMessageA(hWnd, WM_NCDESTROY, 0, 0); + ok(ret == 0, "Expected 0, got %d\n", ret); + ret = SendMessageA(hWnd, WM_GETTEXT, MAXLEN, (LPARAM)buf); +todo_wine { + ok(ret == strlen("Test"), "Unexpected text length %d\n", ret); + ok(!strcmp(buf, "Test"), "Unexpected text %s\n", buf); +} + DestroyWindow(hWnd); +} + +static void test_edit_control_limittext(void) +{ + HWND hwEdit; + DWORD r; + + /* Test default limit for single-line control */ + trace("EDIT: buffer limit for single-line\n"); + hwEdit = create_editcontrol(ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); + r = SendMessageA(hwEdit, EM_GETLIMITTEXT, 0, 0); + ok(r == 30000, "Incorrect default text limit, expected 30000 got %u\n", r); + SendMessageA(hwEdit, EM_SETLIMITTEXT, 0, 0); + r = SendMessageA(hwEdit, EM_GETLIMITTEXT, 0, 0); + ok( r == 2147483646, "got limit %u (expected 2147483646)\n", r); + DestroyWindow(hwEdit); + + /* Test default limit for multi-line control */ + trace("EDIT: buffer limit for multi-line\n"); + hwEdit = create_editcontrol(ES_MULTILINE | WS_VSCROLL | ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); + r = SendMessageA(hwEdit, EM_GETLIMITTEXT, 0, 0); + ok(r == 30000, "Incorrect default text limit, expected 30000 got %u\n", r); + SendMessageA(hwEdit, EM_SETLIMITTEXT, 0, 0); + r = SendMessageA(hwEdit, EM_GETLIMITTEXT, 0, 0); + ok( r == 4294967295U, "got limit %u (expected 4294967295)\n", r); + DestroyWindow(hwEdit); +} + +/* Test EM_SCROLL */ +static void test_edit_control_scroll(void) +{ + static const char *single_line_str = "a"; + static const char *multiline_str = "Test\r\nText"; + HWND hwEdit; + LONG ret; + + /* Check the return value when EM_SCROLL doesn't scroll + * anything. Should not return true unless any lines were actually + * scrolled. */ + hwEdit = CreateWindowA( + "EDIT", + single_line_str, + WS_VSCROLL | ES_MULTILINE, + 1, 1, 100, 100, + NULL, NULL, hinst, NULL); + + assert(hwEdit); + + ret = SendMessageA(hwEdit, EM_SCROLL, SB_PAGEDOWN, 0); + ok(!ret, "Returned %x, expected 0.\n", ret); + + ret = SendMessageA(hwEdit, EM_SCROLL, SB_PAGEUP, 0); + ok(!ret, "Returned %x, expected 0.\n", ret); + + ret = SendMessageA(hwEdit, EM_SCROLL, SB_LINEUP, 0); + ok(!ret, "Returned %x, expected 0.\n", ret); + + ret = SendMessageA(hwEdit, EM_SCROLL, SB_LINEDOWN, 0); + ok(!ret, "Returned %x, expected 0.\n", ret); + + DestroyWindow (hwEdit); + + /* SB_PAGEDOWN while at the beginning of a buffer with few lines + should not cause EM_SCROLL to return a negative value of + scrolled lines that would put us "before" the beginning. */ + hwEdit = CreateWindowA( + "EDIT", + multiline_str, + WS_VSCROLL | ES_MULTILINE, + 0, 0, 100, 100, + NULL, NULL, hinst, NULL); + assert(hwEdit); + + ret = SendMessageA(hwEdit, EM_SCROLL, SB_PAGEDOWN, 0); + ok(!ret, "Returned %x, expected 0.\n", ret); + + DestroyWindow (hwEdit); +} + +static void test_margins_usefontinfo(UINT charset) +{ + INT margins, threshold, expect, empty_expect, small_expect; + HWND hwnd; + HDC hdc; + SIZE size; + BOOL cjk; + LOGFONTA lf; + HFONT hfont; + RECT rect; + + memset(&lf, 0, sizeof(lf)); + lf.lfHeight = -11; + lf.lfWeight = FW_NORMAL; + lf.lfCharSet = charset; + strcpy(lf.lfFaceName, "Tahoma"); + + hfont = CreateFontIndirectA(&lf); + ok(hfont != NULL, "got %p\n", hfont); + + /* Big window rectangle */ + hwnd = CreateWindowExA(0, "Edit", "A", WS_POPUP, 0, 0, 5000, 1000, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "got %p\n", hwnd); + GetClientRect(hwnd, &rect); + ok(!IsRectEmpty(&rect), "got rect %s\n", wine_dbgstr_rect(&rect)); + + hdc = GetDC(hwnd); + hfont = SelectObject(hdc, hfont); + size.cx = GdiGetCharDimensions( hdc, NULL, &size.cy ); + expect = MAKELONG(size.cx / 2, size.cx / 2); + small_expect = 0; + empty_expect = size.cx >= 28 ? small_expect : expect; + + charset = GetTextCharset(hdc); + switch (charset) + { + case SHIFTJIS_CHARSET: + case HANGUL_CHARSET: + case GB2312_CHARSET: + case CHINESEBIG5_CHARSET: + cjk = TRUE; + break; + default: + cjk = FALSE; + } + + hfont = SelectObject(hdc, hfont); + ReleaseDC(hwnd, hdc); + + margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); + ok(margins == 0, "got %x\n", margins); + SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, MAKELPARAM(TRUE, 0)); + margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); + if (!cjk) + ok(margins == expect, "%d: got %d, %d\n", charset, HIWORD(margins), LOWORD(margins)); + else + { + ok(HIWORD(margins) > 0 && LOWORD(margins) > 0, "%d: got %d, %d\n", charset, HIWORD(margins), LOWORD(margins)); + expect = empty_expect = small_expect = margins; + } + DestroyWindow(hwnd); + + threshold = (size.cx / 2 + size.cx) * 2; + + /* Size below which non-cjk margins are zero */ + hwnd = CreateWindowExA(0, "Edit", "A", WS_POPUP, 0, 0, threshold - 1, 100, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "got %p\n", hwnd); + GetClientRect(hwnd, &rect); + ok(!IsRectEmpty(&rect), "got rect %s\n", wine_dbgstr_rect(&rect)); + + margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); + ok(margins == 0, "got %x\n", margins); + + SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, MAKELPARAM(TRUE, 0)); + margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); + ok(margins == small_expect, "%d: got %d, %d\n", charset, HIWORD(margins), LOWORD(margins)); + DestroyWindow(hwnd); + + /* Size at which non-cjk margins become non-zero */ + hwnd = CreateWindowExA(0, "Edit", "A", WS_POPUP, 0, 0, threshold, 100, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "got %p\n", hwnd); + GetClientRect(hwnd, &rect); + ok(!IsRectEmpty(&rect), "got rect %s\n", wine_dbgstr_rect(&rect)); + + margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); + ok(margins == 0, "got %x\n", margins); + + SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, MAKELPARAM(TRUE, 0)); + margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); + ok(margins == expect, "%d: got %d, %d\n", charset, HIWORD(margins), LOWORD(margins)); + DestroyWindow(hwnd); + + /* Empty rect */ + hwnd = CreateWindowExA(0, "Edit", "A", WS_POPUP, 0, 0, 0, 0, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "got %p\n", hwnd); + GetClientRect(hwnd, &rect); + ok(IsRectEmpty(&rect), "got rect %s\n", wine_dbgstr_rect(&rect)); + + margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); + ok(margins == 0, "got %x\n", margins); + + SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, MAKELPARAM(TRUE, 0)); + margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); + ok(margins == empty_expect, "%d: got %d, %d\n", charset, HIWORD(margins), LOWORD(margins)); + DestroyWindow(hwnd); + + DeleteObject(hfont); +} + +static void test_margins(void) +{ + DWORD old_margins, new_margins; + RECT old_rect, new_rect; + INT old_right_margin; + HWND hwEdit; + + hwEdit = create_editcontrol(WS_BORDER | ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); + + old_margins = SendMessageA(hwEdit, EM_GETMARGINS, 0, 0); + old_right_margin = HIWORD(old_margins); + + /* Check if setting the margins works */ + + SendMessageA(hwEdit, EM_SETMARGINS, EC_LEFTMARGIN, MAKELONG(10, 0)); + new_margins = SendMessageA(hwEdit, EM_GETMARGINS, 0, 0); + ok(LOWORD(new_margins) == 10, "Wrong left margin: %d\n", LOWORD(new_margins)); + ok(HIWORD(new_margins) == old_right_margin, "Wrong right margin: %d\n", HIWORD(new_margins)); + + SendMessageA(hwEdit, EM_SETMARGINS, EC_RIGHTMARGIN, MAKELONG(0, 10)); + new_margins = SendMessageA(hwEdit, EM_GETMARGINS, 0, 0); + ok(LOWORD(new_margins) == 10, "Wrong left margin: %d\n", LOWORD(new_margins)); + ok(HIWORD(new_margins) == 10, "Wrong right margin: %d\n", HIWORD(new_margins)); + + /* The size of the rectangle must decrease if we increase the margin */ + + SendMessageA(hwEdit, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(5, 5)); + SendMessageA(hwEdit, EM_GETRECT, 0, (LPARAM)&old_rect); + SendMessageA(hwEdit, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(15, 20)); + SendMessageA(hwEdit, EM_GETRECT, 0, (LPARAM)&new_rect); + ok(new_rect.left == old_rect.left + 10, "The left border of the rectangle is wrong\n"); + ok(new_rect.right == old_rect.right - 15, "The right border of the rectangle is wrong\n"); + ok(new_rect.top == old_rect.top, "The top border of the rectangle must not change\n"); + ok(new_rect.bottom == old_rect.bottom, "The bottom border of the rectangle must not change\n"); + + /* If we set the margin to same value as the current margin, + the rectangle must not change */ + + SendMessageA(hwEdit, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(10, 10)); + SetRect(&old_rect, 1, 1, 99, 99); + SendMessageA(hwEdit, EM_SETRECT, 0, (LPARAM)&old_rect); + SendMessageA(hwEdit, EM_GETRECT, 0, (LPARAM)&old_rect); + SendMessageA(hwEdit, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(10, 10)); + SendMessageA(hwEdit, EM_GETRECT, 0, (LPARAM)&new_rect); + ok(EqualRect(&old_rect, &new_rect), "The border of the rectangle has changed\n"); + + /* The lParam argument of the WM_SIZE message should be ignored. */ + + SendMessageA(hwEdit, EM_GETRECT, 0, (LPARAM)&old_rect); + SendMessageA(hwEdit, WM_SIZE, SIZE_RESTORED, 0); + SendMessageA(hwEdit, EM_GETRECT, 0, (LPARAM)&new_rect); + ok(EqualRect(&old_rect, &new_rect), "The border of the rectangle has changed\n"); + SendMessageA(hwEdit, WM_SIZE, SIZE_MINIMIZED, 0); + SendMessageA(hwEdit, EM_GETRECT, 0, (LPARAM)&new_rect); + ok(EqualRect(&old_rect, &new_rect), "The border of the rectangle has changed\n"); + SendMessageA(hwEdit, WM_SIZE, SIZE_MAXIMIZED, 0); + SendMessageA(hwEdit, EM_GETRECT, 0, (LPARAM)&new_rect); + ok(EqualRect(&old_rect, &new_rect), "The border of the rectangle has changed\n"); + SendMessageA(hwEdit, WM_SIZE, SIZE_RESTORED, MAKELONG(10, 10)); + SendMessageA(hwEdit, EM_GETRECT, 0, (LPARAM)&new_rect); + ok(EqualRect(&old_rect, &new_rect), "The border of the rectangle has changed\n"); + + DestroyWindow (hwEdit); + + test_margins_usefontinfo(ANSI_CHARSET); + test_margins_usefontinfo(EASTEUROPE_CHARSET); + + test_margins_usefontinfo(SHIFTJIS_CHARSET); + test_margins_usefontinfo(HANGUL_CHARSET); + test_margins_usefontinfo(CHINESEBIG5_CHARSET); + /* Don't test JOHAB_CHARSET. Treated as CJK by Win 8, + but not by < Win 8 and Win 10. */ + + test_margins_usefontinfo(DEFAULT_CHARSET); +} + +static INT CALLBACK find_font_proc(const LOGFONTA *elf, const TEXTMETRICA *ntm, DWORD type, LPARAM lParam) +{ + return 0; +} + +static void test_margins_font_change(void) +{ + DWORD margins, font_margins, ret; + HFONT hfont, hfont2; + HWND hwEdit; + LOGFONTA lf; + HDC hdc; + + hdc = GetDC(0); + ret = EnumFontFamiliesA(hdc, "Arial", find_font_proc, 0); + ReleaseDC(0, hdc); + if (ret) + { + trace("Arial not found - skipping font change margin tests\n"); + return; + } + + hwEdit = create_child_editcontrol(0, 0); + + SetWindowPos(hwEdit, NULL, 10, 10, 1000, 100, SWP_NOZORDER | SWP_NOACTIVATE); + + memset(&lf, 0, sizeof(lf)); + strcpy(lf.lfFaceName, "Arial"); + lf.lfHeight = 16; + lf.lfCharSet = DEFAULT_CHARSET; + hfont = CreateFontIndirectA(&lf); + lf.lfHeight = 30; + hfont2 = CreateFontIndirectA(&lf); + + SendMessageA(hwEdit, WM_SETFONT, (WPARAM)hfont, 0); + font_margins = SendMessageA(hwEdit, EM_GETMARGINS, 0, 0); + ok(LOWORD(font_margins) != 0, "got %d\n", LOWORD(font_margins)); + ok(HIWORD(font_margins) != 0, "got %d\n", HIWORD(font_margins)); + + /* With 'small' edit controls, test that the margin doesn't get set */ + SetWindowPos(hwEdit, NULL, 10, 10, 16, 100, SWP_NOZORDER | SWP_NOACTIVATE); + SendMessageA(hwEdit, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(0,0)); + SendMessageA(hwEdit, WM_SETFONT, (WPARAM)hfont, 0); + margins = SendMessageA(hwEdit, EM_GETMARGINS, 0, 0); + ok(LOWORD(margins) == 0 || broken(LOWORD(margins) == LOWORD(font_margins)), /* win95 */ + "got %d\n", LOWORD(margins)); + ok(HIWORD(margins) == 0 || broken(HIWORD(margins) == HIWORD(font_margins)), /* win95 */ + "got %d\n", HIWORD(margins)); + + SendMessageA(hwEdit, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(1,0)); + SendMessageA(hwEdit, WM_SETFONT, (WPARAM)hfont, 0); + margins = SendMessageA(hwEdit, EM_GETMARGINS, 0, 0); + ok(LOWORD(margins) == 1 || broken(LOWORD(margins) == LOWORD(font_margins)), /* win95 */ + "got %d\n", LOWORD(margins)); + ok(HIWORD(margins) == 0 || broken(HIWORD(margins) == HIWORD(font_margins)), /* win95 */ + "got %d\n", HIWORD(margins)); + + SendMessageA(hwEdit, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(1,1)); + SendMessageA(hwEdit, WM_SETFONT, (WPARAM)hfont, 0); + margins = SendMessageA(hwEdit, EM_GETMARGINS, 0, 0); + ok(LOWORD(margins) == 1 || broken(LOWORD(margins) == LOWORD(font_margins)), /* win95 */ + "got %d\n", LOWORD(margins)); + ok(HIWORD(margins) == 1 || broken(HIWORD(margins) == HIWORD(font_margins)), /* win95 */ + "got %d\n", HIWORD(margins)); + + SendMessageA(hwEdit, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(EC_USEFONTINFO,EC_USEFONTINFO)); + margins = SendMessageA(hwEdit, EM_GETMARGINS, 0, 0); + ok(LOWORD(margins) == 1 || broken(LOWORD(margins) == LOWORD(font_margins)), /* win95 */ + "got %d\n", LOWORD(margins)); + ok(HIWORD(margins) == 1 || broken(HIWORD(margins) == HIWORD(font_margins)), /* win95 */ + "got %d\n", HIWORD(margins)); + + SendMessageA(hwEdit, WM_SETFONT, (WPARAM)hfont2, 0); + margins = SendMessageA(hwEdit, EM_GETMARGINS, 0, 0); + ok(LOWORD(margins) == 1 || broken(LOWORD(margins) != 1 && LOWORD(margins) != LOWORD(font_margins)), /* win95 */ + "got %d\n", LOWORD(margins)); + ok(HIWORD(margins) == 1 || broken(HIWORD(margins) != 1 && HIWORD(margins) != HIWORD(font_margins)), /* win95 */ + "got %d\n", HIWORD(margins)); + + /* Above a certain size threshold then the margin is updated */ + SetWindowPos(hwEdit, NULL, 10, 10, 1000, 100, SWP_NOZORDER | SWP_NOACTIVATE); + SendMessageA(hwEdit, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(1,0)); + SendMessageA(hwEdit, WM_SETFONT, (WPARAM)hfont, 0); + margins = SendMessageA(hwEdit, EM_GETMARGINS, 0, 0); + ok(LOWORD(margins) == LOWORD(font_margins), "got %d\n", LOWORD(margins)); + ok(HIWORD(margins) == HIWORD(font_margins), "got %d\n", HIWORD(margins)); + + SendMessageA(hwEdit, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(1,1)); + SendMessageA(hwEdit, WM_SETFONT, (WPARAM)hfont, 0); + margins = SendMessageA(hwEdit, EM_GETMARGINS, 0, 0); + ok(LOWORD(margins) == LOWORD(font_margins), "got %d\n", LOWORD(margins)); + ok(HIWORD(margins) == HIWORD(font_margins), "got %d\n", HIWORD(margins)); + + SendMessageA(hwEdit, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(EC_USEFONTINFO,EC_USEFONTINFO)); + SendMessageA(hwEdit, WM_SETFONT, (WPARAM)hfont, 0); + margins = SendMessageA(hwEdit, EM_GETMARGINS, 0, 0); + ok(LOWORD(margins) == LOWORD(font_margins), "got %d\n", LOWORD(margins)); + ok(HIWORD(margins) == HIWORD(font_margins), "got %d\n", HIWORD(margins)); + SendMessageA(hwEdit, WM_SETFONT, (WPARAM)hfont2, 0); + margins = SendMessageA(hwEdit, EM_GETMARGINS, 0, 0); + ok(LOWORD(margins) != LOWORD(font_margins) || broken(LOWORD(margins) == LOWORD(font_margins)), /* win98 */ + "got %d\n", LOWORD(margins)); + ok(HIWORD(margins) != HIWORD(font_margins), "got %d\n", HIWORD(margins)); + + SendMessageA(hwEdit, WM_SETFONT, 0, 0); + + DeleteObject(hfont2); + DeleteObject(hfont); + destroy_child_editcontrol(hwEdit); + +} + +#define edit_pos_ok(exp, got, txt) \ + ok(exp == got, "wrong " #txt " expected %d got %d\n", exp, got); + +#define check_pos(hwEdit, set_height, test_top, test_height, test_left) \ +do { \ + RECT format_rect; \ + int left_margin; \ + set_client_height(hwEdit, set_height); \ + SendMessageA(hwEdit, EM_GETRECT, 0, (LPARAM) &format_rect); \ + left_margin = LOWORD(SendMessageA(hwEdit, EM_GETMARGINS, 0, 0)); \ + edit_pos_ok(test_top, format_rect.top, vertical position); \ + edit_pos_ok((int)test_height, format_rect.bottom - format_rect.top, height); \ + edit_pos_ok(test_left, format_rect.left - left_margin, left); \ +} while(0) + +static void test_text_position_style(DWORD style) +{ + HWND hwEdit; + HFONT font, oldFont; + HDC dc; + TEXTMETRICA metrics; + INT b, bm, b2, b3; + BOOL xb, single_line = !(style & ES_MULTILINE); + + b = GetSystemMetrics(SM_CYBORDER) + 1; + b2 = 2 * b; + b3 = 3 * b; + bm = b2 - 1; + + /* Get a stock font for which we can determine the metrics */ + font = GetStockObject(SYSTEM_FONT); + ok (font != NULL, "GetStockObject SYSTEM_FONT failed\n"); + dc = GetDC(NULL); + ok (dc != NULL, "GetDC() failed\n"); + oldFont = SelectObject(dc, font); + xb = GetTextMetricsA(dc, &metrics); + ok (xb, "GetTextMetrics failed\n"); + SelectObject(dc, oldFont); + ReleaseDC(NULL, dc); + + /* Windows' edit control has some bugs in multi-line mode: + * - Sometimes the format rectangle doesn't get updated + * (see workaround in set_client_height()) + * - If the height of the control is smaller than the height of a text + * line, the format rectangle is still as high as a text line + * (higher than the client rectangle) and the caret is not shown + */ + + /* Edit controls that are in a parent window */ + + hwEdit = create_child_editcontrol(style | WS_VISIBLE, 0); + SendMessageA(hwEdit, WM_SETFONT, (WPARAM) font, FALSE); + if (single_line) + check_pos(hwEdit, metrics.tmHeight - 1, 0, metrics.tmHeight - 1, 0); + check_pos(hwEdit, metrics.tmHeight , 0, metrics.tmHeight , 0); + check_pos(hwEdit, metrics.tmHeight + 1, 0, metrics.tmHeight , 0); + check_pos(hwEdit, metrics.tmHeight + 2, 0, metrics.tmHeight , 0); + check_pos(hwEdit, metrics.tmHeight + 10, 0, metrics.tmHeight , 0); + destroy_child_editcontrol(hwEdit); + + hwEdit = create_child_editcontrol(style | WS_BORDER | WS_VISIBLE, 0); + SendMessageA(hwEdit, WM_SETFONT, (WPARAM) font, FALSE); + if (single_line) + check_pos(hwEdit, metrics.tmHeight - 1, 0, metrics.tmHeight - 1, b); + check_pos(hwEdit, metrics.tmHeight , 0, metrics.tmHeight , b); + check_pos(hwEdit, metrics.tmHeight + 1, 0, metrics.tmHeight , b); + check_pos(hwEdit, metrics.tmHeight + bm, 0, metrics.tmHeight , b); + check_pos(hwEdit, metrics.tmHeight + b2, b, metrics.tmHeight , b); + check_pos(hwEdit, metrics.tmHeight + b3, b, metrics.tmHeight , b); + destroy_child_editcontrol(hwEdit); + + hwEdit = create_child_editcontrol(style | WS_VISIBLE, WS_EX_CLIENTEDGE); + SendMessageA(hwEdit, WM_SETFONT, (WPARAM) font, FALSE); + if (single_line) + check_pos(hwEdit, metrics.tmHeight - 1, 0, metrics.tmHeight - 1, 1); + check_pos(hwEdit, metrics.tmHeight , 0, metrics.tmHeight , 1); + check_pos(hwEdit, metrics.tmHeight + 1, 0, metrics.tmHeight , 1); + check_pos(hwEdit, metrics.tmHeight + 2, 1, metrics.tmHeight , 1); + check_pos(hwEdit, metrics.tmHeight + 10, 1, metrics.tmHeight , 1); + destroy_child_editcontrol(hwEdit); + + hwEdit = create_child_editcontrol(style | WS_BORDER | WS_VISIBLE, WS_EX_CLIENTEDGE); + SendMessageA(hwEdit, WM_SETFONT, (WPARAM) font, FALSE); + if (single_line) + check_pos(hwEdit, metrics.tmHeight - 1, 0, metrics.tmHeight - 1, 1); + check_pos(hwEdit, metrics.tmHeight , 0, metrics.tmHeight , 1); + check_pos(hwEdit, metrics.tmHeight + 1, 0, metrics.tmHeight , 1); + check_pos(hwEdit, metrics.tmHeight + 2, 1, metrics.tmHeight , 1); + check_pos(hwEdit, metrics.tmHeight + 10, 1, metrics.tmHeight , 1); + destroy_child_editcontrol(hwEdit); + + + /* Edit controls that are popup windows */ + + hwEdit = create_editcontrol(style | WS_POPUP, 0); + SendMessageA(hwEdit, WM_SETFONT, (WPARAM) font, FALSE); + if (single_line) + check_pos(hwEdit, metrics.tmHeight - 1, 0, metrics.tmHeight - 1, 0); + check_pos(hwEdit, metrics.tmHeight , 0, metrics.tmHeight , 0); + check_pos(hwEdit, metrics.tmHeight + 1, 0, metrics.tmHeight , 0); + check_pos(hwEdit, metrics.tmHeight + 2, 0, metrics.tmHeight , 0); + check_pos(hwEdit, metrics.tmHeight + 10, 0, metrics.tmHeight , 0); + DestroyWindow(hwEdit); + + hwEdit = create_editcontrol(style | WS_POPUP | WS_BORDER, 0); + SendMessageA(hwEdit, WM_SETFONT, (WPARAM) font, FALSE); + if (single_line) + check_pos(hwEdit, metrics.tmHeight - 1, 0, metrics.tmHeight - 1, b); + check_pos(hwEdit, metrics.tmHeight , 0, metrics.tmHeight , b); + check_pos(hwEdit, metrics.tmHeight + 1, 0, metrics.tmHeight , b); + check_pos(hwEdit, metrics.tmHeight + bm, 0, metrics.tmHeight , b); + check_pos(hwEdit, metrics.tmHeight + b2, b, metrics.tmHeight , b); + check_pos(hwEdit, metrics.tmHeight + b3, b, metrics.tmHeight , b); + DestroyWindow(hwEdit); + + hwEdit = create_editcontrol(style | WS_POPUP, WS_EX_CLIENTEDGE); + SendMessageA(hwEdit, WM_SETFONT, (WPARAM) font, FALSE); + if (single_line) + check_pos(hwEdit, metrics.tmHeight - 1, 0, metrics.tmHeight - 1, 1); + check_pos(hwEdit, metrics.tmHeight , 0, metrics.tmHeight , 1); + check_pos(hwEdit, metrics.tmHeight + 1, 0, metrics.tmHeight , 1); + check_pos(hwEdit, metrics.tmHeight + 2, 1, metrics.tmHeight , 1); + check_pos(hwEdit, metrics.tmHeight + 10, 1, metrics.tmHeight , 1); + DestroyWindow(hwEdit); + + hwEdit = create_editcontrol(style | WS_POPUP | WS_BORDER, WS_EX_CLIENTEDGE); + SendMessageA(hwEdit, WM_SETFONT, (WPARAM) font, FALSE); + if (single_line) + check_pos(hwEdit, metrics.tmHeight - 1, 0, metrics.tmHeight - 1, 1); + check_pos(hwEdit, metrics.tmHeight , 0, metrics.tmHeight , 1); + check_pos(hwEdit, metrics.tmHeight + 1, 0, metrics.tmHeight , 1); + check_pos(hwEdit, metrics.tmHeight + 2, 1, metrics.tmHeight , 1); + check_pos(hwEdit, metrics.tmHeight + 10, 1, metrics.tmHeight , 1); + DestroyWindow(hwEdit); +} + +static void test_text_position(void) +{ + trace("EDIT: Text position (Single line)\n"); + test_text_position_style(ES_AUTOHSCROLL | ES_AUTOVSCROLL); + trace("EDIT: Text position (Multi line)\n"); + test_text_position_style(ES_MULTILINE | ES_AUTOHSCROLL | ES_AUTOVSCROLL); +} + +static void test_espassword(void) +{ + HWND hwEdit; + LONG r; + char buffer[1024]; + const char* password = "secret"; + + hwEdit = create_editcontrol(ES_PASSWORD, 0); + r = get_edit_style(hwEdit); + ok(r == ES_PASSWORD, "Wrong style expected ES_PASSWORD got: 0x%x\n", r); + /* set text */ + r = SendMessageA(hwEdit , WM_SETTEXT, 0, (LPARAM) password); + ok(r == TRUE, "Expected: %d, got: %d\n", TRUE, r); + + /* select all, cut (ctrl-x) */ + SendMessageA(hwEdit, EM_SETSEL, 0, -1); + r = SendMessageA(hwEdit, WM_CHAR, 24, 0); + ok(1 == r, "Expected: %d, got: %d\n", 1, r); + + /* get text */ + r = SendMessageA(hwEdit, WM_GETTEXT, 1024, (LPARAM) buffer); + ok(r == strlen(password), "Expected: %s, got len %d\n", password, r); + ok(strcmp(buffer, password) == 0, "expected %s, got %s\n", password, buffer); + + r = OpenClipboard(hwEdit); + ok(r == TRUE, "expected %d, got %d\n", TRUE, r); + r = EmptyClipboard(); + ok(r == TRUE, "expected %d, got %d\n", TRUE, r); + r = CloseClipboard(); + ok(r == TRUE, "expected %d, got %d\n", TRUE, r); + + /* select all, copy (ctrl-c) and paste (ctrl-v) */ + SendMessageA(hwEdit, EM_SETSEL, 0, -1); + r = SendMessageA(hwEdit, WM_CHAR, 3, 0); + ok(1 == r, "Expected: %d, got: %d\n", 1, r); + r = SendMessageA(hwEdit, WM_CHAR, 22, 0); + ok(1 == r, "Expected: %d, got: %d\n", 1, r); + + /* get text */ + buffer[0] = 0; + r = SendMessageA(hwEdit, WM_GETTEXT, 1024, (LPARAM) buffer); + ok(r == 0, "Expected: 0, got: %d\n", r); + ok(strcmp(buffer, "") == 0, "expected empty string, got %s\n", buffer); + + DestroyWindow(hwEdit); +} + +static void test_undo(void) +{ + HWND hwEdit; + LONG r; + DWORD cpMin, cpMax; + char buffer[1024]; + const char* text = "undo this"; + + hwEdit = create_editcontrol(0, 0); + r = get_edit_style(hwEdit); + ok(0 == r, "Wrong style expected 0x%x got: 0x%x\n", 0, r); + + /* set text */ + r = SendMessageA(hwEdit , WM_SETTEXT, 0, (LPARAM) text); + ok(TRUE == r, "Expected: %d, got: %d\n", TRUE, r); + + /* select all, */ + cpMin = cpMax = 0xdeadbeef; + SendMessageA(hwEdit, EM_SETSEL, 0, -1); + r = SendMessageA(hwEdit, EM_GETSEL, (WPARAM) &cpMin, (LPARAM) &cpMax); + ok((strlen(text) << 16) == r, "Unexpected length %d\n", r); + ok(0 == cpMin, "Expected: %d, got %d\n", 0, cpMin); + ok(9 == cpMax, "Expected: %d, got %d\n", 9, cpMax); + + /* cut (ctrl-x) */ + r = SendMessageA(hwEdit, WM_CHAR, 24, 0); + ok(1 == r, "Expected: %d, got: %d\n", 1, r); + + /* get text */ + buffer[0] = 0; + r = SendMessageA(hwEdit, WM_GETTEXT, 1024, (LPARAM) buffer); + ok(0 == r, "Expected: %d, got len %d\n", 0, r); + ok(0 == strcmp(buffer, ""), "expected %s, got %s\n", "", buffer); + + /* undo (ctrl-z) */ + r = SendMessageA(hwEdit, WM_CHAR, 26, 0); + ok(1 == r, "Expected: %d, got: %d\n", 1, r); + + /* get text */ + buffer[0] = 0; + r = SendMessageA(hwEdit, WM_GETTEXT, 1024, (LPARAM) buffer); + ok(strlen(text) == r, "Unexpected length %d\n", r); + ok(0 == strcmp(buffer, text), "expected %s, got %s\n", text, buffer); + + /* undo again (ctrl-z) */ + r = SendMessageA(hwEdit, WM_CHAR, 26, 0); + ok(1 == r, "Expected: %d, got: %d\n", 1, r); + + /* get text */ + buffer[0] = 0; + r = SendMessageA(hwEdit, WM_GETTEXT, 1024, (LPARAM) buffer); + ok(r == 0, "Expected: %d, got len %d\n", 0, r); + ok(0 == strcmp(buffer, ""), "expected %s, got %s\n", "", buffer); + + DestroyWindow(hwEdit); +} + +static void test_enter(void) +{ + char buffer[16]; + HWND hwEdit; + LONG r; + + /* multiline */ + hwEdit = create_editcontrol(ES_MULTILINE, 0); + r = get_edit_style(hwEdit); + ok(ES_MULTILINE == r, "Wrong style expected ES_MULTILINE got: 0x%x\n", r); + + /* set text */ + r = SendMessageA(hwEdit , WM_SETTEXT, 0, (LPARAM) ""); + ok(TRUE == r, "Expected: %d, got: %d\n", TRUE, r); + + r = SendMessageA(hwEdit, WM_CHAR, VK_RETURN, 0); + ok(1 == r, "Expected: %d, got: %d\n", 1, r); + + /* get text */ + buffer[0] = 0; + r = SendMessageA(hwEdit, WM_GETTEXT, 16, (LPARAM) buffer); + ok(2 == r, "Expected: %d, got len %d\n", 2, r); + ok(0 == strcmp(buffer, "\r\n"), "expected \"\\r\\n\", got \"%s\"\n", buffer); + + DestroyWindow (hwEdit); + + /* single line */ + hwEdit = create_editcontrol(0, 0); + r = get_edit_style(hwEdit); + ok(0 == r, "Wrong style expected 0x%x got: 0x%x\n", 0, r); + + /* set text */ + r = SendMessageA(hwEdit , WM_SETTEXT, 0, (LPARAM) ""); + ok(TRUE == r, "Expected: %d, got: %d\n", TRUE, r); + + r = SendMessageA(hwEdit, WM_CHAR, VK_RETURN, 0); + ok(1 == r, "Expected: %d, got: %d\n", 1, r); + + /* get text */ + buffer[0] = 0; + r = SendMessageA(hwEdit, WM_GETTEXT, 16, (LPARAM) buffer); + ok(0 == r, "Expected: %d, got len %d\n", 0, r); + ok(0 == strcmp(buffer, ""), "expected \"\", got \"%s\"\n", buffer); + + DestroyWindow(hwEdit); + + /* single line with ES_WANTRETURN */ + hwEdit = create_editcontrol(ES_WANTRETURN, 0); + r = get_edit_style(hwEdit); + ok(ES_WANTRETURN == r, "Wrong style expected ES_WANTRETURN got: 0x%x\n", r); + + /* set text */ + r = SendMessageA(hwEdit , WM_SETTEXT, 0, (LPARAM) ""); + ok(TRUE == r, "Expected: %d, got: %d\n", TRUE, r); + + r = SendMessageA(hwEdit, WM_CHAR, VK_RETURN, 0); + ok(1 == r, "Expected: %d, got: %d\n", 1, r); + + /* get text */ + buffer[0] = 0; + r = SendMessageA(hwEdit, WM_GETTEXT, 16, (LPARAM) buffer); + ok(0 == r, "Expected: %d, got len %d\n", 0, r); + ok(0 == strcmp(buffer, ""), "expected \"\", got \"%s\"\n", buffer); + + DestroyWindow(hwEdit); +} + +static void test_tab(void) +{ + char buffer[16]; + HWND hwEdit; + LONG r; + + /* multiline */ + hwEdit = create_editcontrol(ES_MULTILINE, 0); + r = get_edit_style(hwEdit); + ok(ES_MULTILINE == r, "Wrong style expected ES_MULTILINE got: 0x%x\n", r); + + /* set text */ + r = SendMessageA(hwEdit , WM_SETTEXT, 0, (LPARAM) ""); + ok(TRUE == r, "Expected: %d, got: %d\n", TRUE, r); + + r = SendMessageA(hwEdit, WM_CHAR, VK_TAB, 0); + ok(1 == r, "Expected: %d, got: %d\n", 1, r); + + /* get text */ + buffer[0] = 0; + r = SendMessageA(hwEdit, WM_GETTEXT, 16, (LPARAM) buffer); + ok(1 == r, "Expected: %d, got len %d\n", 1, r); + ok(0 == strcmp(buffer, "\t"), "expected \"\\t\", got \"%s\"\n", buffer); + + DestroyWindow(hwEdit); + + /* single line */ + hwEdit = create_editcontrol(0, 0); + r = get_edit_style(hwEdit); + ok(0 == r, "Wrong style expected 0x%x got: 0x%x\n", 0, r); + + /* set text */ + r = SendMessageA(hwEdit , WM_SETTEXT, 0, (LPARAM) ""); + ok(TRUE == r, "Expected: %d, got: %d\n", TRUE, r); + + r = SendMessageA(hwEdit, WM_CHAR, VK_TAB, 0); + ok(1 == r, "Expected: %d, got: %d\n", 1, r); + + /* get text */ + buffer[0] = 0; + r = SendMessageA(hwEdit, WM_GETTEXT, 16, (LPARAM) buffer); + ok(0 == r, "Expected: %d, got len %d\n", 0, r); + ok(0 == strcmp(buffer, ""), "expected \"\", got \"%s\"\n", buffer); + + DestroyWindow(hwEdit); +} + +static void test_edit_dialog(void) +{ + int r; + + /* from bug 11841 */ + r = DialogBoxParamA(hinst, "EDIT_READONLY_DIALOG", NULL, edit_dialog_proc, 0); + ok(333 == r, "Expected %d, got %d\n", 333, r); + r = DialogBoxParamA(hinst, "EDIT_READONLY_DIALOG", NULL, edit_dialog_proc, 1); + ok(111 == r, "Expected %d, got %d\n", 111, r); + r = DialogBoxParamA(hinst, "EDIT_READONLY_DIALOG", NULL, edit_dialog_proc, 2); + ok(444 == r, "Expected %d, got %d\n", 444, r); + + /* more tests for WM_CHAR */ + r = DialogBoxParamA(hinst, "EDIT_READONLY_DIALOG", NULL, edit_dialog_proc, 3); + ok(444 == r, "Expected %d, got %d\n", 444, r); + r = DialogBoxParamA(hinst, "EDIT_READONLY_DIALOG", NULL, edit_dialog_proc, 4); + ok(444 == r, "Expected %d, got %d\n", 444, r); + r = DialogBoxParamA(hinst, "EDIT_READONLY_DIALOG", NULL, edit_dialog_proc, 5); + ok(444 == r, "Expected %d, got %d\n", 444, r); + + /* more tests for WM_KEYDOWN + WM_CHAR */ + r = DialogBoxParamA(hinst, "EDIT_READONLY_DIALOG", NULL, edit_dialog_proc, 6); + ok(444 == r, "Expected %d, got %d\n", 444, r); + r = DialogBoxParamA(hinst, "EDIT_READONLY_DIALOG", NULL, edit_dialog_proc, 7); + ok(444 == r, "Expected %d, got %d\n", 444, r); + r = DialogBoxParamA(hinst, "EDIT_READONLY_DIALOG", NULL, edit_dialog_proc, 8); + ok(444 == r, "Expected %d, got %d\n", 444, r); + + /* tests with an editable edit control */ + r = DialogBoxParamA(hinst, "EDIT_DIALOG", NULL, edit_dialog_proc, 0); + ok(333 == r, "Expected %d, got %d\n", 333, r); + r = DialogBoxParamA(hinst, "EDIT_DIALOG", NULL, edit_dialog_proc, 1); + ok(111 == r, "Expected %d, got %d\n", 111, r); + r = DialogBoxParamA(hinst, "EDIT_DIALOG", NULL, edit_dialog_proc, 2); + ok(444 == r, "Expected %d, got %d\n", 444, r); + + /* tests for WM_CHAR */ + r = DialogBoxParamA(hinst, "EDIT_DIALOG", NULL, edit_dialog_proc, 3); + ok(444 == r, "Expected %d, got %d\n", 444, r); + r = DialogBoxParamA(hinst, "EDIT_DIALOG", NULL, edit_dialog_proc, 4); + ok(444 == r, "Expected %d, got %d\n", 444, r); + r = DialogBoxParamA(hinst, "EDIT_DIALOG", NULL, edit_dialog_proc, 5); + ok(444 == r, "Expected %d, got %d\n", 444, r); + + /* tests for WM_KEYDOWN + WM_CHAR */ + r = DialogBoxParamA(hinst, "EDIT_DIALOG", NULL, edit_dialog_proc, 6); + ok(444 == r, "Expected %d, got %d\n", 444, r); + r = DialogBoxParamA(hinst, "EDIT_DIALOG", NULL, edit_dialog_proc, 7); + ok(444 == r, "Expected %d, got %d\n", 444, r); + r = DialogBoxParamA(hinst, "EDIT_DIALOG", NULL, edit_dialog_proc, 8); + ok(444 == r, "Expected %d, got %d\n", 444, r); + + /* multiple tab tests */ + r = DialogBoxParamA(hinst, "EDIT_DIALOG", NULL, edit_dialog_proc, 9); + ok(22 == r, "Expected %d, got %d\n", 22, r); + r = DialogBoxParamA(hinst, "EDIT_DIALOG", NULL, edit_dialog_proc, 10); + ok(33 == r, "Expected %d, got %d\n", 33, r); +} + +static void test_multi_edit_dialog(void) +{ + int r; + + /* test for multiple edit dialogs (bug 12319) */ + r = DialogBoxParamA(hinst, "MULTI_EDIT_DIALOG", NULL, multi_edit_dialog_proc, 0); + ok(2222 == r, "Expected %d, got %d\n", 2222, r); + r = DialogBoxParamA(hinst, "MULTI_EDIT_DIALOG", NULL, multi_edit_dialog_proc, 1); + ok(1111 == r, "Expected %d, got %d\n", 1111, r); + r = DialogBoxParamA(hinst, "MULTI_EDIT_DIALOG", NULL, multi_edit_dialog_proc, 2); + ok(2222 == r, "Expected %d, got %d\n", 2222, r); + r = DialogBoxParamA(hinst, "MULTI_EDIT_DIALOG", NULL, multi_edit_dialog_proc, 3); + ok(11 == r, "Expected %d, got %d\n", 11, r); +} + +static void test_wantreturn_edit_dialog(void) +{ + int r; + + /* tests for WM_KEYDOWN */ + r = DialogBoxParamA(hinst, "EDIT_WANTRETURN_DIALOG", NULL, edit_wantreturn_dialog_proc, 0); + ok(333 == r, "Expected %d, got %d\n", 333, r); + r = DialogBoxParamA(hinst, "EDIT_WANTRETURN_DIALOG", NULL, edit_wantreturn_dialog_proc, 1); + ok(444 == r, "Expected %d, got %d\n", 444, r); + r = DialogBoxParamA(hinst, "EDIT_WANTRETURN_DIALOG", NULL, edit_wantreturn_dialog_proc, 2); + ok(444 == r, "Expected %d, got %d\n", 444, r); + + /* tests for WM_CHAR */ + r = DialogBoxParamA(hinst, "EDIT_WANTRETURN_DIALOG", NULL, edit_wantreturn_dialog_proc, 3); + ok(444 == r, "Expected %d, got %d\n", 444, r); + r = DialogBoxParamA(hinst, "EDIT_WANTRETURN_DIALOG", NULL, edit_wantreturn_dialog_proc, 4); + ok(444 == r, "Expected %d, got %d\n", 444, r); + r = DialogBoxParamA(hinst, "EDIT_WANTRETURN_DIALOG", NULL, edit_wantreturn_dialog_proc, 5); + ok(444 == r, "Expected %d, got %d\n", 444, r); + + /* tests for WM_KEYDOWN + WM_CHAR */ + r = DialogBoxParamA(hinst, "EDIT_WANTRETURN_DIALOG", NULL, edit_wantreturn_dialog_proc, 6); + ok(444 == r, "Expected %d, got %d\n", 444, r); + r = DialogBoxParamA(hinst, "EDIT_WANTRETURN_DIALOG", NULL, edit_wantreturn_dialog_proc, 7); + ok(444 == r, "Expected %d, got %d\n", 444, r); + r = DialogBoxParamA(hinst, "EDIT_WANTRETURN_DIALOG", NULL, edit_wantreturn_dialog_proc, 8); + ok(444 == r, "Expected %d, got %d\n", 444, r); +} + +static void test_singleline_wantreturn_edit_dialog(void) +{ + int r; + + /* tests for WM_KEYDOWN */ + r = DialogBoxParamA(hinst, "EDIT_SINGLELINE_DIALOG", NULL, edit_singleline_dialog_proc, 0); + ok(222 == r, "Expected %d, got %d\n", 222, r); + r = DialogBoxParamA(hinst, "EDIT_SINGLELINE_DIALOG", NULL, edit_singleline_dialog_proc, 1); + ok(111 == r, "Expected %d, got %d\n", 111, r); + r = DialogBoxParamA(hinst, "EDIT_SINGLELINE_DIALOG", NULL, edit_singleline_dialog_proc, 2); + ok(444 == r, "Expected %d, got %d\n", 444, r); + + /* tests for WM_CHAR */ + r = DialogBoxParamA(hinst, "EDIT_SINGLELINE_DIALOG", NULL, edit_singleline_dialog_proc, 3); + ok(444 == r, "Expected %d, got %d\n", 444, r); + r = DialogBoxParamA(hinst, "EDIT_SINGLELINE_DIALOG", NULL, edit_singleline_dialog_proc, 4); + ok(444 == r, "Expected %d, got %d\n", 444, r); + r = DialogBoxParamA(hinst, "EDIT_SINGLELINE_DIALOG", NULL, edit_singleline_dialog_proc, 5); + ok(444 == r, "Expected %d, got %d\n", 444, r); + + /* tests for WM_KEYDOWN + WM_CHAR */ + r = DialogBoxParamA(hinst, "EDIT_SINGLELINE_DIALOG", NULL, edit_singleline_dialog_proc, 6); + ok(222 == r, "Expected %d, got %d\n", 222, r); + r = DialogBoxParamA(hinst, "EDIT_SINGLELINE_DIALOG", NULL, edit_singleline_dialog_proc, 7); + ok(111 == r, "Expected %d, got %d\n", 111, r); + r = DialogBoxParamA(hinst, "EDIT_SINGLELINE_DIALOG", NULL, edit_singleline_dialog_proc, 8); + ok(444 == r, "Expected %d, got %d\n", 444, r); + + /* tests for WM_KEYDOWN */ + r = DialogBoxParamA(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, edit_singleline_dialog_proc, 0); + ok(222 == r, "Expected %d, got %d\n", 222, r); + r = DialogBoxParamA(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, edit_singleline_dialog_proc, 1); + ok(111 == r, "Expected %d, got %d\n", 111, r); + r = DialogBoxParamA(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, edit_singleline_dialog_proc, 2); + ok(444 == r, "Expected %d, got %d\n", 444, r); + + /* tests for WM_CHAR */ + r = DialogBoxParamA(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, edit_singleline_dialog_proc, 3); + ok(444 == r, "Expected %d, got %d\n", 444, r); + r = DialogBoxParamA(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, edit_singleline_dialog_proc, 4); + ok(444 == r, "Expected %d, got %d\n", 444, r); + r = DialogBoxParamA(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, edit_singleline_dialog_proc, 5); + ok(444 == r, "Expected %d, got %d\n", 444, r); + + /* tests for WM_KEYDOWN + WM_CHAR */ + r = DialogBoxParamA(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, edit_singleline_dialog_proc, 6); + ok(222 == r, "Expected %d, got %d\n", 222, r); + r = DialogBoxParamA(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, edit_singleline_dialog_proc, 7); + ok(111 == r, "Expected %d, got %d\n", 111, r); + r = DialogBoxParamA(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, edit_singleline_dialog_proc, 8); + ok(444 == r, "Expected %d, got %d\n", 444, r); +} + +static int child_edit_wmkeydown_num_messages = 0; +static INT_PTR CALLBACK child_edit_wmkeydown_proc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) +{ + switch (msg) + { + case WM_DESTROY: + case WM_NCDESTROY: + break; + + default: + child_edit_wmkeydown_num_messages++; + break; + } + + return FALSE; +} + +static void test_child_edit_wmkeydown(void) +{ + HWND hwEdit, hwParent; + int r; + + hwEdit = create_child_editcontrol(0, 0); + hwParent = GetParent(hwEdit); + SetWindowLongPtrA(hwParent, GWLP_WNDPROC, (LONG_PTR)child_edit_wmkeydown_proc); + r = SendMessageA(hwEdit, WM_KEYDOWN, VK_RETURN, 0x1c0001); + ok(1 == r, "expected 1, got %d\n", r); + ok(0 == child_edit_wmkeydown_num_messages, "expected 0, got %d\n", child_edit_wmkeydown_num_messages); + destroy_child_editcontrol(hwEdit); +} + +static BOOL got_en_setfocus = FALSE; +static BOOL got_wm_capturechanged = FALSE; +static LRESULT (CALLBACK *p_edit_proc)(HWND, UINT, WPARAM, LPARAM); + +static LRESULT CALLBACK edit4_wnd_procA(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + switch (msg) { + case WM_COMMAND: + switch (HIWORD(wParam)) + { + case EN_SETFOCUS: + got_en_setfocus = TRUE; + break; + } + break; + case WM_CAPTURECHANGED: + if (hWnd != (HWND)lParam) + { + got_wm_capturechanged = TRUE; + EndMenu(); + } + break; + } + return DefWindowProcA(hWnd, msg, wParam, lParam); +} + +struct context_menu_messages +{ + unsigned int wm_command, em_setsel; +}; + +static struct context_menu_messages menu_messages; + +static LRESULT CALLBACK child_edit_menu_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + switch (msg) + { + case WM_ENTERIDLE: + if (wParam == MSGF_MENU) + { + HWND hwndMenu = (HWND)lParam; + MENUBARINFO mbi = { sizeof(mbi) }; + if (GetMenuBarInfo(hwndMenu, OBJID_CLIENT, 0, &mbi)) + { + MENUITEMINFOA mii = { sizeof(MENUITEMINFOA), MIIM_STATE }; + if (GetMenuItemInfoA(mbi.hMenu, EM_SETSEL, FALSE, &mii)) + { + if (mii.fState & MFS_HILITE) + { + PostMessageA(hwnd, WM_KEYDOWN, VK_RETURN, 0x1c0001); + PostMessageA(hwnd, WM_KEYUP, VK_RETURN, 0x1c0001); + } + else + { + PostMessageA(hwnd, WM_KEYDOWN, VK_DOWN, 0x500001); + PostMessageA(hwnd, WM_KEYUP, VK_DOWN, 0x500001); + } + } + } + } + break; + case WM_COMMAND: + menu_messages.wm_command++; + break; + case EM_SETSEL: + menu_messages.em_setsel++; + break; + } + return CallWindowProcA(p_edit_proc, hwnd, msg, wParam, lParam); +} + +static void test_contextmenu(void) +{ + HWND hwndMain, hwndEdit; + MSG msg; + + hwndMain = CreateWindowA(szEditTest4Class, "ET4", WS_OVERLAPPEDWINDOW|WS_VISIBLE, + 0, 0, 200, 200, NULL, NULL, hinst, NULL); + assert(hwndMain); + + hwndEdit = CreateWindowA("EDIT", NULL, + WS_CHILD|WS_BORDER|WS_VISIBLE|ES_LEFT|ES_AUTOHSCROLL, + 0, 0, 150, 50, /* important this not be 0 size. */ + hwndMain, (HMENU) ID_EDITTEST2, hinst, NULL); + assert(hwndEdit); + + SetFocus(NULL); + SetCapture(hwndMain); + SendMessageA(hwndEdit, WM_CONTEXTMENU, (WPARAM)hwndEdit, MAKEWORD(10, 10)); + ok(got_en_setfocus, "edit box didn't get focused\n"); + ok(got_wm_capturechanged, "main window capture did not change\n"); + + DestroyWindow(hwndEdit); + + hwndEdit = CreateWindowA("EDIT", "Test Text", + WS_CHILD | WS_BORDER | WS_VISIBLE, + 0, 0, 100, 100, + hwndMain, NULL, hinst, NULL); + memset(&menu_messages, 0, sizeof(menu_messages)); + p_edit_proc = (void*)SetWindowLongPtrA(hwndEdit, GWLP_WNDPROC, + (ULONG_PTR)child_edit_menu_proc); + + SetFocus(hwndEdit); + SendMessageA(hwndEdit, WM_SETTEXT, 0, (LPARAM)"foo"); + SendMessageA(hwndEdit, WM_CONTEXTMENU, (WPARAM)hwndEdit, MAKEWORD(-1, -1)); + while (PeekMessageA(&msg, hwndEdit, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + ok(menu_messages.wm_command == 0, + "Expected no WM_COMMAND messages, got %d\n", menu_messages.wm_command); + ok(menu_messages.em_setsel == 1, + "Expected 1 EM_SETSEL message, got %d\n", menu_messages.em_setsel); + + DestroyWindow(hwndEdit); + DestroyWindow(hwndMain); +} + +static BOOL register_classes(void) +{ + WNDCLASSA test2; + WNDCLASSA test3; + WNDCLASSA test4; + WNDCLASSA text_position; + + test2.style = 0; + test2.lpfnWndProc = ET2_WndProc; + test2.cbClsExtra = 0; + test2.cbWndExtra = 0; + test2.hInstance = hinst; + test2.hIcon = NULL; + test2.hCursor = LoadCursorA (NULL, (LPCSTR)IDC_ARROW); + test2.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); + test2.lpszMenuName = NULL; + test2.lpszClassName = szEditTest2Class; + if (!RegisterClassA(&test2)) return FALSE; + + test3.style = 0; + test3.lpfnWndProc = edit3_wnd_procA; + test3.cbClsExtra = 0; + test3.cbWndExtra = 0; + test3.hInstance = hinst; + test3.hIcon = 0; + test3.hCursor = LoadCursorA(0, (LPCSTR)IDC_ARROW); + test3.hbrBackground = GetStockObject(WHITE_BRUSH); + test3.lpszMenuName = NULL; + test3.lpszClassName = szEditTest3Class; + if (!RegisterClassA(&test3)) return FALSE; + + test4.style = 0; + test4.lpfnWndProc = edit4_wnd_procA; + test4.cbClsExtra = 0; + test4.cbWndExtra = 0; + test4.hInstance = hinst; + test4.hIcon = NULL; + test4.hCursor = LoadCursorA (NULL, (LPCSTR)IDC_ARROW); + test4.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); + test4.lpszMenuName = NULL; + test4.lpszClassName = szEditTest4Class; + if (!RegisterClassA(&test4)) return FALSE; + + text_position.style = CS_HREDRAW | CS_VREDRAW; + text_position.cbClsExtra = 0; + text_position.cbWndExtra = 0; + text_position.hInstance = hinst; + text_position.hIcon = NULL; + text_position.hCursor = LoadCursorA(NULL, (LPCSTR)IDC_ARROW); + text_position.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1); + text_position.lpszMenuName = NULL; + text_position.lpszClassName = szEditTextPositionClass; + text_position.lpfnWndProc = DefWindowProcA; + if (!RegisterClassA(&text_position)) return FALSE; + + return TRUE; +} + +static void UnregisterWindowClasses (void) +{ + UnregisterClassA(szEditTest2Class, hinst); + UnregisterClassA(szEditTest3Class, hinst); + UnregisterClassA(szEditTest4Class, hinst); + UnregisterClassA(szEditTextPositionClass, hinst); +} + +static void test_fontsize(void) +{ + HWND hwEdit; + HFONT hfont; + HDC hDC; + LOGFONTA lf; + LONG r; + char szLocalString[MAXLEN]; + int dpi; + + hDC = GetDC(NULL); + dpi = GetDeviceCaps(hDC, LOGPIXELSY); + ReleaseDC(NULL, hDC); + + memset(&lf,0,sizeof(LOGFONTA)); + strcpy(lf.lfFaceName,"Arial"); + lf.lfHeight = -300; /* taller than the edit box */ + lf.lfWeight = 500; + hfont = CreateFontIndirectA(&lf); + + trace("EDIT: Oversized font (Multi line)\n"); + hwEdit= CreateWindowA("EDIT", NULL, ES_MULTILINE|ES_AUTOHSCROLL, + 0, 0, (150 * dpi) / 96, (50 * dpi) / 96, NULL, NULL, + hinst, NULL); + + SendMessageA(hwEdit,WM_SETFONT,(WPARAM)hfont,0); + + if (winetest_interactive) + ShowWindow (hwEdit, SW_SHOW); + + r = SendMessageA(hwEdit, WM_CHAR, 'A', 1); + ok(1 == r, "Expected: %d, got: %d\n", 1, r); + r = SendMessageA(hwEdit, WM_CHAR, 'B', 1); + ok(1 == r, "Expected: %d, got: %d\n", 1, r); + r = SendMessageA(hwEdit, WM_CHAR, 'C', 1); + ok(1 == r, "Expected: %d, got: %d\n", 1, r); + + GetWindowTextA(hwEdit, szLocalString, MAXLEN); + ok(strcmp(szLocalString, "ABC")==0, + "Wrong contents of edit: %s\n", szLocalString); + + r = SendMessageA(hwEdit, EM_POSFROMCHAR,0,0); + ok(r != -1,"EM_POSFROMCHAR failed index 0\n"); + r = SendMessageA(hwEdit, EM_POSFROMCHAR,1,0); + ok(r != -1,"EM_POSFROMCHAR failed index 1\n"); + r = SendMessageA(hwEdit, EM_POSFROMCHAR,2,0); + ok(r != -1,"EM_POSFROMCHAR failed index 2\n"); + r = SendMessageA(hwEdit, EM_POSFROMCHAR,3,0); + ok(r == -1,"EM_POSFROMCHAR succeeded index 3\n"); + + DestroyWindow (hwEdit); + DeleteObject(hfont); +} + +struct dialog_mode_messages +{ + int wm_getdefid, wm_close, wm_command, wm_nextdlgctl; +}; + +static struct dialog_mode_messages dm_messages; + +static void zero_dm_messages(void) +{ + dm_messages.wm_command = 0; + dm_messages.wm_close = 0; + dm_messages.wm_getdefid = 0; + dm_messages.wm_nextdlgctl = 0; +} + +#define test_dm_messages(wmcommand, wmclose, wmgetdefid, wmnextdlgctl) \ + ok(dm_messages.wm_command == wmcommand, "expected %d WM_COMMAND messages, " \ + "got %d\n", wmcommand, dm_messages.wm_command); \ + ok(dm_messages.wm_close == wmclose, "expected %d WM_CLOSE messages, " \ + "got %d\n", wmclose, dm_messages.wm_close); \ + ok(dm_messages.wm_getdefid == wmgetdefid, "expected %d WM_GETDIFID messages, " \ + "got %d\n", wmgetdefid, dm_messages.wm_getdefid);\ + ok(dm_messages.wm_nextdlgctl == wmnextdlgctl, "expected %d WM_NEXTDLGCTL messages, " \ + "got %d\n", wmnextdlgctl, dm_messages.wm_nextdlgctl) + +static LRESULT CALLBACK dialog_mode_wnd_proc(HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam) +{ + switch (iMsg) + { + case WM_COMMAND: + dm_messages.wm_command++; + break; + case DM_GETDEFID: + dm_messages.wm_getdefid++; + return MAKELONG(ID_EDITTESTDBUTTON, DC_HASDEFID); + case WM_NEXTDLGCTL: + dm_messages.wm_nextdlgctl++; + break; + case WM_CLOSE: + dm_messages.wm_close++; + break; + } + + return DefWindowProcA(hwnd, iMsg, wParam, lParam); +} + +static void test_dialogmode(void) +{ + HWND hwEdit, hwParent, hwButton; + MSG msg= {0}; + int len, r; + hwEdit = create_child_editcontrol(ES_MULTILINE, 0); + + r = SendMessageA(hwEdit, WM_CHAR, VK_RETURN, 0x1c0001); + ok(1 == r, "expected 1, got %d\n", r); + len = SendMessageA(hwEdit, WM_GETTEXTLENGTH, 0, 0); + ok(11 == len, "expected 11, got %d\n", len); + + r = SendMessageA(hwEdit, WM_GETDLGCODE, 0, 0); + ok(0x8d == r, "expected 0x8d, got 0x%x\n", r); + + r = SendMessageA(hwEdit, WM_CHAR, VK_RETURN, 0x1c0001); + ok(1 == r, "expected 1, got %d\n", r); + len = SendMessageA(hwEdit, WM_GETTEXTLENGTH, 0, 0); + ok(13 == len, "expected 13, got %d\n", len); + + r = SendMessageA(hwEdit, WM_GETDLGCODE, 0, (LPARAM)&msg); + ok(0x8d == r, "expected 0x8d, got 0x%x\n", r); + r = SendMessageA(hwEdit, WM_CHAR, VK_RETURN, 0x1c0001); + ok(1 == r, "expected 1, got %d\n", r); + len = SendMessageA(hwEdit, WM_GETTEXTLENGTH, 0, 0); + ok(13 == len, "expected 13, got %d\n", len); + + r = SendMessageA(hwEdit, WM_CHAR, VK_RETURN, 0x1c0001); + ok(1 == r, "expected 1, got %d\n", r); + len = SendMessageA(hwEdit, WM_GETTEXTLENGTH, 0, 0); + ok(13 == len, "expected 13, got %d\n", len); + + destroy_child_editcontrol(hwEdit); + + hwEdit = create_editcontrol(ES_MULTILINE, 0); + + r = SendMessageA(hwEdit, WM_CHAR, VK_RETURN, 0x1c0001); + ok(1 == r, "expected 1, got %d\n", r); + len = SendMessageA(hwEdit, WM_GETTEXTLENGTH, 0, 0); + ok(11 == len, "expected 11, got %d\n", len); + + msg.hwnd = hwEdit; + msg.message = WM_KEYDOWN; + msg.wParam = VK_BACK; + msg.lParam = 0xe0001; + r = SendMessageA(hwEdit, WM_GETDLGCODE, VK_BACK, (LPARAM)&msg); + ok(0x8d == r, "expected 0x8d, got 0x%x\n", r); + + r = SendMessageA(hwEdit, WM_CHAR, VK_RETURN, 0x1c0001); + ok(1 == r, "expected 1, got %d\n", r); + len = SendMessageA(hwEdit, WM_GETTEXTLENGTH, 0, 0); + ok(11 == len, "expected 11, got %d\n", len); + + DestroyWindow(hwEdit); + + hwEdit = create_child_editcontrol(0, 0); + hwParent = GetParent(hwEdit); + SetWindowLongPtrA(hwParent, GWLP_WNDPROC, (LONG_PTR)dialog_mode_wnd_proc); + + zero_dm_messages(); + r = SendMessageA(hwEdit, WM_KEYDOWN, VK_ESCAPE, 0x10001); + ok(1 == r, "expected 1, got %d\n", r); + test_dm_messages(0, 0, 0, 0); + zero_dm_messages(); + + r = SendMessageA(hwEdit, WM_KEYDOWN, VK_TAB, 0xf0001); + ok(1 == r, "expected 1, got %d\n", r); + test_dm_messages(0, 0, 0, 0); + zero_dm_messages(); + + msg.hwnd = hwEdit; + msg.message = WM_KEYDOWN; + msg.wParam = VK_TAB; + msg.lParam = 0xf0001; + r = SendMessageA(hwEdit, WM_GETDLGCODE, VK_TAB, (LPARAM)&msg); + ok(0x89 == r, "expected 0x89, got 0x%x\n", r); + test_dm_messages(0, 0, 0, 0); + zero_dm_messages(); + + r = SendMessageA(hwEdit, WM_KEYDOWN, VK_TAB, 0xf0001); + ok(1 == r, "expected 1, got %d\n", r); + test_dm_messages(0, 0, 0, 0); + zero_dm_messages(); + + destroy_child_editcontrol(hwEdit); + + hwEdit = create_child_editcontrol(ES_MULTILINE, 0); + hwParent = GetParent(hwEdit); + SetWindowLongPtrA(hwParent, GWLP_WNDPROC, (LONG_PTR)dialog_mode_wnd_proc); + + r = SendMessageA(hwEdit, WM_KEYDOWN, VK_TAB, 0xf0001); + ok(1 == r, "expected 1, got %d\n", r); + test_dm_messages(0, 0, 0, 0); + zero_dm_messages(); + + msg.hwnd = hwEdit; + msg.message = WM_KEYDOWN; + msg.wParam = VK_ESCAPE; + msg.lParam = 0x10001; + r = SendMessageA(hwEdit, WM_GETDLGCODE, VK_ESCAPE, (LPARAM)&msg); + ok(0x8d == r, "expected 0x8d, got 0x%x\n", r); + test_dm_messages(0, 0, 0, 0); + zero_dm_messages(); + + r = SendMessageA(hwEdit, WM_KEYDOWN, VK_ESCAPE, 0x10001); + ok(1 == r, "expected 1, got %d\n", r); + test_dm_messages(0, 0, 0, 0); + zero_dm_messages(); + + r = SendMessageA(hwEdit, WM_KEYDOWN, VK_TAB, 0xf0001); + ok(1 == r, "expected 1, got %d\n", r); + test_dm_messages(0, 0, 0, 1); + zero_dm_messages(); + + r = SendMessageA(hwEdit, WM_KEYDOWN, VK_RETURN, 0x1c0001); + ok(1 == r, "expected 1, got %d\n", r); + test_dm_messages(0, 0, 1, 0); + zero_dm_messages(); + + hwButton = CreateWindowA("BUTTON", "OK", WS_VISIBLE|WS_CHILD|BS_PUSHBUTTON, + 100, 100, 50, 20, hwParent, (HMENU)ID_EDITTESTDBUTTON, hinst, NULL); + ok(hwButton!=NULL, "CreateWindow failed with error code %d\n", GetLastError()); + + r = SendMessageA(hwEdit, WM_KEYDOWN, VK_RETURN, 0x1c0001); + ok(1 == r, "expected 1, got %d\n", r); + test_dm_messages(0, 0, 1, 1); + zero_dm_messages(); + + DestroyWindow(hwButton); + destroy_child_editcontrol(hwEdit); +} + +static void test_EM_GETHANDLE(void) +{ + static const WCHAR str1W[] = {'1','1','1','1','+','1','1','1','1','+','1','1','1','1','#',0}; + static const WCHAR str2W[] = {'2','2','2','2','-','2','2','2','2','-','2','2','2','2','-','2','2','2','2','#',0}; + static const char str0[] = "untouched"; + static const char str1[] = "1111+1111+1111#"; + static const char str1_1[] = "2111+1111+1111#"; + static const char str2[] = "2222-2222-2222-2222#"; + static const char str3[] = "3333*3333*3333*3333*3333#"; + CHAR current[42]; + HWND hEdit; + HLOCAL hmem; + HLOCAL hmem2; + HLOCAL halloc; + WCHAR *buffer; + int len; + int r; + + trace("EDIT: EM_GETHANDLE\n"); + + /* EM_GETHANDLE is not supported for a single line edit control */ + hEdit = create_editcontrol(WS_BORDER, 0); + ok(hEdit != NULL, "got %p (expected != NULL)\n", hEdit); + + hmem = (HGLOBAL) SendMessageA(hEdit, EM_GETHANDLE, 0, 0); + ok(hmem == NULL, "got %p (expected NULL)\n", hmem); + DestroyWindow(hEdit); + + /* EM_GETHANDLE needs a multiline edit control */ + hEdit = create_editcontrol(WS_BORDER | ES_MULTILINE, 0); + ok(hEdit != NULL, "got %p (expected != NULL)\n", hEdit); + + /* set some text */ + r = SendMessageA(hEdit, WM_SETTEXT, 0, (LPARAM)str1); + len = SendMessageA(hEdit, WM_GETTEXTLENGTH, 0, 0); + ok((r == 1) && (len == lstrlenA(str1)), "got %d and %d (expected 1 and %d)\n", r, len, lstrlenA(str1)); + + lstrcpyA(current, str0); + r = SendMessageA(hEdit, WM_GETTEXT, sizeof(current), (LPARAM)current); + ok((r == lstrlenA(str1)) && !lstrcmpA(current, str1), + "got %d and \"%s\" (expected %d and \"%s\")\n", r, current, lstrlenA(str1), str1); + + hmem = (HGLOBAL) SendMessageA(hEdit, EM_GETHANDLE, 0, 0); + ok(hmem != NULL, "got %p (expected != NULL)\n", hmem); + /* The buffer belongs to the app now. According to MSDN, the app has to LocalFree the + buffer, LocalAlloc a new buffer and pass it to the edit control with EM_SETHANDLE. */ + + buffer = LocalLock(hmem); + ok(buffer != NULL, "got %p (expected != NULL)\n", buffer); + len = lstrlenW(buffer); +todo_wine + ok(len == lstrlenW(str1W) && !lstrcmpW(buffer, str1W), "Unexpected buffer contents %s, length %d.\n", + wine_dbgstr_w(buffer), len); + LocalUnlock(hmem); + + /* See if WM_GETTEXTLENGTH/WM_GETTEXT still work. */ + len = SendMessageA(hEdit, WM_GETTEXTLENGTH, 0, 0); + ok(len == lstrlenA(str1), "Unexpected text length %d.\n", len); + + lstrcpyA(current, str0); + r = SendMessageA(hEdit, WM_GETTEXT, sizeof(current), (LPARAM)current); + ok((r == lstrlenA(str1)) && !lstrcmpA(current, str1), + "Unexpected retval %d and text \"%s\" (expected %d and \"%s\")\n", r, current, lstrlenA(str1), str1); + + /* Application altered buffer contents, see if WM_GETTEXTLENGTH/WM_GETTEXT pick that up. */ + buffer = LocalLock(hmem); + ok(buffer != NULL, "got %p (expected != NULL)\n", buffer); + buffer[0] = '2'; + LocalUnlock(hmem); + + len = SendMessageA(hEdit, WM_GETTEXTLENGTH, 0, 0); + ok(len == lstrlenA(str1_1), "Unexpected text length %d.\n", len); + + lstrcpyA(current, str0); + r = SendMessageA(hEdit, WM_GETTEXT, sizeof(current), (LPARAM)current); +todo_wine + ok(r == lstrlenA(str1_1) && !lstrcmpA(current, str1_1), + "Unexpected retval %d and text \"%s\" (expected %d and \"%s\")\n", r, current, lstrlenA(str1_1), str1_1); + + /* See if WM_SETTEXT/EM_REPLACESEL work. */ + r = SendMessageA(hEdit, WM_SETTEXT, 0, (LPARAM)str1); + ok(r, "Failed to set text.\n"); + + buffer = LocalLock(hmem); +todo_wine + ok(buffer != NULL && buffer[0] == '1', "Unexpected buffer contents\n"); + LocalUnlock(hmem); + + r = SendMessageA(hEdit, EM_REPLACESEL, 0, (LPARAM)str1_1); + ok(r, "Failed to replace selection.\n"); + + buffer = LocalLock(hmem); +todo_wine + ok(buffer != NULL && buffer[0] == '2', "Unexpected buffer contents\n"); + LocalUnlock(hmem); + + /* use LocalAlloc first to get a different handle */ + halloc = LocalAlloc(LMEM_MOVEABLE, 42); + ok(halloc != NULL, "got %p (expected != NULL)\n", halloc); + /* prepare our new memory */ + buffer = LocalLock(halloc); + ok(buffer != NULL, "got %p (expected != NULL)\n", buffer); + lstrcpyW(buffer, str2W); + LocalUnlock(halloc); + + /* LocalFree the old memory handle before EM_SETHANDLE the new handle */ + LocalFree(hmem); + /* use LocalAlloc after the LocalFree to likely consume the handle */ + hmem2 = LocalAlloc(LMEM_MOVEABLE, 42); + ok(hmem2 != NULL, "got %p (expected != NULL)\n", hmem2); + + SendMessageA(hEdit, EM_SETHANDLE, (WPARAM)halloc, 0); + + len = SendMessageA(hEdit, WM_GETTEXTLENGTH, 0, 0); +todo_wine + ok(len == lstrlenA(str2), "got %d (expected %d)\n", len, lstrlenA(str2)); + + lstrcpyA(current, str0); + r = SendMessageA(hEdit, WM_GETTEXT, sizeof(current), (LPARAM)current); +todo_wine + ok(r == lstrlenA(str2) && !lstrcmpA(current, str2), + "got %d and \"%s\" (expected %d and \"%s\")\n", r, current, lstrlenA(str2), str2); + + /* set a different text */ + r = SendMessageA(hEdit, WM_SETTEXT, 0, (LPARAM)str3); + len = SendMessageA(hEdit, WM_GETTEXTLENGTH, 0, 0); + ok((r == 1) && (len == lstrlenA(str3)), "got %d and %d (expected 1 and %d)\n", r, len, lstrlenA(str3)); + + lstrcpyA(current, str0); + r = SendMessageA(hEdit, WM_GETTEXT, sizeof(current), (LPARAM)current); + ok((r == lstrlenA(str3)) && !lstrcmpA(current, str3), + "got %d and \"%s\" (expected %d and \"%s\")\n", r, current, lstrlenA(str3), str3); + + LocalFree(hmem2); + DestroyWindow(hEdit); + + /* Some apps have bugs ... */ + hEdit = create_editcontrol(WS_BORDER | ES_MULTILINE, 0); + + /* set some text */ + r = SendMessageA(hEdit, WM_SETTEXT, 0, (LPARAM)str1); + len = SendMessageA(hEdit, WM_GETTEXTLENGTH, 0, 0); + ok((r == 1) && (len == lstrlenA(str1)), "got %d and %d (expected 1 and %d)\n", r, len, lstrlenA(str1)); + + /* everything is normal up to EM_GETHANDLE */ + hmem = (HGLOBAL) SendMessageA(hEdit, EM_GETHANDLE, 0, 0); + /* Some messages still work while other messages fail. + After LocalFree the memory handle, messages can crash the app */ + + /* A buggy editor used EM_GETHANDLE twice */ + hmem2 = (HGLOBAL) SendMessageA(hEdit, EM_GETHANDLE, 0, 0); + ok(hmem2 == hmem, "got %p (expected %p)\n", hmem2, hmem); + + /* Let the edit control free the memory handle */ + SendMessageA(hEdit, EM_SETHANDLE, (WPARAM)hmem2, 0); + + DestroyWindow(hEdit); +} + +static void test_paste(void) +{ + static const char *str = "this is a simple text"; + static const char *str2 = "first line\r\nsecond line"; + HWND hEdit, hMultilineEdit; + HANDLE hmem, hmem_ret; + char *buffer; + int r, len; + + hEdit = create_editcontrol(ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); + hMultilineEdit = create_editcontrol(ES_AUTOHSCROLL | ES_AUTOVSCROLL | ES_MULTILINE, 0); + + /* Prepare clipboard data with simple text */ + hmem = GlobalAlloc(GMEM_MOVEABLE, 255); + ok(hmem != NULL, "got %p (expected != NULL)\n", hmem); + buffer = GlobalLock(hmem); + ok(buffer != NULL, "got %p (expected != NULL)\n", buffer); + strcpy(buffer, str); + GlobalUnlock(hmem); + + r = OpenClipboard(hEdit); + ok(r == TRUE, "expected %d, got %d\n", TRUE, r); + r = EmptyClipboard(); + ok(r == TRUE, "expected %d, got %d\n", TRUE, r); + hmem_ret = SetClipboardData(CF_TEXT, hmem); + ok(hmem_ret == hmem, "expected %p, got %p\n", hmem, hmem_ret); + r = CloseClipboard(); + ok(r == TRUE, "expected %d, got %d\n", TRUE, r); + + /* Paste single line */ + SendMessageA(hEdit, WM_SETTEXT, 0, (LPARAM)""); + r = SendMessageA(hEdit, WM_PASTE, 0, 0); + len = SendMessageA(hEdit, WM_GETTEXTLENGTH, 0, 0); + ok(strlen(str) == len, "got %d\n", len); + + /* Prepare clipboard data with multiline text */ + hmem = GlobalAlloc(GMEM_MOVEABLE, 255); + ok(hmem != NULL, "got %p (expected != NULL)\n", hmem); + buffer = GlobalLock(hmem); + ok(buffer != NULL, "got %p (expected != NULL)\n", buffer); + strcpy(buffer, str2); + GlobalUnlock(hmem); + + r = OpenClipboard(hEdit); + ok(r == TRUE, "expected %d, got %d\n", TRUE, r); + r = EmptyClipboard(); + ok(r == TRUE, "expected %d, got %d\n", TRUE, r); + hmem_ret = SetClipboardData(CF_TEXT, hmem); + ok(hmem_ret == hmem, "expected %p, got %p\n", hmem, hmem_ret); + r = CloseClipboard(); + ok(r == TRUE, "expected %d, got %d\n", TRUE, r); + + /* Paste multiline text in singleline edit - should be cut */ + SendMessageA(hEdit, WM_SETTEXT, 0, (LPARAM)""); + r = SendMessageA(hEdit, WM_PASTE, 0, 0); + len = SendMessageA(hEdit, WM_GETTEXTLENGTH, 0, 0); + ok(strlen("first line") == len, "got %d\n", len); + + /* Paste multiline text in multiline edit */ + SendMessageA(hMultilineEdit, WM_SETTEXT, 0, (LPARAM)""); + r = SendMessageA(hMultilineEdit, WM_PASTE, 0, 0); + len = SendMessageA(hMultilineEdit, WM_GETTEXTLENGTH, 0, 0); + ok(strlen(str2) == len, "got %d\n", len); + + /* Cleanup */ + DestroyWindow(hEdit); + DestroyWindow(hMultilineEdit); +} + +START_TEST(edit) +{ + ULONG_PTR ctx_cookie; + HANDLE hCtx; + BOOL b; + + if (!load_v6_module(&ctx_cookie, &hCtx)) + return; + + hinst = GetModuleHandleA(NULL); + b = register_classes(); + ok(b, "Failed to register test classes.\n"); + if (!b) return; + + test_edit_control_1(); + test_edit_control_2(); + test_edit_control_3(); + test_char_from_pos(); + test_edit_control_5(); + test_edit_control_6(); + test_edit_control_limittext(); + test_edit_control_scroll(); + test_margins(); + test_margins_font_change(); + test_text_position(); + test_espassword(); + test_undo(); + test_enter(); + test_tab(); + test_edit_dialog(); + test_multi_edit_dialog(); + test_wantreturn_edit_dialog(); + test_singleline_wantreturn_edit_dialog(); + test_child_edit_wmkeydown(); + test_fontsize(); + test_dialogmode(); + test_contextmenu(); + test_EM_GETHANDLE(); + test_paste(); + + UnregisterWindowClasses(); + + unload_v6_module(ctx_cookie, hCtx); +} diff --git a/dlls/comctl32/tests/rsrc.rc b/dlls/comctl32/tests/rsrc.rc index 93e12447bc..327aa225e1 100644 --- a/dlls/comctl32/tests/rsrc.rc +++ b/dlls/comctl32/tests/rsrc.rc @@ -101,3 +101,63 @@ FONT 8, "MS Shell Dlg" COMBOBOX IDC_PS_COMBO1, 16, 68, 140, 60, CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Add", IDC_PS_PUSHBUTTON1, 164, 68, 40, 13 } + +MULTI_EDIT_DIALOG DIALOG 0, 0, 160, 75 +STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | DS_CENTER +CAPTION "Multiple Edit Test" +FONT 8, "MS Shell Dlg" +{ + EDITTEXT 1000, 5, 5, 150, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_MULTILINE | ES_WANTRETURN + EDITTEXT 1001, 5, 25, 150, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + EDITTEXT 1002, 5, 45, 150, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +} + +EDIT_DIALOG DIALOG 0, 0, 160, 80 +STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | DS_CENTER +CAPTION "Edit Test" +FONT 8, "MS Shell Dlg" +{ + PUSHBUTTON "OK", IDOK, 20, 60, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Cancel", IDCANCEL, 100, 60, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + EDITTEXT 1000, 5, 5, 150, 50, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_MULTILINE | WS_VSCROLL | ES_AUTOVSCROLL +} + +EDIT_READONLY_DIALOG DIALOG 0, 0, 160, 80 +STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | DS_CENTER +CAPTION "Edit Readonly Test" +FONT 8, "MS Shell Dlg" +{ + PUSHBUTTON "OK", IDOK, 20, 60, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Cancel", IDCANCEL, 100, 60, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + EDITTEXT 1000, 5, 5, 150, 50, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_MULTILINE | WS_VSCROLL | ES_AUTOVSCROLL | ES_READONLY +} + +EDIT_WANTRETURN_DIALOG DIALOG 0, 0, 160, 80 +STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | DS_CENTER +CAPTION "Edit Test" +FONT 8, "MS Shell Dlg" +{ + PUSHBUTTON "OK", IDOK, 20, 60, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Cancel", IDCANCEL, 100, 60, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + EDITTEXT 1000, 5, 5, 150, 50, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_MULTILINE | WS_VSCROLL | ES_AUTOVSCROLL | ES_WANTRETURN +} + +EDIT_SINGLELINE_DIALOG DIALOG 0, 0, 160, 80 +STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | DS_CENTER +CAPTION "Edit Test" +FONT 8, "MS Shell Dlg" +{ + PUSHBUTTON "OK", IDOK, 20, 60, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Cancel", IDCANCEL, 100, 60, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + EDITTEXT 1000, 5, 5, 150, 50, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | ES_AUTOVSCROLL +} + +EDIT_SINGLELINE_WANTRETURN_DIALOG DIALOG 0, 0, 160, 80 +STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | DS_CENTER +CAPTION "Edit Test" +FONT 8, "MS Shell Dlg" +{ + PUSHBUTTON "OK", IDOK, 20, 60, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Cancel", IDCANCEL, 100, 60, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + EDITTEXT 1000, 5, 5, 150, 50, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | ES_AUTOVSCROLL | ES_WANTRETURN +} -- 2.15.1

1 0

[PATCH] user32/tests: Remove runtime check for GetMenuBarInfo()
by Nikolay Sivov 18 Dec '17

18 Dec '17

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/user32/tests/edit.c | 30 +++++++----------------------- 1 file changed, 7 insertions(+), 23 deletions(-) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 79c0010e4e..e334be1ddd 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -38,15 +38,6 @@ struct edit_notify { static struct edit_notify notifications; -static BOOL (WINAPI *pGetMenuBarInfo)(HWND,LONG,LONG,PMENUBARINFO); - -static void init_function_pointers(void) -{ - HMODULE hdll = GetModuleHandleA("user32"); - - pGetMenuBarInfo = (void*)GetProcAddress(hdll, "GetMenuBarInfo"); -} - static INT_PTR CALLBACK multi_edit_dialog_proc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) { static int num_ok_commands = 0; @@ -2310,9 +2301,8 @@ static LRESULT CALLBACK edit_proc_proxy(HWND hWnd, UINT msg, WPARAM wParam, LPAR memset(&mbi, 0, sizeof(mbi)); mbi.cbSize = sizeof(mbi); SetLastError(0xdeadbeef); - ret = pGetMenuBarInfo(ctx_menu, OBJID_CLIENT, 0, &mbi); - ok(ret || broken(!ret && GetLastError()==ERROR_INVALID_WINDOW_HANDLE) /* NT */, - "GetMenuBarInfo failed\n"); + ret = GetMenuBarInfo(ctx_menu, OBJID_CLIENT, 0, &mbi); + ok(ret, "GetMenuBarInfo failed\n"); if (ret) { ok(mbi.hMenu != NULL, "mbi.hMenu = NULL\n"); @@ -2324,9 +2314,8 @@ static LRESULT CALLBACK edit_proc_proxy(HWND hWnd, UINT msg, WPARAM wParam, LPAR memset(&mbi, 0, sizeof(mbi)); mbi.cbSize = sizeof(mbi); SetLastError(0xdeadbeef); - ret = pGetMenuBarInfo(ctx_menu, OBJID_CLIENT, 1, &mbi); - ok(ret || broken(!ret && GetLastError()==ERROR_INVALID_WINDOW_HANDLE) /* NT */, - "GetMenuBarInfo failed\n"); + ret = GetMenuBarInfo(ctx_menu, OBJID_CLIENT, 1, &mbi); + ok(ret, "GetMenuBarInfo failed\n"); if (ret) { ok(mbi.hMenu != NULL, "mbi.hMenu = NULL\n"); @@ -2356,7 +2345,7 @@ static LRESULT CALLBACK child_edit_menu_proc(HWND hwnd, UINT msg, WPARAM wParam, if (wParam == MSGF_MENU) { HWND hwndMenu = (HWND)lParam; MENUBARINFO mbi = { sizeof(MENUBARINFO) }; - if (pGetMenuBarInfo(hwndMenu, OBJID_CLIENT, 0, &mbi)) { + if (GetMenuBarInfo(hwndMenu, OBJID_CLIENT, 0, &mbi)) { MENUITEMINFOA mii = { sizeof(MENUITEMINFOA), MIIM_STATE }; if (GetMenuItemInfoA(mbi.hMenu, EM_SETSEL, FALSE, &mii)) { if (mii.fState & MFS_HILITE) { @@ -2402,11 +2391,8 @@ static void test_contextmenu(void) ok(got_en_setfocus, "edit box didn't get focused\n"); ok(got_wm_capturechanged, "main window capture did not change\n"); - if (pGetMenuBarInfo) - { - p_edit_proc = (void*)SetWindowLongPtrA(hwndEdit, GWLP_WNDPROC, (ULONG_PTR)edit_proc_proxy); - SendMessageA(hwndEdit, WM_CONTEXTMENU, (WPARAM)hwndEdit, MAKEWORD(10, 10)); - } + p_edit_proc = (void*)SetWindowLongPtrA(hwndEdit, GWLP_WNDPROC, (ULONG_PTR)edit_proc_proxy); + SendMessageA(hwndEdit, WM_CONTEXTMENU, (WPARAM)hwndEdit, MAKEWORD(10, 10)); DestroyWindow (hwndEdit); @@ -2954,8 +2940,6 @@ START_TEST(edit) { BOOL b; - init_function_pointers(); - hinst = GetModuleHandleA(NULL); b = RegisterWindowClasses(); ok (b, "RegisterWindowClasses failed\n"); -- 2.15.1

1 0

[PATCH] po: Update Catalan translation
by Alex Henrie 18 Dec '17

18 Dec '17

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- po/ca.po | 1112 +++++++++++++++++++++++++------------------------------------- 1 file changed, 446 insertions(+), 666 deletions(-) diff --git a/po/ca.po b/po/ca.po index e759aee8e8..0fdec04444 100644 --- a/po/ca.po +++ b/po/ca.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2016-12-18 20:53-0700\n" +"PO-Revision-Date: 2017-12-17 18:14-0700\n" "Last-Translator: Alex Henrie <alexhenrie24(a)gmail.com>\n" "Language-Team: Catalan\n" "Language: ca\n" @@ -13,7 +13,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.8.11\n" +"X-Generator: Poedit 2.0.5\n" #: appwiz.rc:58 msgid "Install/Uninstall" @@ -842,7 +842,7 @@ msgstr "" #: comdlg32.rc:36 msgid "Invalid character(s) in path" -msgstr "Hi ha caràcters invàlids en el camí" +msgstr "Hi ha caràcters no vàlids en el camí" #: comdlg32.rc:37 msgid "" @@ -1854,7 +1854,7 @@ msgstr "Màscara=" #: crypt32.rc:192 msgid "Registered ID=" -msgstr "ID registrada=" +msgstr "ID registrat=" #: crypt32.rc:193 msgid "Unknown Key Usage" @@ -2439,7 +2439,7 @@ msgid "" "This certificate has an invalid signature. The certificate may have been " "altered or corrupted." msgstr "" -"Aquest certificat té una signatura invàlida. Pot ser que el certificat " +"Aquest certificat té una signatura no vàlida. Pot ser que el certificat " "s'hagués modificat o corromput." #: cryptui.rc:33 @@ -2485,7 +2485,7 @@ msgstr " a " #: cryptui.rc:42 msgid "This certificate has an invalid signature." -msgstr "Aquest certificat té una signatura invàlida." +msgstr "Aquest certificat té una signatura no vàlida." #: cryptui.rc:43 msgid "This certificate has expired or is not yet valid." @@ -3559,7 +3559,7 @@ msgstr "Error en convertir l'objecte a tipus primitiu" #: jscript.rc:29 msgid "Invalid procedure call or argument" -msgstr "Trucada a procediment o argument invàlid" +msgstr "Trucada a procediment o argument no vàlid" #: jscript.rc:30 msgid "Subscript out of range" @@ -3611,7 +3611,7 @@ msgstr "S'esperava '='" #: jscript.rc:42 msgid "Invalid character" -msgstr "Caràcter invàlid" +msgstr "Caràcter no vàlid" #: jscript.rc:43 msgid "Unterminated string constant" @@ -3695,7 +3695,7 @@ msgstr "Error de sintaxi en l'expressió regular" #: jscript.rc:64 msgid "URI to be encoded contains invalid characters" -msgstr "L'URI a codificar conté caràcters invàlids" +msgstr "L'URI a codificar conté caràcters no vàlids" #: jscript.rc:63 msgid "URI to be decoded is incorrect" @@ -3711,7 +3711,7 @@ msgstr "La precisió és fora d'interval" #: jscript.rc:67 msgid "Array length must be a finite positive integer" -msgstr "La longitud del vector ha de ser un enter positiu finit" +msgstr "La longitud del vector ha de ser un nombre enter positiu finit" #: jscript.rc:68 msgid "Array object expected" @@ -3719,7 +3719,7 @@ msgstr "S'esperava un objecte Array" #: ../../include/wine/wine_common_ver.rc:129 msgid "Wine kernel DLL" -msgstr "" +msgstr "DLL de nucli del Wine" #: ../../include/wine/wine_common_ver.rc:134 winemac.rc:32 wineboot.rc:42 msgid "Wine" @@ -3731,7 +3731,7 @@ msgstr "Èxit.\n" #: winerror.mc:31 msgid "Invalid function.\n" -msgstr "La funció és invàlida.\n" +msgstr "La funció no és vàlida.\n" #: winerror.mc:36 msgid "File not found.\n" @@ -3751,7 +3751,7 @@ msgstr "S'ha denegat l'accés.\n" #: winerror.mc:56 msgid "Invalid handle.\n" -msgstr "L'identificador és invàlid.\n" +msgstr "L'identificador no és vàlid.\n" #: winerror.mc:61 msgid "Memory trashed.\n" @@ -3763,7 +3763,7 @@ msgstr "Manca memòria.\n" #: winerror.mc:71 msgid "Invalid block.\n" -msgstr "El bloc és invàlid.\n" +msgstr "El bloc no és vàlid.\n" #: winerror.mc:76 msgid "Bad environment.\n" @@ -3775,11 +3775,11 @@ msgstr "El format és dolent.\n" #: winerror.mc:86 msgid "Invalid access.\n" -msgstr "L'accés és invàlid.\n" +msgstr "L'accés no és vàlid.\n" #: winerror.mc:91 msgid "Invalid data.\n" -msgstr "Les dades són invàlides.\n" +msgstr "Les dades no són vàlides.\n" #: winerror.mc:96 msgid "Out of memory.\n" @@ -3787,7 +3787,7 @@ msgstr "No queda memòria.\n" #: winerror.mc:101 msgid "Invalid drive.\n" -msgstr "La unitat és invàlida.\n" +msgstr "La unitat no és vàlida.\n" #: winerror.mc:106 msgid "Can't delete current directory.\n" @@ -3815,7 +3815,7 @@ msgstr "No està llest.\n" #: winerror.mc:136 msgid "Bad command.\n" -msgstr "L'ordre és dolent.\n" +msgstr "L'ordre és dolenta.\n" #: winerror.mc:141 msgid "CRC error.\n" @@ -3991,11 +3991,11 @@ msgstr "Ja s'ha assignat.\n" #: winerror.mc:356 winerror.mc:1711 msgid "Invalid password.\n" -msgstr "La contrasenya és invàlida.\n" +msgstr "La contrasenya no és vàlida.\n" #: winerror.mc:361 msgid "Invalid parameter.\n" -msgstr "El paràmetre és invàlid.\n" +msgstr "El paràmetre no és vàlid.\n" #: winerror.mc:366 msgid "Net write fault.\n" @@ -4059,15 +4059,15 @@ msgstr "No queden identificadors de cerca.\n" #: winerror.mc:446 msgid "Invalid target handle.\n" -msgstr "L'identificador destinatari és invàlid.\n" +msgstr "L'identificador de destinació no és vàlid.\n" #: winerror.mc:451 msgid "Invalid IOCTL.\n" -msgstr "L'IOCTL és invàlid.\n" +msgstr "L'IOCTL no és vàlid.\n" #: winerror.mc:456 msgid "Invalid verify switch.\n" -msgstr "L'indicador de verificació és invàlid.\n" +msgstr "L'indicador de verificació no és vàlid.\n" #: winerror.mc:461 msgid "Bad driver level.\n" @@ -4087,11 +4087,11 @@ msgstr "La memòria intermèdia és insuficient.\n" #: winerror.mc:481 msgid "Invalid name.\n" -msgstr "El nom és invàlid.\n" +msgstr "El nom no és vàlid.\n" #: winerror.mc:486 msgid "Invalid level.\n" -msgstr "El nivell és invàlid.\n" +msgstr "El nivell no és vàlid.\n" #: winerror.mc:491 msgid "No volume label.\n" @@ -4115,7 +4115,7 @@ msgstr "El procés fill no s'ha acabat.\n" #: winerror.mc:516 msgid "Invalid use of direct access handle.\n" -msgstr "L'ús d'identificador d'accés directe és invàlid.\n" +msgstr "L'ús d'identificador d'accés directe no és vàlid.\n" #: winerror.mc:521 msgid "Negative seek.\n" @@ -4123,7 +4123,7 @@ msgstr "La cerca és negativa.\n" #: winerror.mc:531 msgid "Drive is a JOIN target.\n" -msgstr "La unitat és un destinatari JOIN.\n" +msgstr "La unitat és una destinació JOIN.\n" #: winerror.mc:536 msgid "Drive is already JOINed.\n" @@ -4187,7 +4187,7 @@ msgstr "El camí està ocupat.\n" #: winerror.mc:611 msgid "Already a SUBST target.\n" -msgstr "Ja és un destinatari SUBST.\n" +msgstr "Ja és una destinació SUBST.\n" #: winerror.mc:616 msgid "System trace not specified or disallowed.\n" @@ -4203,7 +4203,7 @@ msgstr "Hi ha massa esperançats per a DosMuxSemWait.\n" #: winerror.mc:631 msgid "DosSemMuxWait list invalid.\n" -msgstr "La llista de DosSemMuxWait és invàlida.\n" +msgstr "La llista de DosSemMuxWait no és vàlida.\n" #: winerror.mc:636 msgid "Volume label too long.\n" @@ -4231,11 +4231,11 @@ msgstr "L'adreça d'ID de fil és dolent.\n" #: winerror.mc:666 msgid "Bad arguments to DosExecPgm.\n" -msgstr "Els paràmetres a DosExecPgm són dolents.\n" +msgstr "Els arguments a DosExecPgm són dolents.\n" #: winerror.mc:671 msgid "Path is invalid.\n" -msgstr "El camí és invàlid.\n" +msgstr "El camí no és vàlid.\n" #: winerror.mc:676 msgid "Signal pending.\n" @@ -4263,11 +4263,11 @@ msgstr "No s'accepten els bloqueigs atòmics.\n" #: winerror.mc:706 msgid "Invalid segment number.\n" -msgstr "El nombre de segment és invàlid.\n" +msgstr "El número de segment no és vàlid.\n" #: winerror.mc:711 msgid "Invalid ordinal for %1.\n" -msgstr "L'ordinal per a %1 és invàlid.\n" +msgstr "L'ordinal per a %1 no és vàlid.\n" #: winerror.mc:716 msgid "File already exists.\n" @@ -4275,7 +4275,7 @@ msgstr "El fitxer ja existeix.\n" #: winerror.mc:721 msgid "Invalid flag number.\n" -msgstr "El nombre de bandera és invàlida.\n" +msgstr "El número de bandera no és vàlid.\n" #: winerror.mc:726 msgid "Semaphore name not found.\n" @@ -4283,23 +4283,23 @@ msgstr "No s'ha trobat el nom de semàfor.\n" #: winerror.mc:731 msgid "Invalid starting code segment for %1.\n" -msgstr "El segment de codi d'inici per a %1 és invàlid.\n" +msgstr "El segment de codi d'inici per a %1 no és vàlid.\n" #: winerror.mc:736 msgid "Invalid starting stack segment for %1.\n" -msgstr "El segment de codi d'inici de pila per a %1 és invàlid.\n" +msgstr "El segment de codi d'inici de pila per a %1 no és vàlid.\n" #: winerror.mc:741 msgid "Invalid module type for %1.\n" -msgstr "El tipus de mòdul per a %1 és invàlid.\n" +msgstr "El tipus de mòdul per a %1 no és vàlid.\n" #: winerror.mc:746 msgid "Invalid EXE signature in %1.\n" -msgstr "La signatura EXE en %1 és invàlida.\n" +msgstr "La signatura EXE en %1 no és vàlida.\n" #: winerror.mc:751 msgid "EXE %1 is marked invalid.\n" -msgstr "L'EXE %1 està marcat com a invàlid.\n" +msgstr "L'EXE %1 està marcat com a no vàlid.\n" #: winerror.mc:756 msgid "Bad EXE format for %1.\n" @@ -4311,11 +4311,11 @@ msgstr "Les dades iterades superen 64k en %1.\n" #: winerror.mc:766 msgid "Invalid MinAllocSize in %1.\n" -msgstr "El MinAllocSize en %1 és invàlid.\n" +msgstr "La MinAllocSize en %1 no és vàlida.\n" #: winerror.mc:771 msgid "Dynlink from invalid ring.\n" -msgstr "L'enllaç dinàmic d'anell és invàlid.\n" +msgstr "L'enllaç dinàmic d'anell no és vàlid.\n" #: winerror.mc:776 msgid "IOPL not enabled.\n" @@ -4323,7 +4323,7 @@ msgstr "L'IOPL no està habilitat.\n" #: winerror.mc:781 msgid "Invalid SEGDPL in %1.\n" -msgstr "L'SEGDPL en %1 és invàlid.\n" +msgstr "L'SEGDPL en %1 no és vàlid.\n" #: winerror.mc:786 msgid "Auto data segment exceeds 64k.\n" @@ -4363,7 +4363,7 @@ msgstr "Hi ha un error en l'ús de comodins de nom de fitxer.\n" #: winerror.mc:831 msgid "Invalid signal number.\n" -msgstr "El nombre de senyal és invàlid.\n" +msgstr "El número de senyal no és vàlid.\n" #: winerror.mc:836 msgid "Error setting signal handler.\n" @@ -4411,7 +4411,7 @@ msgstr "S'ha cancel·lat la sessió.\n" #: winerror.mc:891 msgid "Invalid extended attribute name.\n" -msgstr "El nom d'atribut estès és invàlid.\n" +msgstr "El nom d'atribut estès no és vàlid.\n" #: winerror.mc:896 msgid "Extended attribute list inconsistent.\n" @@ -4427,7 +4427,7 @@ msgstr "No es pot utilitzar la Copy API.\n" #: winerror.mc:911 msgid "Directory name invalid.\n" -msgstr "El nom de directori és invàlid.\n" +msgstr "El nom de directori no és vàlid.\n" #: winerror.mc:916 msgid "Extended attributes didn't fit.\n" @@ -4443,7 +4443,7 @@ msgstr "La taula d'atributs estesos està ple.\n" #: winerror.mc:931 msgid "Invalid extended attribute handle.\n" -msgstr "L'identificador d'atribut estès és invàlid.\n" +msgstr "L'identificador d'atribut estès no és vàlid.\n" #: winerror.mc:936 msgid "Extended attributes not supported.\n" @@ -4467,7 +4467,7 @@ msgstr "No s'ha concedit el bloqueig d'operació.\n" #: winerror.mc:961 msgid "Invalid oplock message received.\n" -msgstr "S'ha rebut un missatge invàlid de bloqueig d'operació.\n" +msgstr "S'ha rebut un missatge no vàlid de bloqueig d'operació.\n" #: winerror.mc:966 msgid "Message 0x%1 not found in file %2.\n" @@ -4475,7 +4475,7 @@ msgstr "No s'ha trobat el missatge 0x%1 en el fitxer %2.\n" #: winerror.mc:971 msgid "Invalid address.\n" -msgstr "L'adreça és invàlida.\n" +msgstr "L'adreça no és vàlida.\n" #: winerror.mc:976 msgid "Arithmetic overflow.\n" @@ -4519,7 +4519,7 @@ msgstr "Hi ha hagut un desbordament de pila.\n" #: winerror.mc:1026 msgid "Invalid message.\n" -msgstr "El missatge és invàlid.\n" +msgstr "El missatge no és vàlid.\n" #: winerror.mc:1031 msgid "Cannot complete.\n" @@ -4527,7 +4527,7 @@ msgstr "No es pot acabar.\n" #: winerror.mc:1036 msgid "Invalid flags.\n" -msgstr "Les banderes són invàlides.\n" +msgstr "Les banderes no són vàlides.\n" #: winerror.mc:1041 msgid "Unrecognized volume.\n" @@ -4535,7 +4535,7 @@ msgstr "No s'ha reconegut el volum.\n" #: winerror.mc:1046 msgid "File invalid.\n" -msgstr "El fitxer és invàlid.\n" +msgstr "El fitxer no és vàlid.\n" #: winerror.mc:1051 msgid "Cannot run full-screen.\n" @@ -4551,7 +4551,7 @@ msgstr "El registre és corrupte.\n" #: winerror.mc:1066 msgid "Invalid key.\n" -msgstr "La clau és invàlida.\n" +msgstr "La clau no és vàlida.\n" #: winerror.mc:1071 msgid "Can't open registry key.\n" @@ -4607,7 +4607,7 @@ msgstr "Els serveis dependents s'estan executant.\n" #: winerror.mc:1136 msgid "Invalid service control.\n" -msgstr "El control de servei és invàlid.\n" +msgstr "El control de servei no és vàlid.\n" #: winerror.mc:1141 msgid "Service request timeout.\n" @@ -4627,7 +4627,7 @@ msgstr "El servei ja està executant.\n" #: winerror.mc:1161 msgid "Invalid service account.\n" -msgstr "El compte de servei és invàlid.\n" +msgstr "El compte de servei no és vàlid.\n" #: winerror.mc:1166 msgid "Service is disabled.\n" @@ -4683,7 +4683,7 @@ msgstr "L'inici de servei s'ha congelat.\n" #: winerror.mc:1231 msgid "Invalid service lock.\n" -msgstr "El bloqueig de servei és invàlid.\n" +msgstr "El bloqueig de servei no és vàlid.\n" #: winerror.mc:1236 msgid "Service marked for delete.\n" @@ -4759,7 +4759,7 @@ msgstr "La partició ha fallat.\n" #: winerror.mc:1326 msgid "Invalid block length.\n" -msgstr "La longitud de bloc és invàlida.\n" +msgstr "La longitud de bloc no és vàlida.\n" #: winerror.mc:1331 msgid "Device not partitioned.\n" @@ -4895,7 +4895,7 @@ msgstr "Aplicació de mode real.\n" #: winerror.mc:1496 msgid "Invalid DLL.\n" -msgstr "La DLL és invàlida.\n" +msgstr "La DLL no és vàlida.\n" #: winerror.mc:1501 msgid "No associated application.\n" @@ -4923,11 +4923,11 @@ msgstr "L'element font està buit.\n" #: winerror.mc:1531 msgid "The destination element is full.\n" -msgstr "L'element destinatari està ple.\n" +msgstr "L'element de destinació està ple.\n" #: winerror.mc:1536 msgid "The element address is invalid.\n" -msgstr "L'adreça d'element és invàlida.\n" +msgstr "L'adreça d'element no és vàlida.\n" #: winerror.mc:1541 msgid "The magazine is not present.\n" @@ -5003,7 +5003,7 @@ msgstr "L'entrada de journal s'ha suprimit.\n" #: winerror.mc:1631 msgid "Invalid device name.\n" -msgstr "El nom de dispositiu és invàlid.\n" +msgstr "El nom de dispositiu no és vàlid.\n" #: winerror.mc:1636 msgid "Connection unavailable.\n" @@ -5019,7 +5019,7 @@ msgstr "No hi ha cap xarxa o el camí és dolent.\n" #: winerror.mc:1651 msgid "Invalid network provider name.\n" -msgstr "El nom de proveïdor de xarxa és invàlid.\n" +msgstr "El nom de proveïdor de xarxa no és vàlid.\n" #: winerror.mc:1656 msgid "Cannot open network connection profile.\n" @@ -5039,39 +5039,39 @@ msgstr "Hi ha hagut un error estès.\n" #: winerror.mc:1676 msgid "Invalid group name.\n" -msgstr "El nom de grup és invàlid.\n" +msgstr "El nom de grup no és vàlid.\n" #: winerror.mc:1681 msgid "Invalid computer name.\n" -msgstr "El nom d'ordinador és invàlid.\n" +msgstr "El nom d'ordinador no és vàlid.\n" #: winerror.mc:1686 msgid "Invalid event name.\n" -msgstr "El nom d'esdeveniment és invàlid.\n" +msgstr "El nom d'esdeveniment no és vàlid.\n" #: winerror.mc:1691 msgid "Invalid domain name.\n" -msgstr "El nom de domini és invàlid.\n" +msgstr "El nom de domini no és vàlid.\n" #: winerror.mc:1696 msgid "Invalid service name.\n" -msgstr "El nom de servei és invàlid.\n" +msgstr "El nom de servei no és vàlid.\n" #: winerror.mc:1701 msgid "Invalid network name.\n" -msgstr "El nom de xarxa és invàlid.\n" +msgstr "El nom de xarxa no és vàlid.\n" #: winerror.mc:1706 msgid "Invalid share name.\n" -msgstr "El nom de compartició és invàlid.\n" +msgstr "El nom de compartició no és vàlid.\n" #: winerror.mc:1716 msgid "Invalid message name.\n" -msgstr "El nom de missatge és invàlid.\n" +msgstr "El nom de missatge no és vàlid.\n" #: winerror.mc:1721 msgid "Invalid message destination.\n" -msgstr "La destinació de missatge és invàlida.\n" +msgstr "La destinació de missatge no és vàlida.\n" #: winerror.mc:1726 msgid "Session credential conflict.\n" @@ -5115,7 +5115,7 @@ msgstr "L'adreça no està associada amb el punt final de transport.\n" #: winerror.mc:1776 msgid "Connection invalid.\n" -msgstr "La connexió és invàlida.\n" +msgstr "La connexió no és vàlida.\n" #: winerror.mc:1781 msgid "Connection is active.\n" @@ -5211,7 +5211,7 @@ msgstr "Realitza l'operació encara que no hagi canviat res.\n" #: winerror.mc:1896 msgid "The user profile is invalid.\n" -msgstr "El perfil d'usuari és invàlid.\n" +msgstr "El perfil d'usuari no és vàlid.\n" #: winerror.mc:1901 msgid "Not supported on Small Business Server.\n" @@ -5223,7 +5223,7 @@ msgstr "No tots els privilegis estan assignats.\n" #: winerror.mc:1911 msgid "Some security IDs not mapped.\n" -msgstr "Algunes ID de seguretat no estan assignades.\n" +msgstr "Alguns ID de seguretat no estan assignats.\n" #: winerror.mc:1916 msgid "No quotas for account.\n" @@ -5247,11 +5247,11 @@ msgstr "Els nivells de revisió són incompatibles.\n" #: winerror.mc:1941 msgid "Invalid owner.\n" -msgstr "El propietari és invàlid.\n" +msgstr "El propietari no és vàlid.\n" #: winerror.mc:1946 msgid "Invalid primary group.\n" -msgstr "El grup primari és invàlid.\n" +msgstr "El grup principal no és vàlid.\n" #: winerror.mc:1951 msgid "No impersonation token.\n" @@ -5279,7 +5279,7 @@ msgstr "No es té el privilegi.\n" #: winerror.mc:1981 msgid "Invalid account name.\n" -msgstr "El nom del compte és invàlid.\n" +msgstr "El nom del compte no és vàlid.\n" #: winerror.mc:1986 msgid "User already exists.\n" @@ -5331,11 +5331,11 @@ msgstr "Hi ha una restricció de compte.\n" #: winerror.mc:2046 msgid "Invalid logon hours.\n" -msgstr "Les hores de sessió són invàlides.\n" +msgstr "Les hores de sessió no són vàlides.\n" #: winerror.mc:2051 msgid "Invalid workstation.\n" -msgstr "L'estació de treball és invàlida.\n" +msgstr "L'estació de treball no és vàlida.\n" #: winerror.mc:2056 msgid "Password expired.\n" @@ -5355,23 +5355,23 @@ msgstr "S'han sol·licitat massa LUID.\n" #: winerror.mc:2076 msgid "LUIDs exhausted.\n" -msgstr "S'han acabat les LUID.\n" +msgstr "S'han acabat els LUID.\n" #: winerror.mc:2081 msgid "Invalid sub authority.\n" -msgstr "La subautoritat és invàlida.\n" +msgstr "La subautoritat no és vàlida.\n" #: winerror.mc:2086 msgid "Invalid ACL.\n" -msgstr "L'ACL és invàlida.\n" +msgstr "L'ACL no és vàlida.\n" #: winerror.mc:2091 msgid "Invalid SID.\n" -msgstr "L'SID és invàlid.\n" +msgstr "L'SID no és vàlid.\n" #: winerror.mc:2096 msgid "Invalid security descriptor.\n" -msgstr "El descriptor de seguretat és invàlid.\n" +msgstr "El descriptor de seguretat no és vàlid.\n" #: winerror.mc:2101 msgid "Bad inherited ACL.\n" @@ -5387,7 +5387,7 @@ msgstr "El servidor no està inhabilitat.\n" #: winerror.mc:2116 msgid "Invalid ID authority.\n" -msgstr "L'autoritat d'ID és invàlida.\n" +msgstr "L'autoritat d'ID no és vàlida.\n" #: winerror.mc:2121 msgid "Allotted space exceeded.\n" @@ -5395,7 +5395,7 @@ msgstr "S'ha superat l'espai assignat.\n" #: winerror.mc:2126 msgid "Invalid group attributes.\n" -msgstr "Els atributs de grup són invàlids.\n" +msgstr "Els atributs de grup no són vàlids.\n" #: winerror.mc:2131 msgid "Bad impersonation level.\n" @@ -5423,15 +5423,15 @@ msgstr "No es pot accedir a la informació de domini.\n" #: winerror.mc:2161 msgid "Invalid server state.\n" -msgstr "L'estat de servidor és invàlid.\n" +msgstr "L'estat de servidor no és vàlid.\n" #: winerror.mc:2166 msgid "Invalid domain state.\n" -msgstr "L'estat de domini és invàlid.\n" +msgstr "L'estat de domini no és vàlid.\n" #: winerror.mc:2171 msgid "Invalid domain role.\n" -msgstr "El paper de domini és invàlid.\n" +msgstr "El rol de domini no és vàlid.\n" #: winerror.mc:2176 msgid "No such domain.\n" @@ -5483,7 +5483,7 @@ msgstr "Hi ha hagut una col·lisió d'ID de sessió d'inici.\n" #: winerror.mc:2236 msgid "Invalid logon type.\n" -msgstr "El tipus d'inici de sessió és invàlid.\n" +msgstr "El tipus d'inici de sessió no és vàlid.\n" #: winerror.mc:2241 msgid "Cannot impersonate.\n" @@ -5491,7 +5491,7 @@ msgstr "No es pot suplantar.\n" #: winerror.mc:2246 msgid "Invalid transaction state.\n" -msgstr "L'estat de transacció és invàlid.\n" +msgstr "L'estat de transacció no és vàlid.\n" #: winerror.mc:2251 msgid "Security DB commit failure.\n" @@ -5511,7 +5511,7 @@ msgstr "L'usuari és integrat.\n" #: winerror.mc:2271 msgid "Group is primary for user.\n" -msgstr "El grup és el primari per a l'usuari.\n" +msgstr "El grup és el principal per a l'usuari.\n" #: winerror.mc:2276 msgid "Token already in use.\n" @@ -5563,7 +5563,7 @@ msgstr "No hi ha tal membre.\n" #: winerror.mc:2341 msgid "Invalid member.\n" -msgstr "El membre és invàlid.\n" +msgstr "El membre no és vàlid.\n" #: winerror.mc:2346 msgid "Too many SIDs.\n" @@ -5595,7 +5595,7 @@ msgstr "S'ha superat la quota de llicència.\n" #: winerror.mc:2381 msgid "Wrong target name.\n" -msgstr "El nom del destinatari és incorrecte.\n" +msgstr "El nom de la destinació és incorrecte.\n" #: winerror.mc:2386 msgid "Mutual authentication failed.\n" @@ -5607,27 +5607,27 @@ msgstr "Hi ha una asimetria de temps entre el client i el servidor.\n" #: winerror.mc:2396 msgid "Invalid window handle.\n" -msgstr "L'identificador de finestra és invàlid.\n" +msgstr "L'identificador de finestra no és vàlid.\n" #: winerror.mc:2401 msgid "Invalid menu handle.\n" -msgstr "L'identificador de menú és invàlid.\n" +msgstr "L'identificador de menú no és vàlid.\n" #: winerror.mc:2406 msgid "Invalid cursor handle.\n" -msgstr "L'identificador de cursor és invàlid.\n" +msgstr "L'identificador de cursor no és vàlid.\n" #: winerror.mc:2411 msgid "Invalid accelerator table handle.\n" -msgstr "L'identificador de taula acceleradora és invàlid.\n" +msgstr "L'identificador de taula acceleradora no és vàlid.\n" #: winerror.mc:2416 msgid "Invalid hook handle.\n" -msgstr "L'identificador de ganxo és invàlid.\n" +msgstr "L'identificador de ganxo no és vàlid.\n" #: winerror.mc:2421 msgid "Invalid DWP handle.\n" -msgstr "L'identificador DWP és invàlid.\n" +msgstr "L'identificador DWP no és vàlid.\n" #: winerror.mc:2426 msgid "Can't create top-level child window.\n" @@ -5659,11 +5659,11 @@ msgstr "La classe té finestres obertes.\n" #: winerror.mc:2461 msgid "Invalid index.\n" -msgstr "L'índex és invàlid.\n" +msgstr "L'índex no és vàlid.\n" #: winerror.mc:2466 msgid "Invalid icon handle.\n" -msgstr "L'identificador d'icona és invàlid.\n" +msgstr "L'identificador d'icona no és vàlid.\n" #: winerror.mc:2471 msgid "Private dialog index.\n" @@ -5671,7 +5671,7 @@ msgstr "L'índex de diàleg és privat.\n" #: winerror.mc:2476 msgid "List box ID not found.\n" -msgstr "No s'ha trobat l'ID de caixa de llista.\n" +msgstr "No s'ha trobat l'ID de quadre de llista.\n" #: winerror.mc:2481 msgid "No wildcard characters.\n" @@ -5695,7 +5695,7 @@ msgstr "No s'ha trobat l'ID de control.\n" #: winerror.mc:2506 msgid "Invalid combo box message.\n" -msgstr "El missatge de quadre combinat és invàlid.\n" +msgstr "El missatge de quadre combinat no és vàlid.\n" #: winerror.mc:2511 msgid "Not a combo box window.\n" @@ -5703,7 +5703,7 @@ msgstr "No és finestra de quadre combinat.\n" #: winerror.mc:2516 msgid "Invalid edit height.\n" -msgstr "L'altura d'edició és invàlida.\n" +msgstr "L'altura d'edició no és vàlida.\n" #: winerror.mc:2521 msgid "DC not found.\n" @@ -5711,11 +5711,11 @@ msgstr "No s'ha trobat el DC.\n" #: winerror.mc:2526 msgid "Invalid hook filter.\n" -msgstr "El filtre de ganxo és invàlid.\n" +msgstr "El filtre de ganxo no és vàlid.\n" #: winerror.mc:2531 msgid "Invalid filter procedure.\n" -msgstr "El procediment de filtre és invàlid.\n" +msgstr "El procediment de filtre no és vàlid.\n" #: winerror.mc:2536 msgid "Hook procedure needs module handle.\n" @@ -5735,15 +5735,15 @@ msgstr "El procediment de ganxo no està instal·lat.\n" #: winerror.mc:2556 msgid "Invalid list box message.\n" -msgstr "El missatge de caixa de llista és invàlid.\n" +msgstr "El missatge de quadre de llista no és vàlid.\n" #: winerror.mc:2561 msgid "Invalid LB_SETCOUNT sent.\n" -msgstr "S'ha enviat un LB_SETCOUNT invàlid.\n" +msgstr "S'ha enviat un LB_SETCOUNT no vàlid.\n" #: winerror.mc:2566 msgid "No tab stops on this list box.\n" -msgstr "No hi ha cap tabulador que s'aturi en aquesta caixa de llista.\n" +msgstr "No hi ha cap tabulador que s'aturi en aquest quadre de llista.\n" #: winerror.mc:2571 msgid "Can't destroy object owned by another thread.\n" @@ -5759,11 +5759,11 @@ msgstr "La finestra no té menú de sistema.\n" #: winerror.mc:2586 msgid "Invalid message box style.\n" -msgstr "L'estil de quadre de missatge és invàlid.\n" +msgstr "L'estil de quadre de missatge no és vàlid.\n" #: winerror.mc:2591 msgid "Invalid SPI parameter.\n" -msgstr "El paràmetre SPI és invàlid.\n" +msgstr "El paràmetre SPI no és vàlid.\n" #: winerror.mc:2596 msgid "Screen already locked.\n" @@ -5779,11 +5779,11 @@ msgstr "No és finestra filla.\n" #: winerror.mc:2611 msgid "Invalid GW command.\n" -msgstr "L'ordre GW és invàlid.\n" +msgstr "L'ordre GW no és vàlida.\n" #: winerror.mc:2616 msgid "Invalid thread ID.\n" -msgstr "L'ID de fil és invàlid.\n" +msgstr "L'ID de fil no és vàlid.\n" #: winerror.mc:2621 msgid "Not an MDI child window.\n" @@ -5799,11 +5799,11 @@ msgstr "No hi ha cap barra de desplaçament.\n" #: winerror.mc:2636 msgid "Invalid scrollbar range.\n" -msgstr "L'interval de desplaçament és invàlid.\n" +msgstr "L'interval de desplaçament no és vàlid.\n" #: winerror.mc:2641 msgid "Invalid ShowWin command.\n" -msgstr "L'ordre ShowWin és invàlid.\n" +msgstr "L'ordre ShowWin no és vàlida.\n" #: winerror.mc:2646 msgid "No system resources.\n" @@ -5835,7 +5835,7 @@ msgstr "No s'ha trobat l'element de menú.\n" #: winerror.mc:2681 msgid "Invalid keyboard handle.\n" -msgstr "L'identificador de teclat és invàlid.\n" +msgstr "L'identificador de teclat no és vàlid.\n" #: winerror.mc:2686 msgid "Hook type not allowed.\n" @@ -5851,7 +5851,7 @@ msgstr "S'ha superat el temps d'espera.\n" #: winerror.mc:2701 msgid "Invalid monitor handle.\n" -msgstr "L'identificador de monitor és invàlid.\n" +msgstr "L'identificador de monitor no és vàlid.\n" #: winerror.mc:2706 msgid "Event log file corrupt.\n" @@ -5903,7 +5903,7 @@ msgstr "La propietat és desconeguda.\n" #: winerror.mc:2766 msgid "Invalid handle state.\n" -msgstr "L'estat d'identificador és invàlid.\n" +msgstr "L'estat d'identificador no és vàlid.\n" #: winerror.mc:2771 msgid "Bad configuration.\n" @@ -5927,11 +5927,11 @@ msgstr "S'ha desinstal·lat el producte.\n" #: winerror.mc:2796 msgid "Invalid query syntax.\n" -msgstr "La sintaxi de consulta és invàlida.\n" +msgstr "La sintaxi de consulta no és vàlida.\n" #: winerror.mc:2801 msgid "Invalid field.\n" -msgstr "El camp és invàlid.\n" +msgstr "El camp no és vàlid.\n" #: winerror.mc:2806 msgid "Device removed.\n" @@ -5947,7 +5947,7 @@ msgstr "El paquet d'instal·lació ha fallat en obrir.\n" #: winerror.mc:2821 msgid "Installation package is invalid.\n" -msgstr "El paquet d'instal·lació és invàlid.\n" +msgstr "El paquet d'instal·lació no és vàlid.\n" #: winerror.mc:2826 msgid "Installer user interface failed.\n" @@ -5979,7 +5979,7 @@ msgstr "La funció ha fallat.\n" #: winerror.mc:2861 msgid "Invalid table.\n" -msgstr "La taula és invàlida.\n" +msgstr "La taula no és vàlida.\n" #: winerror.mc:2866 msgid "Data type mismatch.\n" @@ -6011,7 +6011,7 @@ msgstr "S'ha fallat en obrir el paquet de pedaç.\n" #: winerror.mc:2901 msgid "Invalid patch package.\n" -msgstr "El paquet de pedaç és invàlid.\n" +msgstr "El paquet de pedaç no és vàlid.\n" #: winerror.mc:2906 msgid "Unsupported patch package.\n" @@ -6023,7 +6023,7 @@ msgstr "Una altra versió està instal·lada.\n" #: winerror.mc:2916 msgid "Invalid command line.\n" -msgstr "La línia d'ordres és invàlida.\n" +msgstr "La línia d'ordres no és vàlida.\n" #: winerror.mc:2921 msgid "Remote installation not allowed.\n" @@ -6035,15 +6035,15 @@ msgstr "S'ha iniciat un reinici després d'instal·lació amb èxit.\n" #: winerror.mc:2931 msgid "Invalid string binding.\n" -msgstr "El lligament de cadena és invàlid.\n" +msgstr "La vinculació de cadena no és vàlida.\n" #: winerror.mc:2936 msgid "Wrong kind of binding.\n" -msgstr "El tipus de lligament és incorrecte.\n" +msgstr "El tipus de vinculació és incorrecte.\n" #: winerror.mc:2941 msgid "Invalid binding.\n" -msgstr "El lligament és invàlid.\n" +msgstr "La vinculació no és vàlida.\n" #: winerror.mc:2946 msgid "RPC protocol sequence not supported.\n" @@ -6051,19 +6051,19 @@ msgstr "La seqüència de protocol RPC no és compatible.\n" #: winerror.mc:2951 msgid "Invalid RPC protocol sequence.\n" -msgstr "La seqüència de protocol RPC és invàlida.\n" +msgstr "La seqüència de protocol RPC no és vàlida.\n" #: winerror.mc:2956 msgid "Invalid string UUID.\n" -msgstr "L'UUID de cadena és invàlida.\n" +msgstr "L'UUID de cadena no és vàlid.\n" #: winerror.mc:2961 msgid "Invalid endpoint format.\n" -msgstr "El format de punt final és invàlid.\n" +msgstr "El format de punt final no és vàlid.\n" #: winerror.mc:2966 msgid "Invalid network address.\n" -msgstr "L'adreça de xarxa és invàlida.\n" +msgstr "L'adreça de xarxa no és vàlida.\n" #: winerror.mc:2971 msgid "No endpoint found.\n" @@ -6071,7 +6071,7 @@ msgstr "No s'ha trobat cap punt final.\n" #: winerror.mc:2976 msgid "Invalid timeout value.\n" -msgstr "El valor de temps d'espera és invàlid.\n" +msgstr "El valor de temps d'espera no és vàlid.\n" #: winerror.mc:2981 msgid "Object UUID not found.\n" @@ -6107,7 +6107,7 @@ msgstr "La interfície és desconeguda.\n" #: winerror.mc:3021 msgid "No bindings.\n" -msgstr "No hi ha cap lligament.\n" +msgstr "No hi ha cap vinculació.\n" #: winerror.mc:3026 msgid "No protocol sequences.\n" @@ -6131,7 +6131,7 @@ msgstr "El servidor RPC està massa ocupat.\n" #: winerror.mc:3051 msgid "Invalid network options.\n" -msgstr "Les opcions de xarxa són invàlides.\n" +msgstr "Les opcions de xarxa no són vàlides.\n" #: winerror.mc:3056 msgid "No RPC call active.\n" @@ -6155,11 +6155,11 @@ msgstr "La sintaxi de transferència és incompatible.\n" #: winerror.mc:3086 msgid "Invalid tag.\n" -msgstr "L'etiqueta és invàlida.\n" +msgstr "L'etiqueta no és vàlida.\n" #: winerror.mc:3091 msgid "Invalid array bounds.\n" -msgstr "Els límits de vector són invàlids.\n" +msgstr "Els límits de vector no són vàlids.\n" #: winerror.mc:3096 msgid "No entry name.\n" @@ -6167,7 +6167,7 @@ msgstr "No hi ha cap nom d'entrada.\n" #: winerror.mc:3101 msgid "Invalid name syntax.\n" -msgstr "La sintaxi de nom és invàlid.\n" +msgstr "La sintaxi de nom no és vàlida.\n" #: winerror.mc:3106 msgid "Unsupported name syntax.\n" @@ -6199,11 +6199,11 @@ msgstr "No s'ha trobat la seqüència de protocol.\n" #: winerror.mc:3141 msgid "Procedure number out of range.\n" -msgstr "El nombre de procediment és fora d'interval.\n" +msgstr "El número de procediment és fora d'interval.\n" #: winerror.mc:3146 msgid "Binding has no authentication data.\n" -msgstr "El lligament no té dades d'autenticació.\n" +msgstr "La vinculació no té dades d'autenticació.\n" #: winerror.mc:3151 msgid "Unknown authentication service.\n" @@ -6215,7 +6215,7 @@ msgstr "El nivell d'autenticació és desconegut.\n" #: winerror.mc:3161 msgid "Invalid authentication identity.\n" -msgstr "La identitat d'autenticació és invàlid.\n" +msgstr "La identitat d'autenticació no és vàlida.\n" #: winerror.mc:3166 msgid "Unknown authorization service.\n" @@ -6223,7 +6223,7 @@ msgstr "El servei d'autorització és desconegut.\n" #: winerror.mc:3171 msgid "Invalid entry.\n" -msgstr "L'entrada és invàlida.\n" +msgstr "L'entrada no és vàlida.\n" #: winerror.mc:3176 msgid "Can't perform operation.\n" @@ -6243,7 +6243,7 @@ msgstr "El nom és incomplet.\n" #: winerror.mc:3196 msgid "Invalid version option.\n" -msgstr "L'opció de versió és invàlida.\n" +msgstr "L'opció de versió no és vàlida.\n" #: winerror.mc:3201 msgid "No more members.\n" @@ -6271,7 +6271,7 @@ msgstr "El servei de noms no està disponible.\n" #: winerror.mc:3231 msgid "Invalid network address family.\n" -msgstr "La família d'adreces de xarxa és invàlida.\n" +msgstr "La família d'adreces de xarxa no és vàlida.\n" #: winerror.mc:3236 msgid "Operation not supported.\n" @@ -6327,7 +6327,7 @@ msgstr "L'identificador de context és danyat.\n" #: winerror.mc:3301 msgid "Binding handle mismatch.\n" -msgstr "Els identificadors de lligament no es coincideixen.\n" +msgstr "Els identificadors de vinculació no es coincideixen.\n" #: winerror.mc:3306 msgid "Cannot get call handle.\n" @@ -6351,7 +6351,7 @@ msgstr "Les dades d'esbós (stub) són dolentes.\n" #: winerror.mc:3331 msgid "Invalid user buffer.\n" -msgstr "La memòria intermèdia d'usuari és invàlida.\n" +msgstr "La memòria intermèdia d'usuari no és vàlida.\n" #: winerror.mc:3336 msgid "Unrecognized media.\n" @@ -6411,15 +6411,15 @@ msgstr "El processador d'impressió és desconegut.\n" #: winerror.mc:3406 msgid "Invalid separator file.\n" -msgstr "El fitxer separador és invàlid.\n" +msgstr "El fitxer separador no és vàlid.\n" #: winerror.mc:3411 msgid "Invalid priority.\n" -msgstr "La prioritat és invàlida.\n" +msgstr "La prioritat no és vàlida.\n" #: winerror.mc:3416 msgid "Invalid printer name.\n" -msgstr "El nom d'impressora és invàlid.\n" +msgstr "El nom d'impressora no és vàlid.\n" #: winerror.mc:3421 msgid "Printer already exists.\n" @@ -6427,19 +6427,19 @@ msgstr "La impressora ja existeix.\n" #: winerror.mc:3426 msgid "Invalid printer command.\n" -msgstr "L'ordre d'impressora és invàlid.\n" +msgstr "L'ordre d'impressora no és vàlida.\n" #: winerror.mc:3431 msgid "Invalid data type.\n" -msgstr "El tipus de dades és invàlid.\n" +msgstr "El tipus de dades no és vàlid.\n" #: winerror.mc:3436 msgid "Invalid environment.\n" -msgstr "L'entorn és invàlid.\n" +msgstr "L'entorn no és vàlid.\n" #: winerror.mc:3441 msgid "No more bindings.\n" -msgstr "No hi ha més lligaments.\n" +msgstr "No hi ha més vinculacions.\n" #: winerror.mc:3446 msgid "Can't log on with inter-domain trust account.\n" @@ -6493,7 +6493,7 @@ msgstr "S'ha cancel·lat la trucada RPC.\n" #: winerror.mc:3506 msgid "Binding incomplete.\n" -msgstr "El lligament està incomplet.\n" +msgstr "La vinculació està incompleta.\n" #: winerror.mc:3511 msgid "RPC comm failure.\n" @@ -6525,7 +6525,7 @@ msgstr "No s'ha cancel·lat el fil.\n" #: winerror.mc:3546 msgid "Invalid handle operation.\n" -msgstr "L'operació d'identificador és invàlida.\n" +msgstr "L'operació d'identificador no és vàlida.\n" #: winerror.mc:3551 msgid "Wrong serializing package version.\n" @@ -6537,11 +6537,11 @@ msgstr "La versió d'esbós (stub) és incorrecta.\n" #: winerror.mc:3561 msgid "Invalid pipe object.\n" -msgstr "L'objecte de canonada és invàlid.\n" +msgstr "L'objecte de canonada no és vàlid.\n" #: winerror.mc:3566 msgid "Wrong pipe order.\n" -msgstr "L'ordre de canonada és incorrecte.\n" +msgstr "L'ordre de canonada és incorrecta.\n" #: winerror.mc:3571 msgid "Wrong pipe version.\n" @@ -6557,19 +6557,19 @@ msgstr "No es pot crear la DB assignadora de punts finals.\n" #: winerror.mc:3586 msgid "Invalid object.\n" -msgstr "L'objecte és invàlid.\n" +msgstr "L'objecte no és vàlid.\n" #: winerror.mc:3591 msgid "Invalid time.\n" -msgstr "L'hora és invàlida.\n" +msgstr "L'hora no és vàlida.\n" #: winerror.mc:3596 msgid "Invalid form name.\n" -msgstr "El nom de forma és invàlid.\n" +msgstr "El nom de forma no és vàlid.\n" #: winerror.mc:3601 msgid "Invalid form size.\n" -msgstr "La mida de forma és invàlida.\n" +msgstr "La mida de forma no és vàlida.\n" #: winerror.mc:3606 msgid "Already awaiting printer handle.\n" @@ -6581,7 +6581,7 @@ msgstr "S'ha suprimit la impressora.\n" #: winerror.mc:3616 msgid "Invalid printer state.\n" -msgstr "L'estat d'impressora és invàlid.\n" +msgstr "L'estat d'impressora no és vàlid.\n" #: winerror.mc:3621 msgid "User must change password.\n" @@ -6597,15 +6597,15 @@ msgstr "El compte està bloquejat.\n" #: winerror.mc:3636 msgid "Invalid pixel format.\n" -msgstr "El format de píxels és invàlid.\n" +msgstr "El format de píxels no és vàlid.\n" #: winerror.mc:3641 msgid "Invalid driver.\n" -msgstr "El controlador és invàlid.\n" +msgstr "El controlador no és vàlid.\n" #: winerror.mc:3646 msgid "Invalid object resolver set.\n" -msgstr "El conjunt de resolució d'objectes és invàlid.\n" +msgstr "El conjunt de resolució d'objectes no és vàlid.\n" #: winerror.mc:3651 msgid "Incomplete RPC send.\n" @@ -6613,11 +6613,11 @@ msgstr "L'enviament RPC està incomplet.\n" #: winerror.mc:3656 msgid "Invalid asynchronous RPC handle.\n" -msgstr "L'identificador RPC asíncron és invàlid.\n" +msgstr "L'identificador RPC asíncron no és vàlid.\n" #: winerror.mc:3661 msgid "Invalid asynchronous RPC call.\n" -msgstr "La trucada RPC asíncrona és invàlida.\n" +msgstr "La trucada RPC asíncrona no és vàlida.\n" #: winerror.mc:3666 msgid "RPC pipe closed.\n" @@ -6908,320 +6908,258 @@ msgid "choose which folder contains %s" msgstr "trieu quina carpeta conté %s" #: msi.rc:90 -#, fuzzy -#| msgid "No registry log space.\n" msgid "Allocating registry space" -msgstr "No hi ha espai per al registre del registre.\n" +msgstr "S'està assignant espai en el registre" #: msi.rc:91 -#, fuzzy -#| msgid "Single-instance application.\n" msgid "Searching for installed applications" -msgstr "Aplicació d'instància única.\n" +msgstr "S'estan cercant aplicacions instalades" #: msi.rc:92 msgid "Binding executables" -msgstr "" +msgstr "S'estan vinculant els executables" #: msi.rc:93 msi.rc:136 -#, fuzzy -#| msgid "Searching for %s" msgid "Searching for qualifying products" -msgstr "S'està cercant %s" +msgstr "S'estan cercant productes qualificants" #: msi.rc:94 msi.rc:95 msi.rc:100 msgid "Computing space requirements" -msgstr "" +msgstr "S'estan computant els requeriments d'espai" #: msi.rc:96 -#, fuzzy -#| msgid "Target folder" msgid "Creating folders" -msgstr "Carpeta de destinació" +msgstr "S'estan creant carpetes" #: msi.rc:97 -#, fuzzy -#| msgid "Create Shor&tcut" msgid "Creating shortcuts" -msgstr "Crea &una drecera" +msgstr "S'estan creant dreceres" #: msi.rc:98 -#, fuzzy -#| msgid "Exception in service.\n" msgid "Deleting services" -msgstr "Hi ha hagut una excepció en el servei.\n" +msgstr "S'estan eliminant serveis" #: msi.rc:99 -#, fuzzy -#| msgid "Creation date" msgid "Creating duplicate files" -msgstr "Data de creació" +msgstr "S'estan creant fitxers duplicats" #: msi.rc:101 -#, fuzzy -#| msgid "No associated application.\n" msgid "Searching for related applications" -msgstr "Cap aplicació està associada.\n" +msgstr "S'estan cercant aplicacions relacionades" #: msi.rc:102 msgid "Copying network install files" -msgstr "" +msgstr "S'estan copiant els fitxers d'instal·lació de xarxa" #: msi.rc:103 -#, fuzzy -#| msgid "Copying Files..." msgid "Copying new files" -msgstr "S'estan copiant els fitxers..." +msgstr "S'estan copiant els fitxers nous" #: msi.rc:104 -#, fuzzy -#| msgid "Installation of component failed: %08x" msgid "Installing ODBC components" -msgstr "La instal·lació del component ha fallat: %08x" +msgstr "S'estan instal·lant components ODBC" #: msi.rc:105 -#, fuzzy -#| msgid "Installer service failed.\n" msgid "Installing new services" -msgstr "El servei d'instal·lació ha fallat.\n" +msgstr "S'estan instal·lant els serveis nous" #: msi.rc:106 -#, fuzzy -#| msgid "Install/Uninstall" msgid "Installing system catalog" -msgstr "Instal·la/desinstal·la" +msgstr "S'està instal·lant el catàleg de sistema" #: msi.rc:107 -#, fuzzy -#| msgid "Wine Application Uninstaller" msgid "Validating install" -msgstr "Desinstal·lador d'Aplicacions del Wine" +msgstr "S'està validant l'instalació" #: msi.rc:108 msgid "Evaluating launch conditions" -msgstr "" +msgstr "S'estan avaluant les condicions d'execució" #: msi.rc:109 msgid "Migrating feature states from related applications" msgstr "" +"S'estan migrant els estats de les característiques des de les aplicacions " +"relacionades" #: msi.rc:110 -#, fuzzy -#| msgid "Icon files" msgid "Moving files" -msgstr "Fitxers d'icona" +msgstr "S'estan movent fixters" #: msi.rc:111 -#, fuzzy -#| msgid "Version information" msgid "Publishing assembly information" -msgstr "Informació de versió" +msgstr "S'està publicant informació de assemblatge" #: msi.rc:112 msgid "Unpublishing assembly information" -msgstr "" +msgstr "S'està despublicant la informació d'assemblatge" #: msi.rc:113 -#, fuzzy -#| msgid "Icon files" msgid "Patching files" -msgstr "Fitxers d'icona" +msgstr "S'estan apedaçant fitxers" #: msi.rc:114 msgid "Updating component registration" -msgstr "" +msgstr "S'està actualitzant la registració de component" #: msi.rc:115 msgid "Publishing Qualified Components" -msgstr "" +msgstr "S'estan publicant els components qualificats" #: msi.rc:116 msgid "Publishing Product Features" -msgstr "" +msgstr "S'estan publicant les característiques de producte" #: msi.rc:117 -#, fuzzy -#| msgid "Client Information" msgid "Publishing product information" -msgstr "Informació de client" +msgstr "S'està publicant la informació de producte" #: msi.rc:118 msgid "Registering Class servers" -msgstr "" +msgstr "S'estan registrant els servidors de classe" #: msi.rc:119 msgid "Registering COM+ Applications and Components" -msgstr "" +msgstr "S'estan registrant les aplicacions i els components COM+" #: msi.rc:120 msgid "Registering extension servers" -msgstr "" +msgstr "S'estan registrant els servidors d'extensió" #: msi.rc:121 msgid "Registering fonts" -msgstr "" +msgstr "S'estan registrant els tipus de lletra" #: msi.rc:122 -#, fuzzy -#| msgid "Registry Editor" msgid "Registering MIME info" -msgstr "Editor de Registre" +msgstr "S'està registrant la informació MIME" #: msi.rc:123 -#, fuzzy -#| msgid "Registry is corrupt.\n" msgid "Registering product" -msgstr "El registre està corrupte.\n" +msgstr "S'està registrant el producte" #: msi.rc:124 msgid "Registering program identifiers" -msgstr "" +msgstr "S'estan registrant els identificadors de programa" #: msi.rc:125 -#, fuzzy -#| msgid "Type Libraries" msgid "Registering type libraries" -msgstr "Biblioteques de tipus" +msgstr "S'estan registrant les biblioteques de tipus" #: msi.rc:126 -#, fuzzy -#| msgid "Resource in use.\n" msgid "Registering user" -msgstr "El recurs està en ús.\n" +msgstr "S'està registrant l'usuari" #: msi.rc:127 -#, fuzzy -#| msgid "&Remove duplicates" msgid "Removing duplicated files" -msgstr "&Elimina els duplicats" +msgstr "S'estan eliminant els fitxers duplicats" #: msi.rc:128 msi.rc:152 -#, fuzzy -#| msgid "Applying font settings" msgid "Updating environment strings" -msgstr "S'està aplicant la configuració de lletra" +msgstr "S'estan actualitzant les cadenes d'entorn" #: msi.rc:129 -#, fuzzy -#| msgid "&Remove application" msgid "Removing applications" -msgstr "&Elimina aplicació" +msgstr "S'estan eliminant les aplicacions" #: msi.rc:130 -#, fuzzy -#| msgid "Icon files" msgid "Removing files" -msgstr "Fitxers d'icona" +msgstr "S'estan eliminant els fitxers" #: msi.rc:131 msgid "Removing folders" -msgstr "" +msgstr "S'estan eliminant les carpetes" #: msi.rc:132 msgid "Removing INI files entries" -msgstr "" +msgstr "S'estan eliminant les entrades en els fitxers INI" #: msi.rc:133 -#, fuzzy -#| msgid "Domain Component" msgid "Removing ODBC components" -msgstr "Component de domini" +msgstr "S'estan eliminant els components ODBC" #: msi.rc:134 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Removing system registry values" -msgstr "regedit: No s'ha pogut obrir la clau de registre '%1'.\n" +msgstr "S'estan eliminant els valors del registre de sistema" #: msi.rc:135 msgid "Removing shortcuts" -msgstr "" +msgstr "S'estan eliminant les dreceres" #: msi.rc:137 msgid "Registering modules" -msgstr "" +msgstr "S'estan registrant els mòduls" #: msi.rc:138 msgid "Unregistering modules" -msgstr "" +msgstr "S'estan desregistrant els mòduls" #: msi.rc:139 -#, fuzzy -#| msgid "Initializing; " msgid "Initializing ODBC directories" -msgstr "S'està inicialitzant; " +msgstr "S'estan inicialitzant els directoris ODBC" #: msi.rc:140 -#, fuzzy -#| msgid "Starting Wordpad failed" msgid "Starting services" -msgstr "L'inici del Wordpad ha fallat" +msgstr "S'estan iniciant serveis" #: msi.rc:141 -#, fuzzy -#| msgid "Stopping dependent service: %1\n" msgid "Stopping services" -msgstr "S'està aturant el servei dependent: %1\n" +msgstr "S'estan aturant els serveis" #: msi.rc:142 msgid "Unpublishing Qualified Components" -msgstr "" +msgstr "S'estan desregistrant els components qualificats" #: msi.rc:143 msgid "Unpublishing Product Features" -msgstr "" +msgstr "S'estan despublicant les característiques de producte" #: msi.rc:144 -#, fuzzy -#| msgid "Client Information" msgid "Unpublishing product information" -msgstr "Informació de client" +msgstr "S'està despublicant la informació de producte" #: msi.rc:145 msgid "Unregister Class servers" -msgstr "" +msgstr "S'estan desregistrant els servidors de classe" #: msi.rc:146 msgid "Unregistering COM+ Applications and Components" -msgstr "" +msgstr "S'estan desregistrant les aplicacions i els components COM+" #: msi.rc:147 msgid "Unregistering extension servers" -msgstr "" +msgstr "S'estan desregistrant els servidors d'extensió" #: msi.rc:148 msgid "Unregistering fonts" -msgstr "" +msgstr "S'estan desregistrant els tipus de lletra" #: msi.rc:149 msgid "Unregistering MIME info" -msgstr "" +msgstr "S'està desregistrant la informació MIME" #: msi.rc:150 msgid "Unregistering program identifiers" -msgstr "" +msgstr "S'estan desregistrant els identificadors de programa" #: msi.rc:151 msgid "Unregistering type libraries" -msgstr "" +msgstr "S'estan desregistrant les biblioteques de tipus" #: msi.rc:153 msgid "Writing INI files values" -msgstr "" +msgstr "S'estan escrivint valors als fitxers INI" #: msi.rc:154 -#, fuzzy -#| msgid "Warning: system library" msgid "Writing system registry values" -msgstr "Advertència: biblioteca de sistema" +msgstr "S'estan escrivint valors al registre del sistema" #: msi.rc:160 msgid "Free space: [1]" -msgstr "" +msgstr "Espai lliure: [1]" #: msi.rc:161 msgid "Property: [1], Signature: [2]" -msgstr "" +msgstr "Propietat: [1], Signatura: [2]" #: msi.rc:162 msgid "File: [1]" @@ -7233,73 +7171,63 @@ msgstr "Carpeta: [1]" #: msi.rc:164 msi.rc:193 msgid "Shortcut: [1]" -msgstr "" +msgstr "Drecera: [1]" #: msi.rc:165 msi.rc:196 msi.rc:197 -#, fuzzy -#| msgid "De&vice:" msgid "Service: [1]" -msgstr "&Dispositiu:" +msgstr "Servei: [1]" #: msi.rc:166 msi.rc:169 msi.rc:173 msgid "File: [1], Directory: [9], Size: [6]" -msgstr "" +msgstr "Fitxer: [1] Directori: [9], Mida: [6]" #: msi.rc:167 -#, fuzzy -#| msgid "application" msgid "Found application: [1]" -msgstr "aplicació" +msgstr "S'ha trobat una aplicació: [1]" #: msi.rc:168 msgid "File: [1], Directory: [9], Size: [6]" -msgstr "" +msgstr "Fitxer: [1] Directori: [9], Mida: [6]" #: msi.rc:170 -#, fuzzy -#| msgid "De&vice:" msgid "Service: [2]" -msgstr "&Dispositiu:" +msgstr "Servei: [2]" #: msi.rc:171 msgid "File: [1], Dependencies: [2]" -msgstr "" +msgstr "Fitxer: [1], Dependències: [2]" #: msi.rc:172 -#, fuzzy -#| msgid "Applications" msgid "Application: [1]" -msgstr "Aplicacions" +msgstr "Aplicació: [1]" #: msi.rc:174 msi.rc:175 msgid "Application Context:[1], Assembly Name:[2]" -msgstr "" +msgstr "Context d'aplicació:[1], Nom d'assemblatge:[2]" #: msi.rc:176 msgid "File: [1], Directory: [2], Size: [3]" -msgstr "" +msgstr "Fitxer: [1], Directori: [2], Mida: [3]" #: msi.rc:177 msi.rc:198 msgid "Component ID: [1], Qualifier: [2]" -msgstr "" +msgstr "ID de component: [1], Qualificador: [2]" #: msi.rc:178 msi.rc:199 msgid "Feature: [1]" -msgstr "" +msgstr "Característica: [1]" #: msi.rc:179 msi.rc:200 msgid "Class Id: [1]" -msgstr "" +msgstr "Id de classe: [1]" #: msi.rc:180 msgid "AppId: [1]{{, AppType: [2], Users: [3], RSN: [4]}}" -msgstr "" +msgstr "AppId: [1]{{, AppType: [2], Usuaris: [3], RSN: [4]}}" #: msi.rc:181 msi.rc:202 -#, fuzzy -#| msgid "Extensions Only" msgid "Extension: [1]" -msgstr "Només extensions" +msgstr "Extensió: [1]" #: msi.rc:182 msi.rc:203 msgid "Font: [1]" @@ -7307,63 +7235,63 @@ msgstr "Tipus de lletra: [1]" #: msi.rc:183 msi.rc:204 msgid "MIME Content Type: [1], Extension: [2]" -msgstr "" +msgstr "Tipus de contingut MIME: [1], Extensió: [2]" #: msi.rc:184 msi.rc:205 msgid "ProgId: [1]" -msgstr "" +msgstr "ProgId: [1]" #: msi.rc:185 msi.rc:206 msgid "LibID: [1]" -msgstr "" +msgstr "LibID: [1]" #: msi.rc:186 msi.rc:189 msgid "File: [1], Directory: [9]" -msgstr "" +msgstr "Fitxer: [1], Directori: [9]" #: msi.rc:187 msi.rc:207 msgid "Name: [1], Value: [2], Action [3]" -msgstr "" +msgstr "Nom: [1], Valor: [2], Acció [3]" #: msi.rc:188 msgid "Application: [1], Command line: [2]" -msgstr "" +msgstr "Aplicació: [1], Línia d'ordres: [2]" #: msi.rc:191 msi.rc:208 msgid "File: [1], Section: [2], Key: [3], Value: [4]" -msgstr "" +msgstr "Fitxer: [1], Secció: [2], Clau: [3], Valor: [4]" #: msi.rc:192 msgid "Key: [1], Name: [2]" -msgstr "" +msgstr "Clau: [1], Nom: [2]" #: msi.rc:194 msi.rc:195 msgid "File: [1], Folder: [2]" -msgstr "" +msgstr "Fitxer: [1], Carpeta: [2]" #: msi.rc:201 msgid "AppId: [1]{{, AppType: [2]}}" -msgstr "" +msgstr "AppId: [1]{{, AppType: [2]}}" #: msi.rc:209 msgid "Key: [1], Name: [2], Value: [3]" -msgstr "" +msgstr "Clau: [1], Nom: [2], Valor: [3]" #: msi.rc:71 msgid "{{Fatal error: }}" -msgstr "" +msgstr "{{Error fatal: }}" #: msi.rc:72 msgid "{{Error [1]. }}" -msgstr "" +msgstr "{{Error [1]. }}" #: msi.rc:73 msgid "Warning [1]." -msgstr "" +msgstr "Advertència [1]." #: msi.rc:74 msgid "Info [1]." -msgstr "" +msgstr "Informació [1]." #: msi.rc:75 msgid "" @@ -7371,40 +7299,45 @@ msgid "" "This may indicate a problem with this package. The error code is [1]. {{The " "arguments are: [2], [3], [4]}}" msgstr "" +"L'instal·lador s'ha topat amb un error inesperat en instal·lar aquest " +"paquet. Això pot indicar un problema amb aquest paquet. El codi d'error és " +"[1]. {{Els arguments són: [2], [3], [4]}}" #: msi.rc:76 msgid "{{Disk full: }}" -msgstr "{{El disc està ple: }}" +msgstr "{{Disc ple: }}" #: msi.rc:77 msgid "Action [Time]: [1]. [2]" -msgstr "" +msgstr "Acció [Time]: [1]. [2]" #: msi.rc:78 msgid "Message type: [1], Argument: [2]{, [3]}" -msgstr "" +msgstr "Tipus de missatge: [1], Argument: [2]{, [3]}" #: msi.rc:81 msgid "=== Logging started: [Date] [Time] ===" -msgstr "" +msgstr "=== S'ha començat el registre: [Date] [Time] ===" #: msi.rc:79 msgid "Action start [Time]: [1]." -msgstr "" +msgstr "Inici d'acció [Time]: [1]." #: msi.rc:80 msgid "Action ended [Time]: [1]. Return value [2]." -msgstr "" +msgstr "Fi d'acció [Time]: [1]. El valor retornat és [2]." #: msi.rc:83 msgid "Please insert the disk: [2]" -msgstr "" +msgstr "Si us plau, inseriu el disc: [2]" #: msi.rc:84 msgid "" "Source file not found{{(cabinet)}}: [2]. Verify that the file exists and " "that you can access it." msgstr "" +"No s'ha trobat el fitxer font{{(cabinet)}}: [2]. Verifiqueu que el fitxer " +"existeixi i que el podeu accedir." #: msrle32.rc:31 msgid "Wine MS-RLE video codec" @@ -7636,11 +7569,11 @@ msgstr "botó" #: oleacc.rc:75 msgid "check button" -msgstr "casella de verificació" +msgstr "casella de selecció" #: oleacc.rc:76 msgid "radio button" -msgstr "botó de ràdio" +msgstr "botó d'opció" #: oleacc.rc:77 msgid "combo box" @@ -7668,7 +7601,7 @@ msgstr "control lliscant" #: oleacc.rc:83 msgid "spin box" -msgstr "spinner" +msgstr "quadre de nombre" #: oleacc.rc:84 msgid "diagram" @@ -7940,7 +7873,7 @@ msgstr "Enganxada amb opcions" #: oledlg.rc:85 setupapi.rc:43 msgid "Source:" -msgstr "Origen:" +msgstr "Font:" #: oledlg.rc:86 shdoclc.rc:50 shdoclc.rc:82 shdoclc.rc:95 shdoclc.rc:135 #: shdoclc.rc:162 shdoclc.rc:186 user32.rc:62 wineconsole.rc:33 wordpad.rc:114 @@ -8902,8 +8835,6 @@ msgid "Wine Control Panel" msgstr "Tauler de Control del Wine" #: shell32.rc:195 -#, fuzzy -#| msgid "Unable to display Run File dialog box (internal error)" msgid "Unable to display Run dialog box (internal error)" msgstr "No s'ha pogut mostrar el quadre de diàleg Executar (error intern)" @@ -9023,10 +8954,8 @@ msgid " sec" msgstr " seg" #: twain.rc:29 -#, fuzzy -#| msgid "Select Folder" msgid "Select Source" -msgstr "Selecciona una carpeta" +msgstr "Seleccionar font" #: urlmon.rc:32 wininet.rc:77 msgid "Security Warning" @@ -9208,7 +9137,7 @@ msgstr "Un publicador desconegut o no de confiança ha emès el certificat." #: wininet.rc:30 msgid "The date on the certificate is invalid." -msgstr "La data en el certificat és invàlida." +msgstr "La data en el certificat no és vàlida." #: wininet.rc:31 msgid "The name on the certificate does not match the site." @@ -9222,7 +9151,7 @@ msgstr "" #: winmm.rc:32 msgid "The specified command was carried out." -msgstr "S'ha realitzat l'ordre especificat." +msgstr "S'ha realitzat l'ordre especificada." #: winmm.rc:33 msgid "Undefined external error." @@ -9247,7 +9176,7 @@ msgstr "" #: winmm.rc:37 msgid "The specified device handle is invalid." -msgstr "L'identificador del dispositiu especificat és invàlid." +msgstr "L'identificador del dispositiu especificat no és vàlid." #: winmm.rc:38 msgid "There is no driver installed on your system!" @@ -9276,11 +9205,11 @@ msgstr "Un número d'error s'ha especificat que no està definit en el sistema." #: winmm.rc:42 msgid "An invalid flag was passed to a system function." -msgstr "S'ha passat una bandera invàlida a una funció de sistema." +msgstr "S'ha passat una bandera no vàlida a una funció de sistema." #: winmm.rc:43 msgid "An invalid parameter was passed to a system function." -msgstr "S'ha passat un paràmetre invàlid a una funció de sistema." +msgstr "S'ha passat un paràmetre no vàlid a una funció de sistema." #: winmm.rc:46 msgid "" @@ -9358,7 +9287,7 @@ msgstr "" #: winmm.rc:60 msgid "Invalid MCI device ID. Use the ID returned when opening the MCI device." msgstr "" -"L'ID del dispositiu MCI és invàlida. Utilitzeu l'ID retornada en obrir el " +"L'ID del dispositiu MCI no és vàlid. Utilitzeu l'ID retornat en obrir el " "dispositiu MCI." #: winmm.rc:61 @@ -9367,7 +9296,7 @@ msgstr "El controlador no pot reconèixer el paràmetre d'ordre especificat." #: winmm.rc:62 msgid "The driver cannot recognize the specified command." -msgstr "El controlador no pot reconèixer l'ordre especificat." +msgstr "El controlador no pot reconèixer l'ordre especificada." #: winmm.rc:63 msgid "" @@ -9414,19 +9343,19 @@ msgid "" "The specified command requires a character-string parameter. Please provide " "one." msgstr "" -"L'ordre especificat requereix un paràmetre de cadena de caràcters. Si us " +"L'ordre especificada requereix un paràmetre de cadena de caràcters. Si us " "plau, proveïu un." #: winmm.rc:71 msgid "The specified integer is invalid for this command." -msgstr "El nombre enter especificat és invàlid per a aquest ordre." +msgstr "El nombre enter especificat no és vàlid per a aquesta ordre." #: winmm.rc:72 msgid "" "The device driver returned an invalid return type. Check with the device " "manufacturer about obtaining a new driver." msgstr "" -"El controlador de dispositiu ha donat un tipus de retorn invàlid. Consulteu " +"El controlador de dispositiu ha donat un tipus de retorn no vàlid. Consulteu " "amb el fabricant del dispositiu sobre com obtenir un controlador nou." #: winmm.rc:73 @@ -9439,11 +9368,11 @@ msgstr "" #: winmm.rc:74 msgid "The specified command requires a parameter. Please supply one." -msgstr "L'ordre especificat requereix un paràmetre. Si us plau, proveïu un." +msgstr "L'ordre especificada requereix un paràmetre. Si us plau, proveïu un." #: winmm.rc:75 msgid "The MCI device you are using does not support the specified command." -msgstr "El dispositiu MCI que utilitzeu no admet l'ordre especificat." +msgstr "El dispositiu MCI que utilitzeu no admet l'ordre especificada." #: winmm.rc:76 msgid "" @@ -9472,7 +9401,7 @@ msgstr "" #: winmm.rc:80 msgid "Cannot use 'all' as the device name with the specified command." msgstr "" -"No es pot utilitzar 'all' com al nom de dispositiu amb l'ordre especificat." +"No es pot utilitzar 'all' com al nom de dispositiu amb l'ordre especificada." #: winmm.rc:81 msgid "" @@ -9491,7 +9420,8 @@ msgstr "" #: winmm.rc:83 msgid "The specified parameter is out of range for the specified command." -msgstr "El paràmetre especificat és fora de l'interval de l'ordre especificat." +msgstr "" +"El paràmetre especificat és fora de l'interval de l'ordre especificada." #: winmm.rc:84 msgid "The specified parameters cannot be used together." @@ -9531,7 +9461,7 @@ msgstr "" #: winmm.rc:89 msgid "The specified parameter is invalid for this command." -msgstr "El paràmetre especificat no és vàlid per a aquest ordre." +msgstr "El paràmetre especificat no és vàlid per a aquesta ordre." #: winmm.rc:90 msgid "" @@ -9546,7 +9476,7 @@ msgid "" "The specified command requires an alias, file, driver, or device name. " "Please supply one." msgstr "" -"L'ordre especificat requereix un àlies, fitxer, controlador o nom de " +"L'ordre especificada requereix un àlies, fitxer, controlador o nom de " "dispositiu. Si us plau, proveïu un." #: winmm.rc:92 @@ -9554,7 +9484,7 @@ msgid "" "The specified value for the time format is invalid. Refer to the MCI " "documentation for valid formats." msgstr "" -"El valor especificat per al format d'hora és invàlid. Consulteu la " +"El valor especificat per al format d'hora no és vàlid. Consulteu la " "documentació MCI pels formats vàlids." #: winmm.rc:93 @@ -9606,7 +9536,7 @@ msgid "" "Cannot carry out the commands in the order specified. Correct the command " "sequence, and then try again." msgstr "" -"No es pot dur a terme els ordres en l'ordre especificat. Corregiu la " +"No es pot dur a terme les ordres en l'ordre especificat. Corregiu la " "seqüència d'ordres i després torneu a intentar." #: winmm.rc:102 @@ -9614,7 +9544,7 @@ msgid "" "Cannot carry out the specified command on an auto-opened device. Wait until " "the device is closed, and then try again." msgstr "" -"No es pot dur a terme l'ordre especificat en un dispositiu obert " +"No es pot dur a terme l'ordre especificada en un dispositiu obert " "automàticament. Espereu fins que es tanqui el dispositiu i després torneu a " "intentar." @@ -9623,7 +9553,7 @@ msgid "" "The filename is invalid. Make sure the filename is not longer than 8 " "characters, followed by a period and an extension." msgstr "" -"El nom de fitxer és invàlid. Assegureu-vos que el nom del fitxer no estigui " +"El nom de fitxer no és vàlid. Assegureu-vos que el nom del fitxer no estigui " "més llarg de 8 caràcters, seguit d'un període i una extensió." #: winmm.rc:104 @@ -9681,7 +9611,7 @@ msgstr "" msgid "" "The specified command requires an integer parameter. Please provide one." msgstr "" -"L'ordre especificat requereix un paràmetre de nombre sencer. Si us plau, " +"L'ordre especificada requereix un paràmetre de nombre enter. Si us plau, " "proveïu un." #: winmm.rc:112 @@ -9869,7 +9799,7 @@ msgstr "" #: winspool.rc:32 msgid "Unable to create the output file." -msgstr "No s'ha pogut crear el fitxer destinatari." +msgstr "No s'ha pogut crear el fitxer de sortida." #: wldap32.rc:32 msgid "Success" @@ -9928,10 +9858,8 @@ msgid "Confidentiality Required" msgstr "Cal confidencialitat" #: wldap32.rc:46 -#, fuzzy -#| msgid "Shutdown in progress.\n" msgid "SASL Bind in Progress" -msgstr "L'aturada està en curs.\n" +msgstr "Vinculació SASL en curs" #: wldap32.rc:48 msgid "No Such Attribute" @@ -9955,7 +9883,7 @@ msgstr "L'atribut o valor existeix" #: wldap32.rc:53 msgid "Invalid Syntax" -msgstr "Sintaxi invàlida" +msgstr "Sintaxi no vàlida" #: wldap32.rc:64 msgid "No Such Object" @@ -9967,7 +9895,7 @@ msgstr "Problema d'àlies" #: wldap32.rc:66 msgid "Invalid DN Syntax" -msgstr "Sintaxi DN invàlida" +msgstr "Sintaxi DN no vàlida" #: wldap32.rc:67 msgid "Is Leaf" @@ -9983,7 +9911,7 @@ msgstr "Autenticació no apropiada" #: wldap32.rc:81 msgid "Invalid Credentials" -msgstr "Credencials invàlides" +msgstr "Credencials no vàlides" #: wldap32.rc:82 msgid "Insufficient Rights" @@ -10212,8 +10140,8 @@ msgid "" "Changes to default directory, environment variables etc made within a\n" "called procedure are inherited by the caller.\n" msgstr "" -"CALL <nom de fitxer batch> s'utilitza dins un fitxer batch per a executar\n" -"ordres d'un altre fitxer batch. Quan se surt del fitxer batch, el control\n" +"CALL <nom de fitxer BAT> s'utilitza dins un fitxer BAT per a executar\n" +"ordres d'un altre fitxer BAT. Quan se surt del fitxer BAT, el control\n" "retorna al fitxer que l'ha trucat. L'ordre CALL pot proveir paràmetres al\n" "procediment trucat.\n" "\n" @@ -10271,7 +10199,7 @@ msgstr "" "actual.\n" "ECHO <cadena> mostra <cadena> en el dispositiu de terminal actual.\n" "\n" -"ECHO ON causa que tots els ordres següents en un fitxer batch es mostrin en\n" +"ECHO ON causa que totes les ordres següents en un fitxer BAT es mostrin en\n" "el dispositiu de terminal abans d'executar-se.\n" "\n" "ECHO OFF desfà l'efecte d'un ECHO ON anterior (ECHO està OFF per defecte).\n" @@ -10289,12 +10217,12 @@ msgid "" "\n" "The % sign must be doubled when using FOR in a batch file.\n" msgstr "" -"S'utilitza l'ordre FOR per a executar un ordre per cada un d'un conjunt de\n" +"S'utilitza l'ordre FOR per a executar una ordre per cada un d'un conjunt de\n" "fitxers.\n" "\n" "Ús: FOR %variable IN (conjunt) DO ordre\n" "\n" -"S'ha de doblar el signe % quan s'utilitza FOR en un fitxer batch.\n" +"S'ha de doblar el signe % quan s'utilitza FOR en un fitxer BAT.\n" #: cmd.rc:97 msgid "" @@ -10310,13 +10238,13 @@ msgid "" "GOTO has no effect when used interactively.\n" msgstr "" "L'ordre GOTO transfereix l'execució a una altra declaració en un fitxer\n" -"batch.\n" +"BAT.\n" "\n" "L'etiqueta que és la destinació d'un GOTO pot ser de fins a 255 caràcters\n" "de longitud però no pot incloure espais (això és diferent d'altres sistemes\n" -"operatius). Si dos o més etiquetes idèntiques existeixen en un fitxer\n" -"batch, el primer sempre s'executarà. Intentar fer GOTO a una etiqueta no\n" -"existent termina l'execució del fitxer batch.\n" +"operatius). Si dos o més etiquetes idèntiques existeixen en un fitxer BAT,\n" +"el primer sempre s'executarà. Intentar fer GOTO a una etiqueta no existent\n" +"termina l'execució del fitxer BAT.\n" "\n" "GOTO no té cap efecte quan s'utilitza de forma interactiva.\n" @@ -10339,11 +10267,11 @@ msgid "" "In the second form of the command, string1 and string2 must be in double\n" "quotes. The comparison is not case-sensitive.\n" msgstr "" -"S'utilitza IF per a executar condicionalment un ordre.\n" +"S'utilitza IF per a executar condicionalment una ordre.\n" "\n" "Sintaxi: IF [NOT] EXIST nom_de_fitxer ordre\n" " IF [NOT] cadena1==cadena2 ordre\n" -" IF [NOT] ERRORLEVEL nombre ordre\n" +" IF [NOT] ERRORLEVEL número ordre\n" "\n" "En la segona forma de la comanda, cadena1 i cadena2 han de ser entre\n" "cometes dobles. La comparació no distingeix entre majúscules i minúscules.\n" @@ -10417,11 +10345,11 @@ msgid "" "It is mainly useful in batch files to allow the user to read the output of\n" "a previous command before it scrolls off the screen.\n" msgstr "" -"PAUSE mostra un missatge en la pantalla demanant que l'usuari premi una " +"PAUSE mostra un missatge en la pantalla demanant que l'usuari premi una\n" "tecla.\n" "\n" -"És principalment útil en els fitxers batch per a permetre que l'usuari\n" -"llegeixi la sortida d'un ordre anterior abans que es desplaci fora de la\n" +"És principalment útil en els fitxers BAT per a permetre que l'usuari\n" +"llegeixi la sortida d'una ordre anterior abans que es desplaci fora de la\n" "pantalla.\n" #: cmd.rc:169 @@ -10446,7 +10374,7 @@ msgid "" "The prompt can also be changed by altering the PROMPT environment variable,\n" "so the command 'SET PROMPT=text' has the same effect as 'PROMPT text'.\n" msgstr "" -"PROMPT defineix l'indicador de la línia d'ordre.\n" +"PROMPT defineix l'indicador de la línia d'ordres.\n" "\n" "La cadena que segueix l'ordre PROMPT (i l'espai immediatament després)\n" "apareix al principi de la línia quan cmd està esperant l'entrada.\n" @@ -10474,7 +10402,7 @@ msgid "" "and can therefore be used as a comment in a batch file.\n" msgstr "" "Una línia d'ordres que comença amb REM (seguit per un espai) no realitza\n" -"cap acció, i per tant es pot utilitzar com a comentari en un fitxer batch.\n" +"cap acció, i per tant es pot utilitzar com a comentari en un fitxer BAT.\n" #: cmd.rc:176 msgid "REN <filename> is the short version of RENAME. It renames a file.\n" @@ -10535,9 +10463,9 @@ msgid "" "list, so parameter 2 becomes parameter 1 and so on. It has no effect if\n" "called from the command line.\n" msgstr "" -"S'utilitza SHIFT en un fitxer batch per a eliminar un paràmetre del cap de\n" -"la llista, de manera que el paràmetre 2 es converteix en el paràmetre 1,\n" -"etc. No té cap efecte si es truca des de la línia d'ordres.\n" +"S'utilitza SHIFT en un fitxer BAT per a eliminar un paràmetre del cap de la\n" +"llista, de manera que el paràmetre 2 es converteix en el paràmetre 1, etc.\n" +"No té cap efecte si es truca des de la línia d'ordres.\n" #: cmd.rc:212 start.rc:56 msgid "" @@ -10596,7 +10524,7 @@ msgstr "" " el seu codi de sortida.\n" "/unix Utilitza un nom de fitxer d'Unix i inicia el fitxer com\n" " el Windows Explorer.\n" -"/ProgIDOpen Obre un document utilitzant la progID especificada.\n" +"/ProgIDOpen Obre un document utilitzant el progID especificat.\n" "/? Mostra aquesta ajuda i surt.\n" #: cmd.rc:237 @@ -10648,7 +10576,7 @@ msgid "" "ENDLOCAL ends localization of environment changes in a batch file which\n" "were introduced by a preceding SETLOCAL.\n" msgstr "" -"ENDLOCAL acaba la localització de canvis d'entorn en un fitxer batch, els\n" +"ENDLOCAL acaba la localització de canvis d'entorn en un fitxer BAT, els\n" "quals un SETLOCAL anterior ha introduït.\n" #: cmd.rc:271 @@ -10660,12 +10588,12 @@ msgid "" "file, whichever comes first), at which point the previous environment\n" "settings are restored.\n" msgstr "" -"SETLOCAL comença la localització de canvis en l'entorn en un fitxer batch.\n" +"SETLOCAL comença la localització de canvis d'entorn en un fitxer BAT.\n" "\n" -"Els canvis d'entorn fets després d'un SETLOCAL són locals al fitxer batch,\n" -"i es conserven fins que es trobi la següent ENDLOCAL (o al final del\n" -"fitxer, el que passi primer), al qual punt la configuració de l'entorn\n" -"anterior es restaura.\n" +"Els canvis d'entorn fets després d'un SETLOCAL són locals al fitxer BAT, i\n" +"es conserven fins que es trobi la següent ENDLOCAL (o al final del fitxer,\n" +"el que passi primer), al qual punt la configuració d'entorn anterior es\n" +"restaura.\n" #: cmd.rc:275 msgid "" @@ -10712,7 +10640,7 @@ msgid "" "Specifying no open command after the equal sign removes the command string\n" "associated to the specified file type.\n" msgstr "" -"FTYPE mostra o modifica els ordres d'obertura associats amb els tipus de\n" +"FTYPE mostra o modifica les ordres d'obertura associats amb els tipus de\n" "fitxers.\n" "\n" "Sintaxi: FTYPE [tipusDeFitxer[=[ordreDeObertura]]]\n" @@ -10738,7 +10666,7 @@ msgstr "" "CHOICE mostra un text i espera fins que l'usuari premi una tecla permesa\n" "d'una llista seleccionable.\n" "CHOICE s'utilitza principalment per a construir un menú de selecció en un\n" -"fitxer batch.\n" +"fitxer BAT.\n" #: cmd.rc:324 msgid "" @@ -10753,6 +10681,14 @@ msgid "" "link_name is the name of the new symbolic link.\n" "target is the path that link_name points to.\n" msgstr "" +"Sintaxi: MKLINK [opcions] nom_d'enllaç destinació\n" +"\n" +"Opcions:\n" +"/d Crea un enllaç simbòlic de directori\n" +"/h Crea un enllaç dur.\n" +"/j Crea una intersecció de directori.\n" +"nom_d'enllaç és el nom de l'enllaç simbòlic nou.\n" +"destinació és el camí al qual nom_d'enllaç assenyala.\n" #: cmd.rc:312 msgid "" @@ -10763,47 +10699,6 @@ msgstr "" "des del qual heu invocat cmd.\n" #: cmd.rc:364 -#, fuzzy -#| msgid "" -#| "CMD built-in commands are:\n" -#| "ASSOC\t\tShow or modify file extension associations\n" -#| "ATTRIB\t\tShow or change DOS file attributes\n" -#| "CALL\t\tInvoke a batch file from inside another\n" -#| "CD (CHDIR)\tChange current default directory\n" -#| "CHOICE\t\tWait for an keypress from a selectable list\n" -#| "CLS\t\tClear the console screen\n" -#| "COPY\t\tCopy file\n" -#| "CTTY\t\tChange input/output device\n" -#| "DATE\t\tShow or change the system date\n" -#| "DEL (ERASE)\tDelete a file or set of files\n" -#| "DIR\t\tList the contents of a directory\n" -#| "ECHO\t\tCopy text directly to the console output\n" -#| "ENDLOCAL\tEnd localization of environment changes in a batch file\n" -#| "FTYPE\t\tShow or modify open commands associated with file types\n" -#| "HELP\t\tShow brief help details on a topic\n" -#| "MD (MKDIR)\tCreate a subdirectory\n" -#| "MORE\t\tDisplay output in pages\n" -#| "MOVE\t\tMove a file, set of files or directory tree\n" -#| "PATH\t\tSet or show the search path\n" -#| "PAUSE\t\tSuspend execution of a batch file\n" -#| "POPD\t\tRestore the directory to the last one saved with PUSHD\n" -#| "PROMPT\t\tChange the command prompt\n" -#| "PUSHD\t\tChange to a new directory, saving the current one\n" -#| "REN (RENAME)\tRename a file\n" -#| "RD (RMDIR)\tDelete a subdirectory\n" -#| "SET\t\tSet or show environment variables\n" -#| "SETLOCAL\tStart localization of environment changes in a batch file\n" -#| "START\t\tStart a program, or open a document in the associated program\n" -#| "TIME\t\tSet or show the current system time\n" -#| "TITLE\t\tSet the window title for the CMD session\n" -#| "TYPE\t\tType the contents of a text file\n" -#| "VER\t\tShow the current version of CMD\n" -#| "VOL\t\tShow the volume label of a disk device\n" -#| "XCOPY\t\tCopy source files or directory trees to a destination\n" -#| "EXIT\t\tClose down CMD\n" -#| "\n" -#| "Enter HELP <command> for further information on any of the above " -#| "commands.\n" msgid "" "CMD built-in commands are:\n" "ASSOC\t\tShow or modify file extension associations\n" @@ -10845,10 +10740,10 @@ msgid "" "\n" "Enter HELP <command> for further information on any of the above commands.\n" msgstr "" -"Els ordres integrats de CMD són:\n" +"Les ordres integrades de CMD són:\n" "ASSOC\t\tMostra o modifica les associacions d'extensió de fitxer\n" "ATTRIB\t\tMostra o canvia els atributs de fitxer de DOS\n" -"CALL\t\tInvoca un fitxer batch des de dins altre\n" +"CALL\t\tInvoca un fitxer BAT des de dins altre\n" "CD (CHDIR)\tCanvia el directori per defecte actual\n" "CHOICE\t\tEspera una pulsació de tecla d'una llista seleccionable\n" "CLS\t\tEsborra la pantalla de consola\n" @@ -10858,29 +10753,30 @@ msgstr "" "DEL (ERASE)\tSuprimeix un fitxer o conjunt de fitxers\n" "DIR\t\tMostra el contingut d'un directori\n" "ECHO\t\tCopia text directament a la sortida de la consola\n" -"ENDLOCAL\tAcaba la localització de canvis en l'entorn en un fitxer batch\n" +"ENDLOCAL\tAcaba la localització de canvis d'entorn en un fitxer BAT\n" "FTYPE\t\tMostra o modifica els ordres d'obertura associats amb els tipus\n" "\t\tde fitxer\n" "HELP\t\tMostra detalls breus sobre un tema\n" "MD (MKDIR)\tCrea un subdirectori\n" +"MKLINK\tCrea un enllaç simbòlic\n" "MORE\t\tMostra la sortida en pàgines\n" "MOVE\t\tDesplaça un fitxer, conjunt de fitxers o arbre de directori\n" "PATH\t\tEstableix o mostra el camí de cerca\n" -"PAUSE\t\tSuspèn l'execució d'un fitxer batch\n" +"PAUSE\t\tSuspèn l'execució d'un fitxer BAT\n" "POPD\t\tRestaura el directori a l'últim desat amb la PUSHD\n" "PROMPT\t\tCanvia l'indicador d'ordres\n" "PUSHD\t\tCanvia a un directori nou, desant l'actual\n" "REN (RENAME)\tCanvia el nom d'un fitxer\n" "RD (RMDIR)\tSuprimeix un subdirectori\n" "SET\t\tEstableix o mostra les variables d'entorn\n" -"SETLOCAL\tComença la localització de canvis en l'entorn en un fitxer batch\n" +"SETLOCAL\tComença la localització de canvis d'entorn en un fitxer BAT\n" "START\t\tInicia un programa o obrir un document en el programa associat\n" "TIME\t\tEstableix o mostra l'hora de sistema actual\n" "TITLE\t\tEstableix el títol de finestra de la sessió CMD\n" "TYPE\t\tBolca el contingut d'un fitxer de text\n" "VER\t\tMostra la versió actual del CMD\n" "VOL\t\tMostra l'etiqueta de volum d'un dispositiu de disc\n" -"XCOPY\t\tCopia fitxers fonts o arbres de directori a una destinació\n" +"XCOPY\t\tCopia fitxers o arbres de directori a una destinació\n" "EXIT\t\tTanca el CMD\n" "\n" "Introduïu HELP <ordre> per més informació sobre qualsevulla de les ordres\n" @@ -10888,7 +10784,7 @@ msgstr "" #: cmd.rc:365 msgid "Are you sure?" -msgstr "Esteu segur?" +msgstr "N'esteu segur?" #: cmd.rc:366 reg.rc:50 xcopy.rc:43 msgctxt "Yes key" @@ -10906,7 +10802,7 @@ msgstr "Manca una associació de fitxer per a l'extensió %1\n" #: cmd.rc:369 msgid "No open command associated with file type '%1'\n" -msgstr "No hi ha cap ordre d'obertura associat amb el tipus de fitxer '%1'\n" +msgstr "No hi ha cap ordre d'obertura associada amb el tipus de fitxer '%1'\n" #: cmd.rc:370 msgid "Overwrite %1?" @@ -10919,12 +10815,12 @@ msgstr "Més..." #: cmd.rc:372 msgid "Line in Batch processing possibly truncated. Using:\n" msgstr "" -"Hi ha hagut una línia possiblement truncada en el processament batch.\n" +"Hi ha hagut una línia possiblement truncada en el processament BAT.\n" "S'està utilitzant:\n" #: cmd.rc:374 msgid "Argument missing\n" -msgstr "Manca un paràmetre\n" +msgstr "Manca un argument\n" #: cmd.rc:375 msgid "Syntax error\n" @@ -10964,7 +10860,7 @@ msgstr "S'ha fallat en obrir '%1'\n" #: cmd.rc:385 msgid "Cannot call batch label outside of a batch script\n" -msgstr "No es pot trucar a una etiqueta de batch fora d'un script batch\n" +msgstr "No es pot trucar a una etiqueta BAT fora d'un script BAT\n" #: cmd.rc:386 xcopy.rc:45 msgctxt "All key" @@ -11047,7 +10943,7 @@ msgstr " (Sí|No|Tots)" msgid "" "Can't recognize '%1' as an internal or external command, or batch script.\n" msgstr "" -"No es pot reconèixer '%1' com a ordre intern ni extern, ni script batch.\n" +"No es pot reconèixer '%1' com a ordre interna ni externa, ni script BAT.\n" #: cmd.rc:405 msgid "Division by zero error.\n" @@ -11100,7 +10996,7 @@ msgstr "Ús: hostname\n" #: hostname.rc:31 msgid "Error: Invalid option '%c'.\n" -msgstr "Error: L'opció '%c' és invàlida.\n" +msgstr "Error: L'opció '%c' no és vàlida.\n" #: hostname.rc:32 msgid "" @@ -11117,8 +11013,8 @@ msgstr "Ús: ipconfig [ /? | /all ]\n" #: ipconfig.rc:31 msgid "Error: Unknown or invalid command line parameters specified\n" msgstr "" -"Error: S'han especificat paràmetres de línia d'ordres desconeguts o " -"invàlids\n" +"Error: S'han especificat paràmetres de línia d'ordres desconeguts o no " +"vàlids\n" #: ipconfig.rc:32 msgid "%1 adapter %2\n" @@ -11194,9 +11090,9 @@ msgid "" "\n" "Where 'command' is one of HELP, START, STOP or USE.\n" msgstr "" -"La sintaxi d'aquest ordre és:\n" +"La sintaxi d'aquesta ordre és:\n" "\n" -"NET ordre [paràmetres]\n" +"NET ordre [arguments]\n" " -o-\n" "NET ordre /HELP\n" "\n" @@ -11211,7 +11107,7 @@ msgid "" "Displays the list of running services if 'service' is omitted. Otherwise " "'service' is the name of the service to start.\n" msgstr "" -"La sintaxi d'aquest ordre és:\n" +"La sintaxi d'aquesta ordre és:\n" "\n" "NET START [servei]\n" "\n" @@ -11226,7 +11122,7 @@ msgid "" "\n" "Where 'service' is the name of the service to stop.\n" msgstr "" -"La sintaxi d'aquest ordre és:\n" +"La sintaxi d'aquesta ordre és:\n" "\n" "NET STOP servei\n" "\n" @@ -11666,7 +11562,7 @@ msgstr "" #: oleview.rc:32 msgid "&Bind to file..." -msgstr "&Lligar a fitxer..." +msgstr "&Vincula a fitxer..." #: oleview.rc:33 msgid "&View TypeLib..." @@ -11838,7 +11734,7 @@ msgstr "Fitxers TypeLib (*.tlb; *.olb; *.dll; *.ocx; *.exe)" #: oleview.rc:105 msgid "Bind to file via a File Moniker" -msgstr "Lliga a fitxer a través d'un File Moniker" +msgstr "Vincula a un fitxer a través d'un File Moniker" #: oleview.rc:106 msgid "Open a TypeLib file and view the contents" @@ -11870,7 +11766,7 @@ msgstr "Lliura la instància d'objecte actualment seleccionada" #: oleview.rc:113 msgid "Copy the GUID of the currently selected item to the clipboard" -msgstr "Copia la GUID de l'element actualment seleccionat al porta-retalls" +msgstr "Copia el GUID de l'element actualment seleccionat al porta-retalls" #: oleview.rc:114 msgid "Display the viewer for the selected item" @@ -11901,7 +11797,7 @@ msgstr "Actualitza totes les llistes" #: oleview.rc:124 msgid "Display program information, version number and copyright" -msgstr "Mostra informació de programa, nombre de versió i drets d'autor" +msgstr "Mostra informació de programa, número de versió i drets d'autor" #: oleview.rc:115 msgid "Ask for an in-process server when calling CoGetClassObject" @@ -12213,17 +12109,6 @@ msgid "Icons (*.ico)" msgstr "Icones (*.ico)" #: reg.rc:35 -#, fuzzy -#| msgid "" -#| "Usage:\n" -#| " REG [operation] [parameters]\n" -#| "\n" -#| "Supported operations:\n" -#| " ADD | DELETE | QUERY\n" -#| "\n" -#| "For help on a specific operation, type:\n" -#| " REG [operation] /?\n" -#| "\n" msgid "" "Usage:\n" " REG [operation] [parameters]\n" @@ -12239,7 +12124,7 @@ msgstr "" " REG [operació] [paràmetres]\n" "\n" "Operacions admeses:\n" -" ADD | DELETE | QUERY\n" +" ADD | DELETE | IMPORT | EXPORT | QUERY\n" "\n" "Per ajuda sobre una operació específica, teclegeu:\n" " REG [operació] /?\n" @@ -12267,11 +12152,11 @@ msgstr "L'operació s'ha acabat amb èxit\n" #: reg.rc:40 msgid "reg: Invalid key name\n" -msgstr "reg: Nom de clau invàlid\n" +msgstr "reg: Nom de clau no vàlid\n" #: reg.rc:41 msgid "reg: Invalid command line parameters\n" -msgstr "reg: Paràmetres de línia d'ordres invàlids\n" +msgstr "reg: Paràmetres de línia d'ordres no vàlids\n" #: reg.rc:42 msgid "reg: Unable to access remote machine\n" @@ -12350,11 +12235,11 @@ msgstr "S'ha completat la cerca. Nombre de coincidències trobades: %1!d!\n" #: reg.rc:61 msgid "reg: Invalid syntax. " -msgstr "reg: La sintaxi és invàlida. " +msgstr "reg: La sintaxi no és vàlida. " #: reg.rc:62 msgid "reg: Invalid option [%1]. " -msgstr "reg: L'opció [%1] és invàlida. " +msgstr "reg: L'opció [%1] no és vàlida. " #: reg.rc:63 msgid "Type \"REG /?\" for help.\n" @@ -12370,43 +12255,31 @@ msgstr "(valor no definit)" #: reg.rc:66 msgid "REG IMPORT file.reg\n" -msgstr "" +msgstr "REG IMPORT fitxer.reg\n" #: reg.rc:67 -#, fuzzy -#| msgid "regedit: The file '%1' was not found.\n" msgid "reg: The file '%1' was not found.\n" -msgstr "regedit: No s'ha trobat el fitxer '%1'.\n" +msgstr "reg: No s'ha trobat el fitxer '%1'.\n" #: reg.rc:68 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "reg: Unable to open the registry key '%1'.\n" -msgstr "regedit: No s'ha pogut obrir la clau de registre '%1'.\n" +msgstr "reg: No s'ha pogut obrir la clau de registre '%1'.\n" #: reg.rc:69 -#, fuzzy -#| msgid "regedit: Unrecognized escape sequence [\\%1!c!]\n" msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" -msgstr "regedit: Seqüència d'escapada no reconeguda [\\%1!c!]\n" +msgstr "reg: Seqüència d'escapada no reconeguda [\\%1!c!]\n" #: reg.rc:70 -#, fuzzy -#| msgid "REG QUERY key_name [/v value_name | /ve] [/s]\n" msgid "REG EXPORT key_name file.reg [/y]\n" -msgstr "REG QUERY nom_de_clau [/v nom_de_valor | /ve] [/s]\n" +msgstr "REG EXPORT nom_de_clau fitxer.reg [/y]\n" #: reg.rc:71 -#, fuzzy -#| msgid "reg: Invalid key name\n" msgid "reg: Invalid system key [%1]\n" -msgstr "reg: Nom de clau invàlid\n" +msgstr "reg: Nom de clau de sistema no vàlid [%1]\n" #: reg.rc:72 -#, fuzzy -#| msgid "The registry value '%1' already exists. Do you want to overwrite it?" msgid "The file '%1' already exists. Do you want to overwrite it?" -msgstr "El valor de registre '%1' ja existeix. El voleu sobreescriure?" +msgstr "El fitxer '%1' ja existeix. El voleu sobreescriure?" #: regedit.rc:34 msgid "&Registry" @@ -12477,17 +12350,12 @@ msgid "&About Registry Editor" msgstr "&Quant a l'Editor de Registre" #: regedit.rc:89 regedit.rc:96 regedit.rc:230 -#, fuzzy -#| msgctxt "object state" -#| msgid "expanded" msgid "Expand" -msgstr "expandit" +msgstr "Expandeix" #: regedit.rc:134 regedit.rc:233 -#, fuzzy -#| msgid "Modify Binary Data..." msgid "Modify &Binary Data..." -msgstr "Modifica dades binàries..." +msgstr "Modifica dades &binàries..." #: regedit.rc:267 msgid "Export registry" @@ -12586,14 +12454,10 @@ msgid "Contains commands for accessing frequently used keys" msgstr "Conté ordres per a accedir a les claus freqüentment utilitzades" #: regedit.rc:163 -#, fuzzy -#| msgid "" -#| "Contains commands for displaying help and information about registry " -#| "editor" msgid "" "Contains commands for displaying Help and information about Registry Editor" msgstr "" -"Conté ordres per a mostrar ajuda i informació quant a l'editor de registre" +"Conté ordres per a mostrar Ajuda i informació quant a l'Editor de Registre" #: regedit.rc:164 msgid "Contains commands for creating new keys or values" @@ -12632,101 +12496,58 @@ msgid "(unknown %d)" msgstr "(desconegut %d)" #: regedit.rc:247 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to modify the selected registry value." -msgstr "regedit: No s'ha pogut obrir la clau de registre '%1'.\n" +msgstr "No s'ha pogut modificar el valor de registre seleccionat." #: regedit.rc:248 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to create a new registry key." -msgstr "regedit: No s'ha pogut obrir la clau de registre '%1'.\n" +msgstr "No s'ha pogut crear una clau de registre nova." #: regedit.rc:249 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to create a new registry value." -msgstr "regedit: No s'ha pogut obrir la clau de registre '%1'.\n" +msgstr "No s'ha pogut crear un valor de registre nou." #: regedit.rc:250 msgid "" "Unable to rename the key '%1'.\n" "The specified key name already exists." msgstr "" +"No es pot canviar el nom de la clau '%1'.\n" +"El nom de clau especificat ja existeix." #: regedit.rc:251 msgid "" "Unable to rename the value '%1'.\n" "The specified value name already exists." msgstr "" +"No s'ha pogut canviar el nom del valor '%1'.\n" +"El nom de valor especificat ja existeix." #: regedit.rc:252 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to delete the selected registry key." -msgstr "regedit: No s'ha pogut obrir la clau de registre '%1'.\n" +msgstr "No s'ha pogut suprimir la clau de registre seleccionada." #: regedit.rc:253 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to rename the selected registry key." -msgstr "regedit: No s'ha pogut obrir la clau de registre '%1'.\n" +msgstr "No s'ha pogut canviar el nom de la clau de registre seleccionada." #: regedit.rc:254 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to rename the selected registry value." -msgstr "regedit: No s'ha pogut obrir la clau de registre '%1'.\n" +msgstr "No s'ha pogut canviar el nom del valor de registre seleccionat." #: regedit.rc:255 msgid "" "The keys and values contained in %1 were successfully added to the registry." msgstr "" +"Les claus i els valors continguts en %1 s'han afegit al registre amb èxit." #: regedit.rc:256 -#, fuzzy -#| msgid "" -#| "regedit: Unable to export '%1'. The specified registry key was not " -#| "found.\n" msgid "Unable to import %1. The specified file is not a valid registry file." msgstr "" -"regedit: No s'ha pogut exportar '%1'. No s'ha trobat la clau de registre " -"especificada.\n" +"No s'ha pogut importar %1. El fitxer especificat no és un fitxer de registre " +"vàlid." #: regedit.rc:408 -#, fuzzy -#| msgid "" -#| "Usage:\n" -#| " regedit [options] [filename] [reg_key]\n" -#| "\n" -#| "Options:\n" -#| " [no option] Launch the graphical version of this program.\n" -#| " /L:system.dat The location of the system.dat file to be modified.\n" -#| " Compatible with any other switch. Ignored.\n" -#| " /R:user.dat The location of the user.dat file to be modified.\n" -#| " Compatible with any other switch. Ignored.\n" -#| " /C Import the contents of a registry file.\n" -#| " /D Delete a specified registry key.\n" -#| " /E Export the contents of a specified registry key to a " -#| "file.\n" -#| " If no key is specified, the entire registry is " -#| "exported.\n" -#| " /S Silent mode. No messages will be displayed.\n" -#| " /V Launch the GUI in advanced mode. Ignored.\n" -#| " /? Display this information and exit.\n" -#| " [filename] The location of the file containing registry information " -#| "to\n" -#| " be imported. When used with [/E], this option specifies " -#| "the\n" -#| " file location where registry information will be " -#| "exported.\n" -#| " [reg_key] The registry key to be modified.\n" -#| "\n" -#| "Usage examples:\n" -#| " regedit \"import.reg\"\n" -#| " regedit /E \"export.reg\" \"HKEY_CURRENT_USER\\Console\"\n" -#| " regedit /D \"HKEY_LOCAL_MACHINE\\Error\\Path\"\n" msgid "" "Usage:\n" " regedit [options] [filename] [reg_key]\n" @@ -12782,11 +12603,11 @@ msgstr "" "Exemples d'ús:\n" " regedit \"import.reg\"\n" " regedit /E \"export.reg\" \"HKEY_CURRENT_USER\\Console\"\n" -" regedit /D \"HKEY_LOCAL_MACHINE\\Error\\Path\"\n" +" regedit /D \"HKEY_LOCAL_MACHINE\\Camí\\de\\clau\"\n" #: regedit.rc:409 msgid "regedit: Invalid or unrecognized switch [%1]\n" -msgstr "regedit: Commutador invàlid o no reconegut [%1]\n" +msgstr "regedit: Commutador no vàlid o no reconegut [%1]\n" #: regedit.rc:410 msgid "Type \"regedit /?\" for help.\n" @@ -12818,7 +12639,7 @@ msgstr "regedit: No resta memòria! (%1!S!, línia %2!u!)\n" #: regedit.rc:417 msgid "regedit: Invalid hexadecimal value.\n" -msgstr "regedit: El valor hexadecimal és invàlid.\n" +msgstr "regedit: El valor hexadecimal no és vàlid.\n" #: regedit.rc:418 msgid "" @@ -12826,17 +12647,15 @@ msgid "" "encountered at '%1'.\n" msgstr "" "regedit: No s'ha pogut convertir les dades hexadecimals. S'ha trobat un " -"valor invàlid a '%1'.\n" +"valor no vàlid a '%1'.\n" #: regedit.rc:419 msgid "regedit: Unrecognized escape sequence [\\%1!c!]\n" msgstr "regedit: Seqüència d'escapada no reconeguda [\\%1!c!]\n" #: regedit.rc:420 -#, fuzzy -#| msgid "regedit: Unsupported registry data type [%1]\n" msgid "regedit: Unsupported registry data type [0x%1!x!]\n" -msgstr "regedit: Tipus de dades de registre incompatible [%1]\n" +msgstr "regedit: Tipus de dades de registre incompatible [0x%1!x!]\n" #: regedit.rc:421 msgid "regedit: Unexpected end of line in '%1'.\n" @@ -12855,12 +12674,10 @@ msgid "regedit: Unable to open the registry key '%1'.\n" msgstr "regedit: No s'ha pogut obrir la clau de registre '%1'.\n" #: regedit.rc:425 -#, fuzzy -#| msgid "regedit: Unsupported registry data type [%1] encountered in '%2'.\n" msgid "" "regedit: Unsupported registry data type [0x%1!x!] encountered in '%2'.\n" msgstr "" -"regedit: S'ha trobat un tipus de dades de registre incompatible [%1] en " +"regedit: S'ha trobat un tipus de dades de registre incompatible [0x%1!x!] en " "'%2'.\n" #: regedit.rc:426 @@ -12868,10 +12685,8 @@ msgid "regedit: The registry value '%1' will be exported as binary data.\n" msgstr "regedit: El valor de registre '%1' s'exportarà com a dades binàries.\n" #: regedit.rc:427 -#, fuzzy -#| msgid "reg: Invalid key name\n" msgid "regedit: Invalid system key [%1]\n" -msgstr "reg: Nom de clau invàlid\n" +msgstr "regedit: Clau de sistema no vàlida [%1]\n" #: regedit.rc:428 msgid "" @@ -12881,22 +12696,16 @@ msgstr "" "especificada.\n" #: regedit.rc:429 -#, fuzzy -#| msgid "regedit: Unable to delete the registry class '%1'.\n" msgid "regedit: Unable to delete the registry key '%1'.\n" -msgstr "regedit: No s'ha pogut suprimir la classe de registre '%1'.\n" +msgstr "regedit: No s'ha pogut suprimir la clau de registre '%1'.\n" #: regedit.rc:431 -#, fuzzy -#| msgid "regedit: The line '%1' was not recognized.\n" msgid "regedit: The line contains invalid syntax.\n" -msgstr "regedit: No s'ha reconegut la línia '%1'.\n" +msgstr "regedit: La línia conté sintaxi no vàlida.\n" #: regedit.rc:187 -#, fuzzy -#| msgid "Quits the registry editor" msgid "Quits the Registry Editor" -msgstr "Tanca l'editor de registre" +msgstr "Tanca l'Editor de Registre" #: regedit.rc:188 msgid "Adds keys to the favorites list" @@ -12911,8 +12720,6 @@ msgid "Shows or hides the status bar" msgstr "Mostra o amaga la barra d'estat" #: regedit.rc:191 -#, fuzzy -#| msgid "Change position of split between two panes" msgid "Changes the position of the split between two panes" msgstr "Canvia la posició de la divisió entre dos panells" @@ -12957,10 +12764,8 @@ msgid "Adds a new binary value" msgstr "Afegeix un valor binari nou" #: regedit.rc:174 -#, fuzzy -#| msgid "Adds a new binary value" msgid "Adds a new 32-bit value" -msgstr "Afegeix un valor binari nou" +msgstr "Afegeix un valor nou de 32 bits" #: regedit.rc:177 msgid "Imports a text file into the registry" @@ -12975,42 +12780,32 @@ msgid "Prints all or part of the registry" msgstr "Imprimeix tot o part del registre" #: regedit.rc:181 -#, fuzzy -#| msgid "Registry Editor" msgid "Opens Registry Editor Help" -msgstr "Editor de Registre" +msgstr "Obre l'Ajuda de l'Editor de Registre" #: regedit.rc:182 msgid "Displays program information, version number and copyright" -msgstr "Mostra informació de programa, nombre de versió i drets d'autor" +msgstr "Mostra informació de programa, número de versió i drets d'autor" #: regedit.rc:206 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to query the registry value '%1'." -msgstr "regedit: No s'ha pogut obrir la clau de registre '%1'.\n" +msgstr "No s'ha pogut consultar el valor de registre '%1'." #: regedit.rc:207 -#, fuzzy -#| msgid "Can't edit keys of this type (%u)" msgid "Unable to edit registry keys of this type (%1!u!)." -msgstr "No es pot editar les claus d'aquest tipus (%u)" +msgstr "No es pot editar les claus d'aquest tipus (%1!u!)." #: regedit.rc:208 -#, fuzzy -#| msgid "Value is too big (%u)" msgid "The value is too big (%1!u!)." -msgstr "El valor és massa gran (%u)" +msgstr "El valor és massa gran (%1!u!)." #: regedit.rc:209 msgid "Confirm Value Delete" msgstr "Confirmar eliminació de valor" #: regedit.rc:216 -#, fuzzy -#| msgid "Search string '%s' not found" msgid "Search complete. The string '%1' was not found." -msgstr "Cadena de cerca '%s' no trobada" +msgstr "S'ha acabat la cerca. No s'ha trobat la cadena '%1'." #: regedit.rc:211 msgid "Are you sure you want to delete these values?" @@ -13025,56 +12820,43 @@ msgid "New Value #%d" msgstr "Valor nou #%d" #: regedit.rc:205 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to query the registry key '%1'." -msgstr "regedit: No s'ha pogut obrir la clau de registre '%1'.\n" +msgstr "No s'ha pogut consultar la clau de registre '%1'." #: regedit.rc:170 -#, fuzzy -#| msgid "Modifies the value's data" msgid "Modifies the value's data in binary form" -msgstr "Modifica les dades del valor" +msgstr "Modifica les dades del valor en forma binària" #: regedit.rc:175 msgid "Adds a new multi-string value" msgstr "Afegeix un valor de cadena múltiple nou" #: regedit.rc:198 -#, fuzzy -#| msgid "Exports selected branch of the registry to a text file" msgid "Exports the selected branch of the registry to a text file" msgstr "Exporta la branca seleccionada del registre a un fitxer de text" #: regedit.rc:176 -#, fuzzy -#| msgid "Adds a new string value" msgid "Adds a new expandable string value" -msgstr "Afegeix un valor de cadena nou" +msgstr "Afegeix un valor nou de cadena expansible" #: regedit.rc:212 -#, fuzzy -#| msgid "Confirm Value Delete" msgid "Confirm Key Delete" -msgstr "Confirmar eliminació de valor" +msgstr "Confirmar eliminació de clau" #: regedit.rc:213 -#, fuzzy -#| msgid "Are you sure you want to delete the registry key '%1'?" msgid "" "Are you sure you want to delete this registry key and all of its subkeys?" -msgstr "Esteu segur que voleu suprimir la clau de registre '%1'?" +msgstr "" +"Esteu segur que voleu suprimir aquesta clau de registre i totes les seves " +"subclaus?" #: regedit.rc:199 msgid "Expands or collapses the selected node" -msgstr "" +msgstr "Expandeix o col·lapsa el node seleccionat" #: regedit.rc:231 -#, fuzzy -#| msgctxt "object state" -#| msgid "collapsed" msgid "Collapse" -msgstr "col·lapsat" +msgstr "Col·lapsa" #: regsvr32.rc:32 msgid "" @@ -13107,11 +12889,11 @@ msgstr "" "Options:\n" " [/u] Desregistra un servidor.\n" " [/s] Mode silent (no es mostrarà cap missatge).\n" -" [/i] Truca DllInstall, passant una [línia d'ordres] opcional.\n" -"\tQuan s'utilitza amb [/u], es truca DllInstall en el mode de " -"desinstal·lació.\n" -" [/n] No truquis DllRegisterServer. S'ha d'utilitzar aquesta opció amb [/" -"i].\n" +" [/i] Truca a DllInstall, passant una [línia d'ordres] opcional.\n" +"\tQuan s'utilitza amb [/u], es truca a DllInstall en el mode de\n" +"\tdesinstal·lació.\n" +" [/n] No truquis a DllRegisterServer. S'ha d'utilitzar aquesta opció amb\n" +"\t[/i].\n" "\n" #: regsvr32.rc:41 @@ -13119,7 +12901,7 @@ msgid "" "regsvr32: Invalid or unrecognized switch [%1]\n" "\n" msgstr "" -"regsvr32: Commutador invàlid o no reconegut [%1]\n" +"regsvr32: Commutador no vàlid o no reconegut [%1]\n" "\n" #: regsvr32.rc:42 @@ -13185,11 +12967,12 @@ msgstr "Ús: taskkill [/?] [/f] [/im NomDeProcés | /pid IdDeProcés]\n" #: taskkill.rc:31 msgid "Error: Unknown or invalid command line option specified.\n" msgstr "" -"Error: S'ha especificat una opció de línia d'ordres invàlida o desconeguda.\n" +"Error: S'ha especificat una opció de línia d'ordres no vàlida o " +"desconeguda.\n" #: taskkill.rc:32 msgid "Error: Invalid command line parameter specified.\n" -msgstr "Error: S'ha especificat un paràmetre de línia d'ordres invàlid.\n" +msgstr "Error: S'ha especificat un paràmetre de línia d'ordres no vàlid.\n" #: taskkill.rc:33 msgid "Error: One of options /im or /pid must be specified.\n" @@ -13799,7 +13582,7 @@ msgstr "Mostra temes d'ajuda de l'Administrador de Tasques" #: taskmgr.rc:212 msgid "Displays program information, version number, and copyright" -msgstr "Mostra informació de programa, nombre de versió i drets d'autor" +msgstr "Mostra informació de programa, número de versió i drets d'autor" #: taskmgr.rc:213 msgid "Exits the Task Manager application" @@ -14021,7 +13804,7 @@ msgstr "El procés ha de tenir afinitat amb almenys un processador" #: taskmgr.rc:316 msgid "Invalid Option" -msgstr "Opció invàlida" +msgstr "Opció no vàlida" #: taskmgr.rc:317 msgid "Unable to Access or Set Process Affinity" @@ -14054,22 +13837,21 @@ msgid "" "Do you want to remove the uninstall entry from the registry?" msgstr "" "L'execució de l'ordre de desinstal·lació '%s' ha fallat, potser perquè " -"l'executable manqui.\n" +"manqui l'executable.\n" "Voleu eliminar l'entrada de desinstal·lació del registre?" #: uninstaller.rc:31 msgid "uninstaller: The application with GUID '%1' was not found\n" -msgstr "desinstal·lador: No s'ha trobat l'aplicació amb la GUID '%1'\n" +msgstr "desinstal·lador: No s'ha trobat l'aplicació amb el GUID '%1'\n" #: uninstaller.rc:32 msgid "" "uninstaller: The option '--remove' must be followed by an application GUID\n" -msgstr "" -"desinstal·lador: Una GUID d'aplicació ha de seguir l'opció '--remove'\n" +msgstr "desinstal·lador: Un GUID d'aplicació ha de seguir l'opció '--remove'\n" #: uninstaller.rc:33 msgid "uninstaller: Invalid option [%1]\n" -msgstr "desinstal·lador: Opció invàlida [%1]\n" +msgstr "desinstal·lador: Opció no vàlida [%1]\n" #: uninstaller.rc:35 msgid "" @@ -14312,7 +14094,7 @@ msgstr "A&fegeix..." #: winecfg.rc:238 msgid "Aut&odetect" -msgstr "Autodetecta" +msgstr "Aut&odetecta" #: winecfg.rc:241 msgid "&Path:" @@ -14902,7 +14684,7 @@ msgstr "wineconsole: No s'ha pogut processar l'id del esdeveniment\n" #: wineconsole.rc:45 msgid "wineconsole: Invalid backend\n" -msgstr "wineconsole: Backend invàlid\n" +msgstr "wineconsole: Rerefons no vàlid\n" #: wineconsole.rc:46 msgid "wineconsole: Unrecognized command line option\n" @@ -14918,7 +14700,7 @@ msgid "" "The command is invalid.\n" msgstr "" "wineconsole: L'inici del programa %s ha fallat.\n" -"L'ordre és invàlid.\n" +"L'ordre no és vàlida.\n" #: wineconsole.rc:50 msgid "" @@ -15014,7 +14796,7 @@ msgstr "Caiguda de programa del Wine" #: winedbg.rc:39 msgid "Internal errors - invalid parameters received" -msgstr "Errors interns - paràmetres invàlids rebuts" +msgstr "Errors interns - paràmetres no vàlids rebuts" #: winedbg.rc:40 msgid "(unidentified)" @@ -15290,10 +15072,8 @@ msgid "Expert" msgstr "Expert" #: winemine.rc:74 winemine.rc:33 -#, fuzzy -#| msgid "Result" msgid "Reset Results" -msgstr "Resultat" +msgstr "Reinicia els resultats" #: winemine.rc:80 msgid "Congratulations!" @@ -15321,7 +15101,7 @@ msgstr "Mines" #: winemine.rc:34 msgid "All results will be lost. Are you sure?" -msgstr "" +msgstr "Es perdran tots els resultats. N'esteu segur?" #: winemine.rc:30 msgid "WineMine" @@ -15437,11 +15217,11 @@ msgstr "Error: Àlies no trobat\n" #: wmic.rc:30 msgid "Error: Invalid query\n" -msgstr "Error: Cerca invàlida\n" +msgstr "Error: Consulta no vàlida\n" #: wmic.rc:31 msgid "Error: Invalid syntax for PATH\n" -msgstr "Error: Sintaxi invàlida per a PATH\n" +msgstr "Error: Sintaxi no vàlida per a PATH\n" #: wordpad.rc:31 msgid "&New...\tCtrl+N" @@ -15633,7 +15413,7 @@ msgstr "&Cap ajust de línia" #: wordpad.rc:269 msgid "Wrap text by the &window border" -msgstr "Ajusta el text pela vora de la &finestra" +msgstr "Ajusta el text per la vora de la &finestra" #: wordpad.rc:270 msgid "Wrap text by the &margin" @@ -15801,7 +15581,7 @@ msgstr "" #: wordpad.rc:198 msgid "Invalid number format." -msgstr "El format de nombre és invàlid." +msgstr "El format de nombre no és vàlid." #: wordpad.rc:199 msgid "OLE storage documents are not supported." @@ -15837,11 +15617,11 @@ msgstr "L'inici del Wordpad ha fallat" #: xcopy.rc:30 msgid "Invalid number of parameters - Use xcopy /? for help\n" -msgstr "Nombre de paràmetres invàlid - Utilitzeu xcopy /? per ajuda\n" +msgstr "Nombre de paràmetres no vàlid - Utilitzeu xcopy /? per ajuda\n" #: xcopy.rc:31 msgid "Invalid parameter '%1' - Use xcopy /? for help\n" -msgstr "Paràmetre invàlid '%1' - Utilitzeu xcopy /? per ajuda\n" +msgstr "Paràmetre no vàlid '%1' - Utilitzeu xcopy /? per ajuda\n" #: xcopy.rc:32 msgid "Press <Enter> to begin copying\n" @@ -15939,7 +15719,7 @@ msgstr "" "[/S] Copia els directoris i subdirectoris.\n" "[/E] Copia els directoris i subdirectoris, incloent-hi els buits.\n" "[/Q] No mostris els noms durant la còpia, és a dir, sigues silent.\n" -"[/F] Mostra els noms complets de la font i el destinatari durant la còpia.\n" +"[/F] Mostra els noms complets de la font i la destinació durant la còpia.\n" "[/L] Simula l'operació, mostrant els noms que es copiarien.\n" "[/W] Pregunta abans de començar l'operació de còpia.\n" "[/T] Crea una estructura de directoris buits però no copiïs els fitxers.\n" -- 2.15.1

1 0

[PATCH] Update Catalan translation
by Alex Henrie 18 Dec '17

18 Dec '17

--- po/ca.po | 1112 +++++++++++++++++++++++++------------------------------------- 1 file changed, 446 insertions(+), 666 deletions(-) diff --git a/po/ca.po b/po/ca.po index e759aee8e8..0fdec04444 100644 --- a/po/ca.po +++ b/po/ca.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2016-12-18 20:53-0700\n" +"PO-Revision-Date: 2017-12-17 18:14-0700\n" "Last-Translator: Alex Henrie <alexhenrie24(a)gmail.com>\n" "Language-Team: Catalan\n" "Language: ca\n" @@ -13,7 +13,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.8.11\n" +"X-Generator: Poedit 2.0.5\n" #: appwiz.rc:58 msgid "Install/Uninstall" @@ -842,7 +842,7 @@ msgstr "" #: comdlg32.rc:36 msgid "Invalid character(s) in path" -msgstr "Hi ha caràcters invàlids en el camí" +msgstr "Hi ha caràcters no vàlids en el camí" #: comdlg32.rc:37 msgid "" @@ -1854,7 +1854,7 @@ msgstr "Màscara=" #: crypt32.rc:192 msgid "Registered ID=" -msgstr "ID registrada=" +msgstr "ID registrat=" #: crypt32.rc:193 msgid "Unknown Key Usage" @@ -2439,7 +2439,7 @@ msgid "" "This certificate has an invalid signature. The certificate may have been " "altered or corrupted." msgstr "" -"Aquest certificat té una signatura invàlida. Pot ser que el certificat " +"Aquest certificat té una signatura no vàlida. Pot ser que el certificat " "s'hagués modificat o corromput." #: cryptui.rc:33 @@ -2485,7 +2485,7 @@ msgstr " a " #: cryptui.rc:42 msgid "This certificate has an invalid signature." -msgstr "Aquest certificat té una signatura invàlida." +msgstr "Aquest certificat té una signatura no vàlida." #: cryptui.rc:43 msgid "This certificate has expired or is not yet valid." @@ -3559,7 +3559,7 @@ msgstr "Error en convertir l'objecte a tipus primitiu" #: jscript.rc:29 msgid "Invalid procedure call or argument" -msgstr "Trucada a procediment o argument invàlid" +msgstr "Trucada a procediment o argument no vàlid" #: jscript.rc:30 msgid "Subscript out of range" @@ -3611,7 +3611,7 @@ msgstr "S'esperava '='" #: jscript.rc:42 msgid "Invalid character" -msgstr "Caràcter invàlid" +msgstr "Caràcter no vàlid" #: jscript.rc:43 msgid "Unterminated string constant" @@ -3695,7 +3695,7 @@ msgstr "Error de sintaxi en l'expressió regular" #: jscript.rc:64 msgid "URI to be encoded contains invalid characters" -msgstr "L'URI a codificar conté caràcters invàlids" +msgstr "L'URI a codificar conté caràcters no vàlids" #: jscript.rc:63 msgid "URI to be decoded is incorrect" @@ -3711,7 +3711,7 @@ msgstr "La precisió és fora d'interval" #: jscript.rc:67 msgid "Array length must be a finite positive integer" -msgstr "La longitud del vector ha de ser un enter positiu finit" +msgstr "La longitud del vector ha de ser un nombre enter positiu finit" #: jscript.rc:68 msgid "Array object expected" @@ -3719,7 +3719,7 @@ msgstr "S'esperava un objecte Array" #: ../../include/wine/wine_common_ver.rc:129 msgid "Wine kernel DLL" -msgstr "" +msgstr "DLL de nucli del Wine" #: ../../include/wine/wine_common_ver.rc:134 winemac.rc:32 wineboot.rc:42 msgid "Wine" @@ -3731,7 +3731,7 @@ msgstr "Èxit.\n" #: winerror.mc:31 msgid "Invalid function.\n" -msgstr "La funció és invàlida.\n" +msgstr "La funció no és vàlida.\n" #: winerror.mc:36 msgid "File not found.\n" @@ -3751,7 +3751,7 @@ msgstr "S'ha denegat l'accés.\n" #: winerror.mc:56 msgid "Invalid handle.\n" -msgstr "L'identificador és invàlid.\n" +msgstr "L'identificador no és vàlid.\n" #: winerror.mc:61 msgid "Memory trashed.\n" @@ -3763,7 +3763,7 @@ msgstr "Manca memòria.\n" #: winerror.mc:71 msgid "Invalid block.\n" -msgstr "El bloc és invàlid.\n" +msgstr "El bloc no és vàlid.\n" #: winerror.mc:76 msgid "Bad environment.\n" @@ -3775,11 +3775,11 @@ msgstr "El format és dolent.\n" #: winerror.mc:86 msgid "Invalid access.\n" -msgstr "L'accés és invàlid.\n" +msgstr "L'accés no és vàlid.\n" #: winerror.mc:91 msgid "Invalid data.\n" -msgstr "Les dades són invàlides.\n" +msgstr "Les dades no són vàlides.\n" #: winerror.mc:96 msgid "Out of memory.\n" @@ -3787,7 +3787,7 @@ msgstr "No queda memòria.\n" #: winerror.mc:101 msgid "Invalid drive.\n" -msgstr "La unitat és invàlida.\n" +msgstr "La unitat no és vàlida.\n" #: winerror.mc:106 msgid "Can't delete current directory.\n" @@ -3815,7 +3815,7 @@ msgstr "No està llest.\n" #: winerror.mc:136 msgid "Bad command.\n" -msgstr "L'ordre és dolent.\n" +msgstr "L'ordre és dolenta.\n" #: winerror.mc:141 msgid "CRC error.\n" @@ -3991,11 +3991,11 @@ msgstr "Ja s'ha assignat.\n" #: winerror.mc:356 winerror.mc:1711 msgid "Invalid password.\n" -msgstr "La contrasenya és invàlida.\n" +msgstr "La contrasenya no és vàlida.\n" #: winerror.mc:361 msgid "Invalid parameter.\n" -msgstr "El paràmetre és invàlid.\n" +msgstr "El paràmetre no és vàlid.\n" #: winerror.mc:366 msgid "Net write fault.\n" @@ -4059,15 +4059,15 @@ msgstr "No queden identificadors de cerca.\n" #: winerror.mc:446 msgid "Invalid target handle.\n" -msgstr "L'identificador destinatari és invàlid.\n" +msgstr "L'identificador de destinació no és vàlid.\n" #: winerror.mc:451 msgid "Invalid IOCTL.\n" -msgstr "L'IOCTL és invàlid.\n" +msgstr "L'IOCTL no és vàlid.\n" #: winerror.mc:456 msgid "Invalid verify switch.\n" -msgstr "L'indicador de verificació és invàlid.\n" +msgstr "L'indicador de verificació no és vàlid.\n" #: winerror.mc:461 msgid "Bad driver level.\n" @@ -4087,11 +4087,11 @@ msgstr "La memòria intermèdia és insuficient.\n" #: winerror.mc:481 msgid "Invalid name.\n" -msgstr "El nom és invàlid.\n" +msgstr "El nom no és vàlid.\n" #: winerror.mc:486 msgid "Invalid level.\n" -msgstr "El nivell és invàlid.\n" +msgstr "El nivell no és vàlid.\n" #: winerror.mc:491 msgid "No volume label.\n" @@ -4115,7 +4115,7 @@ msgstr "El procés fill no s'ha acabat.\n" #: winerror.mc:516 msgid "Invalid use of direct access handle.\n" -msgstr "L'ús d'identificador d'accés directe és invàlid.\n" +msgstr "L'ús d'identificador d'accés directe no és vàlid.\n" #: winerror.mc:521 msgid "Negative seek.\n" @@ -4123,7 +4123,7 @@ msgstr "La cerca és negativa.\n" #: winerror.mc:531 msgid "Drive is a JOIN target.\n" -msgstr "La unitat és un destinatari JOIN.\n" +msgstr "La unitat és una destinació JOIN.\n" #: winerror.mc:536 msgid "Drive is already JOINed.\n" @@ -4187,7 +4187,7 @@ msgstr "El camí està ocupat.\n" #: winerror.mc:611 msgid "Already a SUBST target.\n" -msgstr "Ja és un destinatari SUBST.\n" +msgstr "Ja és una destinació SUBST.\n" #: winerror.mc:616 msgid "System trace not specified or disallowed.\n" @@ -4203,7 +4203,7 @@ msgstr "Hi ha massa esperançats per a DosMuxSemWait.\n" #: winerror.mc:631 msgid "DosSemMuxWait list invalid.\n" -msgstr "La llista de DosSemMuxWait és invàlida.\n" +msgstr "La llista de DosSemMuxWait no és vàlida.\n" #: winerror.mc:636 msgid "Volume label too long.\n" @@ -4231,11 +4231,11 @@ msgstr "L'adreça d'ID de fil és dolent.\n" #: winerror.mc:666 msgid "Bad arguments to DosExecPgm.\n" -msgstr "Els paràmetres a DosExecPgm són dolents.\n" +msgstr "Els arguments a DosExecPgm són dolents.\n" #: winerror.mc:671 msgid "Path is invalid.\n" -msgstr "El camí és invàlid.\n" +msgstr "El camí no és vàlid.\n" #: winerror.mc:676 msgid "Signal pending.\n" @@ -4263,11 +4263,11 @@ msgstr "No s'accepten els bloqueigs atòmics.\n" #: winerror.mc:706 msgid "Invalid segment number.\n" -msgstr "El nombre de segment és invàlid.\n" +msgstr "El número de segment no és vàlid.\n" #: winerror.mc:711 msgid "Invalid ordinal for %1.\n" -msgstr "L'ordinal per a %1 és invàlid.\n" +msgstr "L'ordinal per a %1 no és vàlid.\n" #: winerror.mc:716 msgid "File already exists.\n" @@ -4275,7 +4275,7 @@ msgstr "El fitxer ja existeix.\n" #: winerror.mc:721 msgid "Invalid flag number.\n" -msgstr "El nombre de bandera és invàlida.\n" +msgstr "El número de bandera no és vàlid.\n" #: winerror.mc:726 msgid "Semaphore name not found.\n" @@ -4283,23 +4283,23 @@ msgstr "No s'ha trobat el nom de semàfor.\n" #: winerror.mc:731 msgid "Invalid starting code segment for %1.\n" -msgstr "El segment de codi d'inici per a %1 és invàlid.\n" +msgstr "El segment de codi d'inici per a %1 no és vàlid.\n" #: winerror.mc:736 msgid "Invalid starting stack segment for %1.\n" -msgstr "El segment de codi d'inici de pila per a %1 és invàlid.\n" +msgstr "El segment de codi d'inici de pila per a %1 no és vàlid.\n" #: winerror.mc:741 msgid "Invalid module type for %1.\n" -msgstr "El tipus de mòdul per a %1 és invàlid.\n" +msgstr "El tipus de mòdul per a %1 no és vàlid.\n" #: winerror.mc:746 msgid "Invalid EXE signature in %1.\n" -msgstr "La signatura EXE en %1 és invàlida.\n" +msgstr "La signatura EXE en %1 no és vàlida.\n" #: winerror.mc:751 msgid "EXE %1 is marked invalid.\n" -msgstr "L'EXE %1 està marcat com a invàlid.\n" +msgstr "L'EXE %1 està marcat com a no vàlid.\n" #: winerror.mc:756 msgid "Bad EXE format for %1.\n" @@ -4311,11 +4311,11 @@ msgstr "Les dades iterades superen 64k en %1.\n" #: winerror.mc:766 msgid "Invalid MinAllocSize in %1.\n" -msgstr "El MinAllocSize en %1 és invàlid.\n" +msgstr "La MinAllocSize en %1 no és vàlida.\n" #: winerror.mc:771 msgid "Dynlink from invalid ring.\n" -msgstr "L'enllaç dinàmic d'anell és invàlid.\n" +msgstr "L'enllaç dinàmic d'anell no és vàlid.\n" #: winerror.mc:776 msgid "IOPL not enabled.\n" @@ -4323,7 +4323,7 @@ msgstr "L'IOPL no està habilitat.\n" #: winerror.mc:781 msgid "Invalid SEGDPL in %1.\n" -msgstr "L'SEGDPL en %1 és invàlid.\n" +msgstr "L'SEGDPL en %1 no és vàlid.\n" #: winerror.mc:786 msgid "Auto data segment exceeds 64k.\n" @@ -4363,7 +4363,7 @@ msgstr "Hi ha un error en l'ús de comodins de nom de fitxer.\n" #: winerror.mc:831 msgid "Invalid signal number.\n" -msgstr "El nombre de senyal és invàlid.\n" +msgstr "El número de senyal no és vàlid.\n" #: winerror.mc:836 msgid "Error setting signal handler.\n" @@ -4411,7 +4411,7 @@ msgstr "S'ha cancel·lat la sessió.\n" #: winerror.mc:891 msgid "Invalid extended attribute name.\n" -msgstr "El nom d'atribut estès és invàlid.\n" +msgstr "El nom d'atribut estès no és vàlid.\n" #: winerror.mc:896 msgid "Extended attribute list inconsistent.\n" @@ -4427,7 +4427,7 @@ msgstr "No es pot utilitzar la Copy API.\n" #: winerror.mc:911 msgid "Directory name invalid.\n" -msgstr "El nom de directori és invàlid.\n" +msgstr "El nom de directori no és vàlid.\n" #: winerror.mc:916 msgid "Extended attributes didn't fit.\n" @@ -4443,7 +4443,7 @@ msgstr "La taula d'atributs estesos està ple.\n" #: winerror.mc:931 msgid "Invalid extended attribute handle.\n" -msgstr "L'identificador d'atribut estès és invàlid.\n" +msgstr "L'identificador d'atribut estès no és vàlid.\n" #: winerror.mc:936 msgid "Extended attributes not supported.\n" @@ -4467,7 +4467,7 @@ msgstr "No s'ha concedit el bloqueig d'operació.\n" #: winerror.mc:961 msgid "Invalid oplock message received.\n" -msgstr "S'ha rebut un missatge invàlid de bloqueig d'operació.\n" +msgstr "S'ha rebut un missatge no vàlid de bloqueig d'operació.\n" #: winerror.mc:966 msgid "Message 0x%1 not found in file %2.\n" @@ -4475,7 +4475,7 @@ msgstr "No s'ha trobat el missatge 0x%1 en el fitxer %2.\n" #: winerror.mc:971 msgid "Invalid address.\n" -msgstr "L'adreça és invàlida.\n" +msgstr "L'adreça no és vàlida.\n" #: winerror.mc:976 msgid "Arithmetic overflow.\n" @@ -4519,7 +4519,7 @@ msgstr "Hi ha hagut un desbordament de pila.\n" #: winerror.mc:1026 msgid "Invalid message.\n" -msgstr "El missatge és invàlid.\n" +msgstr "El missatge no és vàlid.\n" #: winerror.mc:1031 msgid "Cannot complete.\n" @@ -4527,7 +4527,7 @@ msgstr "No es pot acabar.\n" #: winerror.mc:1036 msgid "Invalid flags.\n" -msgstr "Les banderes són invàlides.\n" +msgstr "Les banderes no són vàlides.\n" #: winerror.mc:1041 msgid "Unrecognized volume.\n" @@ -4535,7 +4535,7 @@ msgstr "No s'ha reconegut el volum.\n" #: winerror.mc:1046 msgid "File invalid.\n" -msgstr "El fitxer és invàlid.\n" +msgstr "El fitxer no és vàlid.\n" #: winerror.mc:1051 msgid "Cannot run full-screen.\n" @@ -4551,7 +4551,7 @@ msgstr "El registre és corrupte.\n" #: winerror.mc:1066 msgid "Invalid key.\n" -msgstr "La clau és invàlida.\n" +msgstr "La clau no és vàlida.\n" #: winerror.mc:1071 msgid "Can't open registry key.\n" @@ -4607,7 +4607,7 @@ msgstr "Els serveis dependents s'estan executant.\n" #: winerror.mc:1136 msgid "Invalid service control.\n" -msgstr "El control de servei és invàlid.\n" +msgstr "El control de servei no és vàlid.\n" #: winerror.mc:1141 msgid "Service request timeout.\n" @@ -4627,7 +4627,7 @@ msgstr "El servei ja està executant.\n" #: winerror.mc:1161 msgid "Invalid service account.\n" -msgstr "El compte de servei és invàlid.\n" +msgstr "El compte de servei no és vàlid.\n" #: winerror.mc:1166 msgid "Service is disabled.\n" @@ -4683,7 +4683,7 @@ msgstr "L'inici de servei s'ha congelat.\n" #: winerror.mc:1231 msgid "Invalid service lock.\n" -msgstr "El bloqueig de servei és invàlid.\n" +msgstr "El bloqueig de servei no és vàlid.\n" #: winerror.mc:1236 msgid "Service marked for delete.\n" @@ -4759,7 +4759,7 @@ msgstr "La partició ha fallat.\n" #: winerror.mc:1326 msgid "Invalid block length.\n" -msgstr "La longitud de bloc és invàlida.\n" +msgstr "La longitud de bloc no és vàlida.\n" #: winerror.mc:1331 msgid "Device not partitioned.\n" @@ -4895,7 +4895,7 @@ msgstr "Aplicació de mode real.\n" #: winerror.mc:1496 msgid "Invalid DLL.\n" -msgstr "La DLL és invàlida.\n" +msgstr "La DLL no és vàlida.\n" #: winerror.mc:1501 msgid "No associated application.\n" @@ -4923,11 +4923,11 @@ msgstr "L'element font està buit.\n" #: winerror.mc:1531 msgid "The destination element is full.\n" -msgstr "L'element destinatari està ple.\n" +msgstr "L'element de destinació està ple.\n" #: winerror.mc:1536 msgid "The element address is invalid.\n" -msgstr "L'adreça d'element és invàlida.\n" +msgstr "L'adreça d'element no és vàlida.\n" #: winerror.mc:1541 msgid "The magazine is not present.\n" @@ -5003,7 +5003,7 @@ msgstr "L'entrada de journal s'ha suprimit.\n" #: winerror.mc:1631 msgid "Invalid device name.\n" -msgstr "El nom de dispositiu és invàlid.\n" +msgstr "El nom de dispositiu no és vàlid.\n" #: winerror.mc:1636 msgid "Connection unavailable.\n" @@ -5019,7 +5019,7 @@ msgstr "No hi ha cap xarxa o el camí és dolent.\n" #: winerror.mc:1651 msgid "Invalid network provider name.\n" -msgstr "El nom de proveïdor de xarxa és invàlid.\n" +msgstr "El nom de proveïdor de xarxa no és vàlid.\n" #: winerror.mc:1656 msgid "Cannot open network connection profile.\n" @@ -5039,39 +5039,39 @@ msgstr "Hi ha hagut un error estès.\n" #: winerror.mc:1676 msgid "Invalid group name.\n" -msgstr "El nom de grup és invàlid.\n" +msgstr "El nom de grup no és vàlid.\n" #: winerror.mc:1681 msgid "Invalid computer name.\n" -msgstr "El nom d'ordinador és invàlid.\n" +msgstr "El nom d'ordinador no és vàlid.\n" #: winerror.mc:1686 msgid "Invalid event name.\n" -msgstr "El nom d'esdeveniment és invàlid.\n" +msgstr "El nom d'esdeveniment no és vàlid.\n" #: winerror.mc:1691 msgid "Invalid domain name.\n" -msgstr "El nom de domini és invàlid.\n" +msgstr "El nom de domini no és vàlid.\n" #: winerror.mc:1696 msgid "Invalid service name.\n" -msgstr "El nom de servei és invàlid.\n" +msgstr "El nom de servei no és vàlid.\n" #: winerror.mc:1701 msgid "Invalid network name.\n" -msgstr "El nom de xarxa és invàlid.\n" +msgstr "El nom de xarxa no és vàlid.\n" #: winerror.mc:1706 msgid "Invalid share name.\n" -msgstr "El nom de compartició és invàlid.\n" +msgstr "El nom de compartició no és vàlid.\n" #: winerror.mc:1716 msgid "Invalid message name.\n" -msgstr "El nom de missatge és invàlid.\n" +msgstr "El nom de missatge no és vàlid.\n" #: winerror.mc:1721 msgid "Invalid message destination.\n" -msgstr "La destinació de missatge és invàlida.\n" +msgstr "La destinació de missatge no és vàlida.\n" #: winerror.mc:1726 msgid "Session credential conflict.\n" @@ -5115,7 +5115,7 @@ msgstr "L'adreça no està associada amb el punt final de transport.\n" #: winerror.mc:1776 msgid "Connection invalid.\n" -msgstr "La connexió és invàlida.\n" +msgstr "La connexió no és vàlida.\n" #: winerror.mc:1781 msgid "Connection is active.\n" @@ -5211,7 +5211,7 @@ msgstr "Realitza l'operació encara que no hagi canviat res.\n" #: winerror.mc:1896 msgid "The user profile is invalid.\n" -msgstr "El perfil d'usuari és invàlid.\n" +msgstr "El perfil d'usuari no és vàlid.\n" #: winerror.mc:1901 msgid "Not supported on Small Business Server.\n" @@ -5223,7 +5223,7 @@ msgstr "No tots els privilegis estan assignats.\n" #: winerror.mc:1911 msgid "Some security IDs not mapped.\n" -msgstr "Algunes ID de seguretat no estan assignades.\n" +msgstr "Alguns ID de seguretat no estan assignats.\n" #: winerror.mc:1916 msgid "No quotas for account.\n" @@ -5247,11 +5247,11 @@ msgstr "Els nivells de revisió són incompatibles.\n" #: winerror.mc:1941 msgid "Invalid owner.\n" -msgstr "El propietari és invàlid.\n" +msgstr "El propietari no és vàlid.\n" #: winerror.mc:1946 msgid "Invalid primary group.\n" -msgstr "El grup primari és invàlid.\n" +msgstr "El grup principal no és vàlid.\n" #: winerror.mc:1951 msgid "No impersonation token.\n" @@ -5279,7 +5279,7 @@ msgstr "No es té el privilegi.\n" #: winerror.mc:1981 msgid "Invalid account name.\n" -msgstr "El nom del compte és invàlid.\n" +msgstr "El nom del compte no és vàlid.\n" #: winerror.mc:1986 msgid "User already exists.\n" @@ -5331,11 +5331,11 @@ msgstr "Hi ha una restricció de compte.\n" #: winerror.mc:2046 msgid "Invalid logon hours.\n" -msgstr "Les hores de sessió són invàlides.\n" +msgstr "Les hores de sessió no són vàlides.\n" #: winerror.mc:2051 msgid "Invalid workstation.\n" -msgstr "L'estació de treball és invàlida.\n" +msgstr "L'estació de treball no és vàlida.\n" #: winerror.mc:2056 msgid "Password expired.\n" @@ -5355,23 +5355,23 @@ msgstr "S'han sol·licitat massa LUID.\n" #: winerror.mc:2076 msgid "LUIDs exhausted.\n" -msgstr "S'han acabat les LUID.\n" +msgstr "S'han acabat els LUID.\n" #: winerror.mc:2081 msgid "Invalid sub authority.\n" -msgstr "La subautoritat és invàlida.\n" +msgstr "La subautoritat no és vàlida.\n" #: winerror.mc:2086 msgid "Invalid ACL.\n" -msgstr "L'ACL és invàlida.\n" +msgstr "L'ACL no és vàlida.\n" #: winerror.mc:2091 msgid "Invalid SID.\n" -msgstr "L'SID és invàlid.\n" +msgstr "L'SID no és vàlid.\n" #: winerror.mc:2096 msgid "Invalid security descriptor.\n" -msgstr "El descriptor de seguretat és invàlid.\n" +msgstr "El descriptor de seguretat no és vàlid.\n" #: winerror.mc:2101 msgid "Bad inherited ACL.\n" @@ -5387,7 +5387,7 @@ msgstr "El servidor no està inhabilitat.\n" #: winerror.mc:2116 msgid "Invalid ID authority.\n" -msgstr "L'autoritat d'ID és invàlida.\n" +msgstr "L'autoritat d'ID no és vàlida.\n" #: winerror.mc:2121 msgid "Allotted space exceeded.\n" @@ -5395,7 +5395,7 @@ msgstr "S'ha superat l'espai assignat.\n" #: winerror.mc:2126 msgid "Invalid group attributes.\n" -msgstr "Els atributs de grup són invàlids.\n" +msgstr "Els atributs de grup no són vàlids.\n" #: winerror.mc:2131 msgid "Bad impersonation level.\n" @@ -5423,15 +5423,15 @@ msgstr "No es pot accedir a la informació de domini.\n" #: winerror.mc:2161 msgid "Invalid server state.\n" -msgstr "L'estat de servidor és invàlid.\n" +msgstr "L'estat de servidor no és vàlid.\n" #: winerror.mc:2166 msgid "Invalid domain state.\n" -msgstr "L'estat de domini és invàlid.\n" +msgstr "L'estat de domini no és vàlid.\n" #: winerror.mc:2171 msgid "Invalid domain role.\n" -msgstr "El paper de domini és invàlid.\n" +msgstr "El rol de domini no és vàlid.\n" #: winerror.mc:2176 msgid "No such domain.\n" @@ -5483,7 +5483,7 @@ msgstr "Hi ha hagut una col·lisió d'ID de sessió d'inici.\n" #: winerror.mc:2236 msgid "Invalid logon type.\n" -msgstr "El tipus d'inici de sessió és invàlid.\n" +msgstr "El tipus d'inici de sessió no és vàlid.\n" #: winerror.mc:2241 msgid "Cannot impersonate.\n" @@ -5491,7 +5491,7 @@ msgstr "No es pot suplantar.\n" #: winerror.mc:2246 msgid "Invalid transaction state.\n" -msgstr "L'estat de transacció és invàlid.\n" +msgstr "L'estat de transacció no és vàlid.\n" #: winerror.mc:2251 msgid "Security DB commit failure.\n" @@ -5511,7 +5511,7 @@ msgstr "L'usuari és integrat.\n" #: winerror.mc:2271 msgid "Group is primary for user.\n" -msgstr "El grup és el primari per a l'usuari.\n" +msgstr "El grup és el principal per a l'usuari.\n" #: winerror.mc:2276 msgid "Token already in use.\n" @@ -5563,7 +5563,7 @@ msgstr "No hi ha tal membre.\n" #: winerror.mc:2341 msgid "Invalid member.\n" -msgstr "El membre és invàlid.\n" +msgstr "El membre no és vàlid.\n" #: winerror.mc:2346 msgid "Too many SIDs.\n" @@ -5595,7 +5595,7 @@ msgstr "S'ha superat la quota de llicència.\n" #: winerror.mc:2381 msgid "Wrong target name.\n" -msgstr "El nom del destinatari és incorrecte.\n" +msgstr "El nom de la destinació és incorrecte.\n" #: winerror.mc:2386 msgid "Mutual authentication failed.\n" @@ -5607,27 +5607,27 @@ msgstr "Hi ha una asimetria de temps entre el client i el servidor.\n" #: winerror.mc:2396 msgid "Invalid window handle.\n" -msgstr "L'identificador de finestra és invàlid.\n" +msgstr "L'identificador de finestra no és vàlid.\n" #: winerror.mc:2401 msgid "Invalid menu handle.\n" -msgstr "L'identificador de menú és invàlid.\n" +msgstr "L'identificador de menú no és vàlid.\n" #: winerror.mc:2406 msgid "Invalid cursor handle.\n" -msgstr "L'identificador de cursor és invàlid.\n" +msgstr "L'identificador de cursor no és vàlid.\n" #: winerror.mc:2411 msgid "Invalid accelerator table handle.\n" -msgstr "L'identificador de taula acceleradora és invàlid.\n" +msgstr "L'identificador de taula acceleradora no és vàlid.\n" #: winerror.mc:2416 msgid "Invalid hook handle.\n" -msgstr "L'identificador de ganxo és invàlid.\n" +msgstr "L'identificador de ganxo no és vàlid.\n" #: winerror.mc:2421 msgid "Invalid DWP handle.\n" -msgstr "L'identificador DWP és invàlid.\n" +msgstr "L'identificador DWP no és vàlid.\n" #: winerror.mc:2426 msgid "Can't create top-level child window.\n" @@ -5659,11 +5659,11 @@ msgstr "La classe té finestres obertes.\n" #: winerror.mc:2461 msgid "Invalid index.\n" -msgstr "L'índex és invàlid.\n" +msgstr "L'índex no és vàlid.\n" #: winerror.mc:2466 msgid "Invalid icon handle.\n" -msgstr "L'identificador d'icona és invàlid.\n" +msgstr "L'identificador d'icona no és vàlid.\n" #: winerror.mc:2471 msgid "Private dialog index.\n" @@ -5671,7 +5671,7 @@ msgstr "L'índex de diàleg és privat.\n" #: winerror.mc:2476 msgid "List box ID not found.\n" -msgstr "No s'ha trobat l'ID de caixa de llista.\n" +msgstr "No s'ha trobat l'ID de quadre de llista.\n" #: winerror.mc:2481 msgid "No wildcard characters.\n" @@ -5695,7 +5695,7 @@ msgstr "No s'ha trobat l'ID de control.\n" #: winerror.mc:2506 msgid "Invalid combo box message.\n" -msgstr "El missatge de quadre combinat és invàlid.\n" +msgstr "El missatge de quadre combinat no és vàlid.\n" #: winerror.mc:2511 msgid "Not a combo box window.\n" @@ -5703,7 +5703,7 @@ msgstr "No és finestra de quadre combinat.\n" #: winerror.mc:2516 msgid "Invalid edit height.\n" -msgstr "L'altura d'edició és invàlida.\n" +msgstr "L'altura d'edició no és vàlida.\n" #: winerror.mc:2521 msgid "DC not found.\n" @@ -5711,11 +5711,11 @@ msgstr "No s'ha trobat el DC.\n" #: winerror.mc:2526 msgid "Invalid hook filter.\n" -msgstr "El filtre de ganxo és invàlid.\n" +msgstr "El filtre de ganxo no és vàlid.\n" #: winerror.mc:2531 msgid "Invalid filter procedure.\n" -msgstr "El procediment de filtre és invàlid.\n" +msgstr "El procediment de filtre no és vàlid.\n" #: winerror.mc:2536 msgid "Hook procedure needs module handle.\n" @@ -5735,15 +5735,15 @@ msgstr "El procediment de ganxo no està instal·lat.\n" #: winerror.mc:2556 msgid "Invalid list box message.\n" -msgstr "El missatge de caixa de llista és invàlid.\n" +msgstr "El missatge de quadre de llista no és vàlid.\n" #: winerror.mc:2561 msgid "Invalid LB_SETCOUNT sent.\n" -msgstr "S'ha enviat un LB_SETCOUNT invàlid.\n" +msgstr "S'ha enviat un LB_SETCOUNT no vàlid.\n" #: winerror.mc:2566 msgid "No tab stops on this list box.\n" -msgstr "No hi ha cap tabulador que s'aturi en aquesta caixa de llista.\n" +msgstr "No hi ha cap tabulador que s'aturi en aquest quadre de llista.\n" #: winerror.mc:2571 msgid "Can't destroy object owned by another thread.\n" @@ -5759,11 +5759,11 @@ msgstr "La finestra no té menú de sistema.\n" #: winerror.mc:2586 msgid "Invalid message box style.\n" -msgstr "L'estil de quadre de missatge és invàlid.\n" +msgstr "L'estil de quadre de missatge no és vàlid.\n" #: winerror.mc:2591 msgid "Invalid SPI parameter.\n" -msgstr "El paràmetre SPI és invàlid.\n" +msgstr "El paràmetre SPI no és vàlid.\n" #: winerror.mc:2596 msgid "Screen already locked.\n" @@ -5779,11 +5779,11 @@ msgstr "No és finestra filla.\n" #: winerror.mc:2611 msgid "Invalid GW command.\n" -msgstr "L'ordre GW és invàlid.\n" +msgstr "L'ordre GW no és vàlida.\n" #: winerror.mc:2616 msgid "Invalid thread ID.\n" -msgstr "L'ID de fil és invàlid.\n" +msgstr "L'ID de fil no és vàlid.\n" #: winerror.mc:2621 msgid "Not an MDI child window.\n" @@ -5799,11 +5799,11 @@ msgstr "No hi ha cap barra de desplaçament.\n" #: winerror.mc:2636 msgid "Invalid scrollbar range.\n" -msgstr "L'interval de desplaçament és invàlid.\n" +msgstr "L'interval de desplaçament no és vàlid.\n" #: winerror.mc:2641 msgid "Invalid ShowWin command.\n" -msgstr "L'ordre ShowWin és invàlid.\n" +msgstr "L'ordre ShowWin no és vàlida.\n" #: winerror.mc:2646 msgid "No system resources.\n" @@ -5835,7 +5835,7 @@ msgstr "No s'ha trobat l'element de menú.\n" #: winerror.mc:2681 msgid "Invalid keyboard handle.\n" -msgstr "L'identificador de teclat és invàlid.\n" +msgstr "L'identificador de teclat no és vàlid.\n" #: winerror.mc:2686 msgid "Hook type not allowed.\n" @@ -5851,7 +5851,7 @@ msgstr "S'ha superat el temps d'espera.\n" #: winerror.mc:2701 msgid "Invalid monitor handle.\n" -msgstr "L'identificador de monitor és invàlid.\n" +msgstr "L'identificador de monitor no és vàlid.\n" #: winerror.mc:2706 msgid "Event log file corrupt.\n" @@ -5903,7 +5903,7 @@ msgstr "La propietat és desconeguda.\n" #: winerror.mc:2766 msgid "Invalid handle state.\n" -msgstr "L'estat d'identificador és invàlid.\n" +msgstr "L'estat d'identificador no és vàlid.\n" #: winerror.mc:2771 msgid "Bad configuration.\n" @@ -5927,11 +5927,11 @@ msgstr "S'ha desinstal·lat el producte.\n" #: winerror.mc:2796 msgid "Invalid query syntax.\n" -msgstr "La sintaxi de consulta és invàlida.\n" +msgstr "La sintaxi de consulta no és vàlida.\n" #: winerror.mc:2801 msgid "Invalid field.\n" -msgstr "El camp és invàlid.\n" +msgstr "El camp no és vàlid.\n" #: winerror.mc:2806 msgid "Device removed.\n" @@ -5947,7 +5947,7 @@ msgstr "El paquet d'instal·lació ha fallat en obrir.\n" #: winerror.mc:2821 msgid "Installation package is invalid.\n" -msgstr "El paquet d'instal·lació és invàlid.\n" +msgstr "El paquet d'instal·lació no és vàlid.\n" #: winerror.mc:2826 msgid "Installer user interface failed.\n" @@ -5979,7 +5979,7 @@ msgstr "La funció ha fallat.\n" #: winerror.mc:2861 msgid "Invalid table.\n" -msgstr "La taula és invàlida.\n" +msgstr "La taula no és vàlida.\n" #: winerror.mc:2866 msgid "Data type mismatch.\n" @@ -6011,7 +6011,7 @@ msgstr "S'ha fallat en obrir el paquet de pedaç.\n" #: winerror.mc:2901 msgid "Invalid patch package.\n" -msgstr "El paquet de pedaç és invàlid.\n" +msgstr "El paquet de pedaç no és vàlid.\n" #: winerror.mc:2906 msgid "Unsupported patch package.\n" @@ -6023,7 +6023,7 @@ msgstr "Una altra versió està instal·lada.\n" #: winerror.mc:2916 msgid "Invalid command line.\n" -msgstr "La línia d'ordres és invàlida.\n" +msgstr "La línia d'ordres no és vàlida.\n" #: winerror.mc:2921 msgid "Remote installation not allowed.\n" @@ -6035,15 +6035,15 @@ msgstr "S'ha iniciat un reinici després d'instal·lació amb èxit.\n" #: winerror.mc:2931 msgid "Invalid string binding.\n" -msgstr "El lligament de cadena és invàlid.\n" +msgstr "La vinculació de cadena no és vàlida.\n" #: winerror.mc:2936 msgid "Wrong kind of binding.\n" -msgstr "El tipus de lligament és incorrecte.\n" +msgstr "El tipus de vinculació és incorrecte.\n" #: winerror.mc:2941 msgid "Invalid binding.\n" -msgstr "El lligament és invàlid.\n" +msgstr "La vinculació no és vàlida.\n" #: winerror.mc:2946 msgid "RPC protocol sequence not supported.\n" @@ -6051,19 +6051,19 @@ msgstr "La seqüència de protocol RPC no és compatible.\n" #: winerror.mc:2951 msgid "Invalid RPC protocol sequence.\n" -msgstr "La seqüència de protocol RPC és invàlida.\n" +msgstr "La seqüència de protocol RPC no és vàlida.\n" #: winerror.mc:2956 msgid "Invalid string UUID.\n" -msgstr "L'UUID de cadena és invàlida.\n" +msgstr "L'UUID de cadena no és vàlid.\n" #: winerror.mc:2961 msgid "Invalid endpoint format.\n" -msgstr "El format de punt final és invàlid.\n" +msgstr "El format de punt final no és vàlid.\n" #: winerror.mc:2966 msgid "Invalid network address.\n" -msgstr "L'adreça de xarxa és invàlida.\n" +msgstr "L'adreça de xarxa no és vàlida.\n" #: winerror.mc:2971 msgid "No endpoint found.\n" @@ -6071,7 +6071,7 @@ msgstr "No s'ha trobat cap punt final.\n" #: winerror.mc:2976 msgid "Invalid timeout value.\n" -msgstr "El valor de temps d'espera és invàlid.\n" +msgstr "El valor de temps d'espera no és vàlid.\n" #: winerror.mc:2981 msgid "Object UUID not found.\n" @@ -6107,7 +6107,7 @@ msgstr "La interfície és desconeguda.\n" #: winerror.mc:3021 msgid "No bindings.\n" -msgstr "No hi ha cap lligament.\n" +msgstr "No hi ha cap vinculació.\n" #: winerror.mc:3026 msgid "No protocol sequences.\n" @@ -6131,7 +6131,7 @@ msgstr "El servidor RPC està massa ocupat.\n" #: winerror.mc:3051 msgid "Invalid network options.\n" -msgstr "Les opcions de xarxa són invàlides.\n" +msgstr "Les opcions de xarxa no són vàlides.\n" #: winerror.mc:3056 msgid "No RPC call active.\n" @@ -6155,11 +6155,11 @@ msgstr "La sintaxi de transferència és incompatible.\n" #: winerror.mc:3086 msgid "Invalid tag.\n" -msgstr "L'etiqueta és invàlida.\n" +msgstr "L'etiqueta no és vàlida.\n" #: winerror.mc:3091 msgid "Invalid array bounds.\n" -msgstr "Els límits de vector són invàlids.\n" +msgstr "Els límits de vector no són vàlids.\n" #: winerror.mc:3096 msgid "No entry name.\n" @@ -6167,7 +6167,7 @@ msgstr "No hi ha cap nom d'entrada.\n" #: winerror.mc:3101 msgid "Invalid name syntax.\n" -msgstr "La sintaxi de nom és invàlid.\n" +msgstr "La sintaxi de nom no és vàlida.\n" #: winerror.mc:3106 msgid "Unsupported name syntax.\n" @@ -6199,11 +6199,11 @@ msgstr "No s'ha trobat la seqüència de protocol.\n" #: winerror.mc:3141 msgid "Procedure number out of range.\n" -msgstr "El nombre de procediment és fora d'interval.\n" +msgstr "El número de procediment és fora d'interval.\n" #: winerror.mc:3146 msgid "Binding has no authentication data.\n" -msgstr "El lligament no té dades d'autenticació.\n" +msgstr "La vinculació no té dades d'autenticació.\n" #: winerror.mc:3151 msgid "Unknown authentication service.\n" @@ -6215,7 +6215,7 @@ msgstr "El nivell d'autenticació és desconegut.\n" #: winerror.mc:3161 msgid "Invalid authentication identity.\n" -msgstr "La identitat d'autenticació és invàlid.\n" +msgstr "La identitat d'autenticació no és vàlida.\n" #: winerror.mc:3166 msgid "Unknown authorization service.\n" @@ -6223,7 +6223,7 @@ msgstr "El servei d'autorització és desconegut.\n" #: winerror.mc:3171 msgid "Invalid entry.\n" -msgstr "L'entrada és invàlida.\n" +msgstr "L'entrada no és vàlida.\n" #: winerror.mc:3176 msgid "Can't perform operation.\n" @@ -6243,7 +6243,7 @@ msgstr "El nom és incomplet.\n" #: winerror.mc:3196 msgid "Invalid version option.\n" -msgstr "L'opció de versió és invàlida.\n" +msgstr "L'opció de versió no és vàlida.\n" #: winerror.mc:3201 msgid "No more members.\n" @@ -6271,7 +6271,7 @@ msgstr "El servei de noms no està disponible.\n" #: winerror.mc:3231 msgid "Invalid network address family.\n" -msgstr "La família d'adreces de xarxa és invàlida.\n" +msgstr "La família d'adreces de xarxa no és vàlida.\n" #: winerror.mc:3236 msgid "Operation not supported.\n" @@ -6327,7 +6327,7 @@ msgstr "L'identificador de context és danyat.\n" #: winerror.mc:3301 msgid "Binding handle mismatch.\n" -msgstr "Els identificadors de lligament no es coincideixen.\n" +msgstr "Els identificadors de vinculació no es coincideixen.\n" #: winerror.mc:3306 msgid "Cannot get call handle.\n" @@ -6351,7 +6351,7 @@ msgstr "Les dades d'esbós (stub) són dolentes.\n" #: winerror.mc:3331 msgid "Invalid user buffer.\n" -msgstr "La memòria intermèdia d'usuari és invàlida.\n" +msgstr "La memòria intermèdia d'usuari no és vàlida.\n" #: winerror.mc:3336 msgid "Unrecognized media.\n" @@ -6411,15 +6411,15 @@ msgstr "El processador d'impressió és desconegut.\n" #: winerror.mc:3406 msgid "Invalid separator file.\n" -msgstr "El fitxer separador és invàlid.\n" +msgstr "El fitxer separador no és vàlid.\n" #: winerror.mc:3411 msgid "Invalid priority.\n" -msgstr "La prioritat és invàlida.\n" +msgstr "La prioritat no és vàlida.\n" #: winerror.mc:3416 msgid "Invalid printer name.\n" -msgstr "El nom d'impressora és invàlid.\n" +msgstr "El nom d'impressora no és vàlid.\n" #: winerror.mc:3421 msgid "Printer already exists.\n" @@ -6427,19 +6427,19 @@ msgstr "La impressora ja existeix.\n" #: winerror.mc:3426 msgid "Invalid printer command.\n" -msgstr "L'ordre d'impressora és invàlid.\n" +msgstr "L'ordre d'impressora no és vàlida.\n" #: winerror.mc:3431 msgid "Invalid data type.\n" -msgstr "El tipus de dades és invàlid.\n" +msgstr "El tipus de dades no és vàlid.\n" #: winerror.mc:3436 msgid "Invalid environment.\n" -msgstr "L'entorn és invàlid.\n" +msgstr "L'entorn no és vàlid.\n" #: winerror.mc:3441 msgid "No more bindings.\n" -msgstr "No hi ha més lligaments.\n" +msgstr "No hi ha més vinculacions.\n" #: winerror.mc:3446 msgid "Can't log on with inter-domain trust account.\n" @@ -6493,7 +6493,7 @@ msgstr "S'ha cancel·lat la trucada RPC.\n" #: winerror.mc:3506 msgid "Binding incomplete.\n" -msgstr "El lligament està incomplet.\n" +msgstr "La vinculació està incompleta.\n" #: winerror.mc:3511 msgid "RPC comm failure.\n" @@ -6525,7 +6525,7 @@ msgstr "No s'ha cancel·lat el fil.\n" #: winerror.mc:3546 msgid "Invalid handle operation.\n" -msgstr "L'operació d'identificador és invàlida.\n" +msgstr "L'operació d'identificador no és vàlida.\n" #: winerror.mc:3551 msgid "Wrong serializing package version.\n" @@ -6537,11 +6537,11 @@ msgstr "La versió d'esbós (stub) és incorrecta.\n" #: winerror.mc:3561 msgid "Invalid pipe object.\n" -msgstr "L'objecte de canonada és invàlid.\n" +msgstr "L'objecte de canonada no és vàlid.\n" #: winerror.mc:3566 msgid "Wrong pipe order.\n" -msgstr "L'ordre de canonada és incorrecte.\n" +msgstr "L'ordre de canonada és incorrecta.\n" #: winerror.mc:3571 msgid "Wrong pipe version.\n" @@ -6557,19 +6557,19 @@ msgstr "No es pot crear la DB assignadora de punts finals.\n" #: winerror.mc:3586 msgid "Invalid object.\n" -msgstr "L'objecte és invàlid.\n" +msgstr "L'objecte no és vàlid.\n" #: winerror.mc:3591 msgid "Invalid time.\n" -msgstr "L'hora és invàlida.\n" +msgstr "L'hora no és vàlida.\n" #: winerror.mc:3596 msgid "Invalid form name.\n" -msgstr "El nom de forma és invàlid.\n" +msgstr "El nom de forma no és vàlid.\n" #: winerror.mc:3601 msgid "Invalid form size.\n" -msgstr "La mida de forma és invàlida.\n" +msgstr "La mida de forma no és vàlida.\n" #: winerror.mc:3606 msgid "Already awaiting printer handle.\n" @@ -6581,7 +6581,7 @@ msgstr "S'ha suprimit la impressora.\n" #: winerror.mc:3616 msgid "Invalid printer state.\n" -msgstr "L'estat d'impressora és invàlid.\n" +msgstr "L'estat d'impressora no és vàlid.\n" #: winerror.mc:3621 msgid "User must change password.\n" @@ -6597,15 +6597,15 @@ msgstr "El compte està bloquejat.\n" #: winerror.mc:3636 msgid "Invalid pixel format.\n" -msgstr "El format de píxels és invàlid.\n" +msgstr "El format de píxels no és vàlid.\n" #: winerror.mc:3641 msgid "Invalid driver.\n" -msgstr "El controlador és invàlid.\n" +msgstr "El controlador no és vàlid.\n" #: winerror.mc:3646 msgid "Invalid object resolver set.\n" -msgstr "El conjunt de resolució d'objectes és invàlid.\n" +msgstr "El conjunt de resolució d'objectes no és vàlid.\n" #: winerror.mc:3651 msgid "Incomplete RPC send.\n" @@ -6613,11 +6613,11 @@ msgstr "L'enviament RPC està incomplet.\n" #: winerror.mc:3656 msgid "Invalid asynchronous RPC handle.\n" -msgstr "L'identificador RPC asíncron és invàlid.\n" +msgstr "L'identificador RPC asíncron no és vàlid.\n" #: winerror.mc:3661 msgid "Invalid asynchronous RPC call.\n" -msgstr "La trucada RPC asíncrona és invàlida.\n" +msgstr "La trucada RPC asíncrona no és vàlida.\n" #: winerror.mc:3666 msgid "RPC pipe closed.\n" @@ -6908,320 +6908,258 @@ msgid "choose which folder contains %s" msgstr "trieu quina carpeta conté %s" #: msi.rc:90 -#, fuzzy -#| msgid "No registry log space.\n" msgid "Allocating registry space" -msgstr "No hi ha espai per al registre del registre.\n" +msgstr "S'està assignant espai en el registre" #: msi.rc:91 -#, fuzzy -#| msgid "Single-instance application.\n" msgid "Searching for installed applications" -msgstr "Aplicació d'instància única.\n" +msgstr "S'estan cercant aplicacions instalades" #: msi.rc:92 msgid "Binding executables" -msgstr "" +msgstr "S'estan vinculant els executables" #: msi.rc:93 msi.rc:136 -#, fuzzy -#| msgid "Searching for %s" msgid "Searching for qualifying products" -msgstr "S'està cercant %s" +msgstr "S'estan cercant productes qualificants" #: msi.rc:94 msi.rc:95 msi.rc:100 msgid "Computing space requirements" -msgstr "" +msgstr "S'estan computant els requeriments d'espai" #: msi.rc:96 -#, fuzzy -#| msgid "Target folder" msgid "Creating folders" -msgstr "Carpeta de destinació" +msgstr "S'estan creant carpetes" #: msi.rc:97 -#, fuzzy -#| msgid "Create Shor&tcut" msgid "Creating shortcuts" -msgstr "Crea &una drecera" +msgstr "S'estan creant dreceres" #: msi.rc:98 -#, fuzzy -#| msgid "Exception in service.\n" msgid "Deleting services" -msgstr "Hi ha hagut una excepció en el servei.\n" +msgstr "S'estan eliminant serveis" #: msi.rc:99 -#, fuzzy -#| msgid "Creation date" msgid "Creating duplicate files" -msgstr "Data de creació" +msgstr "S'estan creant fitxers duplicats" #: msi.rc:101 -#, fuzzy -#| msgid "No associated application.\n" msgid "Searching for related applications" -msgstr "Cap aplicació està associada.\n" +msgstr "S'estan cercant aplicacions relacionades" #: msi.rc:102 msgid "Copying network install files" -msgstr "" +msgstr "S'estan copiant els fitxers d'instal·lació de xarxa" #: msi.rc:103 -#, fuzzy -#| msgid "Copying Files..." msgid "Copying new files" -msgstr "S'estan copiant els fitxers..." +msgstr "S'estan copiant els fitxers nous" #: msi.rc:104 -#, fuzzy -#| msgid "Installation of component failed: %08x" msgid "Installing ODBC components" -msgstr "La instal·lació del component ha fallat: %08x" +msgstr "S'estan instal·lant components ODBC" #: msi.rc:105 -#, fuzzy -#| msgid "Installer service failed.\n" msgid "Installing new services" -msgstr "El servei d'instal·lació ha fallat.\n" +msgstr "S'estan instal·lant els serveis nous" #: msi.rc:106 -#, fuzzy -#| msgid "Install/Uninstall" msgid "Installing system catalog" -msgstr "Instal·la/desinstal·la" +msgstr "S'està instal·lant el catàleg de sistema" #: msi.rc:107 -#, fuzzy -#| msgid "Wine Application Uninstaller" msgid "Validating install" -msgstr "Desinstal·lador d'Aplicacions del Wine" +msgstr "S'està validant l'instalació" #: msi.rc:108 msgid "Evaluating launch conditions" -msgstr "" +msgstr "S'estan avaluant les condicions d'execució" #: msi.rc:109 msgid "Migrating feature states from related applications" msgstr "" +"S'estan migrant els estats de les característiques des de les aplicacions " +"relacionades" #: msi.rc:110 -#, fuzzy -#| msgid "Icon files" msgid "Moving files" -msgstr "Fitxers d'icona" +msgstr "S'estan movent fixters" #: msi.rc:111 -#, fuzzy -#| msgid "Version information" msgid "Publishing assembly information" -msgstr "Informació de versió" +msgstr "S'està publicant informació de assemblatge" #: msi.rc:112 msgid "Unpublishing assembly information" -msgstr "" +msgstr "S'està despublicant la informació d'assemblatge" #: msi.rc:113 -#, fuzzy -#| msgid "Icon files" msgid "Patching files" -msgstr "Fitxers d'icona" +msgstr "S'estan apedaçant fitxers" #: msi.rc:114 msgid "Updating component registration" -msgstr "" +msgstr "S'està actualitzant la registració de component" #: msi.rc:115 msgid "Publishing Qualified Components" -msgstr "" +msgstr "S'estan publicant els components qualificats" #: msi.rc:116 msgid "Publishing Product Features" -msgstr "" +msgstr "S'estan publicant les característiques de producte" #: msi.rc:117 -#, fuzzy -#| msgid "Client Information" msgid "Publishing product information" -msgstr "Informació de client" +msgstr "S'està publicant la informació de producte" #: msi.rc:118 msgid "Registering Class servers" -msgstr "" +msgstr "S'estan registrant els servidors de classe" #: msi.rc:119 msgid "Registering COM+ Applications and Components" -msgstr "" +msgstr "S'estan registrant les aplicacions i els components COM+" #: msi.rc:120 msgid "Registering extension servers" -msgstr "" +msgstr "S'estan registrant els servidors d'extensió" #: msi.rc:121 msgid "Registering fonts" -msgstr "" +msgstr "S'estan registrant els tipus de lletra" #: msi.rc:122 -#, fuzzy -#| msgid "Registry Editor" msgid "Registering MIME info" -msgstr "Editor de Registre" +msgstr "S'està registrant la informació MIME" #: msi.rc:123 -#, fuzzy -#| msgid "Registry is corrupt.\n" msgid "Registering product" -msgstr "El registre està corrupte.\n" +msgstr "S'està registrant el producte" #: msi.rc:124 msgid "Registering program identifiers" -msgstr "" +msgstr "S'estan registrant els identificadors de programa" #: msi.rc:125 -#, fuzzy -#| msgid "Type Libraries" msgid "Registering type libraries" -msgstr "Biblioteques de tipus" +msgstr "S'estan registrant les biblioteques de tipus" #: msi.rc:126 -#, fuzzy -#| msgid "Resource in use.\n" msgid "Registering user" -msgstr "El recurs està en ús.\n" +msgstr "S'està registrant l'usuari" #: msi.rc:127 -#, fuzzy -#| msgid "&Remove duplicates" msgid "Removing duplicated files" -msgstr "&Elimina els duplicats" +msgstr "S'estan eliminant els fitxers duplicats" #: msi.rc:128 msi.rc:152 -#, fuzzy -#| msgid "Applying font settings" msgid "Updating environment strings" -msgstr "S'està aplicant la configuració de lletra" +msgstr "S'estan actualitzant les cadenes d'entorn" #: msi.rc:129 -#, fuzzy -#| msgid "&Remove application" msgid "Removing applications" -msgstr "&Elimina aplicació" +msgstr "S'estan eliminant les aplicacions" #: msi.rc:130 -#, fuzzy -#| msgid "Icon files" msgid "Removing files" -msgstr "Fitxers d'icona" +msgstr "S'estan eliminant els fitxers" #: msi.rc:131 msgid "Removing folders" -msgstr "" +msgstr "S'estan eliminant les carpetes" #: msi.rc:132 msgid "Removing INI files entries" -msgstr "" +msgstr "S'estan eliminant les entrades en els fitxers INI" #: msi.rc:133 -#, fuzzy -#| msgid "Domain Component" msgid "Removing ODBC components" -msgstr "Component de domini" +msgstr "S'estan eliminant els components ODBC" #: msi.rc:134 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Removing system registry values" -msgstr "regedit: No s'ha pogut obrir la clau de registre '%1'.\n" +msgstr "S'estan eliminant els valors del registre de sistema" #: msi.rc:135 msgid "Removing shortcuts" -msgstr "" +msgstr "S'estan eliminant les dreceres" #: msi.rc:137 msgid "Registering modules" -msgstr "" +msgstr "S'estan registrant els mòduls" #: msi.rc:138 msgid "Unregistering modules" -msgstr "" +msgstr "S'estan desregistrant els mòduls" #: msi.rc:139 -#, fuzzy -#| msgid "Initializing; " msgid "Initializing ODBC directories" -msgstr "S'està inicialitzant; " +msgstr "S'estan inicialitzant els directoris ODBC" #: msi.rc:140 -#, fuzzy -#| msgid "Starting Wordpad failed" msgid "Starting services" -msgstr "L'inici del Wordpad ha fallat" +msgstr "S'estan iniciant serveis" #: msi.rc:141 -#, fuzzy -#| msgid "Stopping dependent service: %1\n" msgid "Stopping services" -msgstr "S'està aturant el servei dependent: %1\n" +msgstr "S'estan aturant els serveis" #: msi.rc:142 msgid "Unpublishing Qualified Components" -msgstr "" +msgstr "S'estan desregistrant els components qualificats" #: msi.rc:143 msgid "Unpublishing Product Features" -msgstr "" +msgstr "S'estan despublicant les característiques de producte" #: msi.rc:144 -#, fuzzy -#| msgid "Client Information" msgid "Unpublishing product information" -msgstr "Informació de client" +msgstr "S'està despublicant la informació de producte" #: msi.rc:145 msgid "Unregister Class servers" -msgstr "" +msgstr "S'estan desregistrant els servidors de classe" #: msi.rc:146 msgid "Unregistering COM+ Applications and Components" -msgstr "" +msgstr "S'estan desregistrant les aplicacions i els components COM+" #: msi.rc:147 msgid "Unregistering extension servers" -msgstr "" +msgstr "S'estan desregistrant els servidors d'extensió" #: msi.rc:148 msgid "Unregistering fonts" -msgstr "" +msgstr "S'estan desregistrant els tipus de lletra" #: msi.rc:149 msgid "Unregistering MIME info" -msgstr "" +msgstr "S'està desregistrant la informació MIME" #: msi.rc:150 msgid "Unregistering program identifiers" -msgstr "" +msgstr "S'estan desregistrant els identificadors de programa" #: msi.rc:151 msgid "Unregistering type libraries" -msgstr "" +msgstr "S'estan desregistrant les biblioteques de tipus" #: msi.rc:153 msgid "Writing INI files values" -msgstr "" +msgstr "S'estan escrivint valors als fitxers INI" #: msi.rc:154 -#, fuzzy -#| msgid "Warning: system library" msgid "Writing system registry values" -msgstr "Advertència: biblioteca de sistema" +msgstr "S'estan escrivint valors al registre del sistema" #: msi.rc:160 msgid "Free space: [1]" -msgstr "" +msgstr "Espai lliure: [1]" #: msi.rc:161 msgid "Property: [1], Signature: [2]" -msgstr "" +msgstr "Propietat: [1], Signatura: [2]" #: msi.rc:162 msgid "File: [1]" @@ -7233,73 +7171,63 @@ msgstr "Carpeta: [1]" #: msi.rc:164 msi.rc:193 msgid "Shortcut: [1]" -msgstr "" +msgstr "Drecera: [1]" #: msi.rc:165 msi.rc:196 msi.rc:197 -#, fuzzy -#| msgid "De&vice:" msgid "Service: [1]" -msgstr "&Dispositiu:" +msgstr "Servei: [1]" #: msi.rc:166 msi.rc:169 msi.rc:173 msgid "File: [1], Directory: [9], Size: [6]" -msgstr "" +msgstr "Fitxer: [1] Directori: [9], Mida: [6]" #: msi.rc:167 -#, fuzzy -#| msgid "application" msgid "Found application: [1]" -msgstr "aplicació" +msgstr "S'ha trobat una aplicació: [1]" #: msi.rc:168 msgid "File: [1], Directory: [9], Size: [6]" -msgstr "" +msgstr "Fitxer: [1] Directori: [9], Mida: [6]" #: msi.rc:170 -#, fuzzy -#| msgid "De&vice:" msgid "Service: [2]" -msgstr "&Dispositiu:" +msgstr "Servei: [2]" #: msi.rc:171 msgid "File: [1], Dependencies: [2]" -msgstr "" +msgstr "Fitxer: [1], Dependències: [2]" #: msi.rc:172 -#, fuzzy -#| msgid "Applications" msgid "Application: [1]" -msgstr "Aplicacions" +msgstr "Aplicació: [1]" #: msi.rc:174 msi.rc:175 msgid "Application Context:[1], Assembly Name:[2]" -msgstr "" +msgstr "Context d'aplicació:[1], Nom d'assemblatge:[2]" #: msi.rc:176 msgid "File: [1], Directory: [2], Size: [3]" -msgstr "" +msgstr "Fitxer: [1], Directori: [2], Mida: [3]" #: msi.rc:177 msi.rc:198 msgid "Component ID: [1], Qualifier: [2]" -msgstr "" +msgstr "ID de component: [1], Qualificador: [2]" #: msi.rc:178 msi.rc:199 msgid "Feature: [1]" -msgstr "" +msgstr "Característica: [1]" #: msi.rc:179 msi.rc:200 msgid "Class Id: [1]" -msgstr "" +msgstr "Id de classe: [1]" #: msi.rc:180 msgid "AppId: [1]{{, AppType: [2], Users: [3], RSN: [4]}}" -msgstr "" +msgstr "AppId: [1]{{, AppType: [2], Usuaris: [3], RSN: [4]}}" #: msi.rc:181 msi.rc:202 -#, fuzzy -#| msgid "Extensions Only" msgid "Extension: [1]" -msgstr "Només extensions" +msgstr "Extensió: [1]" #: msi.rc:182 msi.rc:203 msgid "Font: [1]" @@ -7307,63 +7235,63 @@ msgstr "Tipus de lletra: [1]" #: msi.rc:183 msi.rc:204 msgid "MIME Content Type: [1], Extension: [2]" -msgstr "" +msgstr "Tipus de contingut MIME: [1], Extensió: [2]" #: msi.rc:184 msi.rc:205 msgid "ProgId: [1]" -msgstr "" +msgstr "ProgId: [1]" #: msi.rc:185 msi.rc:206 msgid "LibID: [1]" -msgstr "" +msgstr "LibID: [1]" #: msi.rc:186 msi.rc:189 msgid "File: [1], Directory: [9]" -msgstr "" +msgstr "Fitxer: [1], Directori: [9]" #: msi.rc:187 msi.rc:207 msgid "Name: [1], Value: [2], Action [3]" -msgstr "" +msgstr "Nom: [1], Valor: [2], Acció [3]" #: msi.rc:188 msgid "Application: [1], Command line: [2]" -msgstr "" +msgstr "Aplicació: [1], Línia d'ordres: [2]" #: msi.rc:191 msi.rc:208 msgid "File: [1], Section: [2], Key: [3], Value: [4]" -msgstr "" +msgstr "Fitxer: [1], Secció: [2], Clau: [3], Valor: [4]" #: msi.rc:192 msgid "Key: [1], Name: [2]" -msgstr "" +msgstr "Clau: [1], Nom: [2]" #: msi.rc:194 msi.rc:195 msgid "File: [1], Folder: [2]" -msgstr "" +msgstr "Fitxer: [1], Carpeta: [2]" #: msi.rc:201 msgid "AppId: [1]{{, AppType: [2]}}" -msgstr "" +msgstr "AppId: [1]{{, AppType: [2]}}" #: msi.rc:209 msgid "Key: [1], Name: [2], Value: [3]" -msgstr "" +msgstr "Clau: [1], Nom: [2], Valor: [3]" #: msi.rc:71 msgid "{{Fatal error: }}" -msgstr "" +msgstr "{{Error fatal: }}" #: msi.rc:72 msgid "{{Error [1]. }}" -msgstr "" +msgstr "{{Error [1]. }}" #: msi.rc:73 msgid "Warning [1]." -msgstr "" +msgstr "Advertència [1]." #: msi.rc:74 msgid "Info [1]." -msgstr "" +msgstr "Informació [1]." #: msi.rc:75 msgid "" @@ -7371,40 +7299,45 @@ msgid "" "This may indicate a problem with this package. The error code is [1]. {{The " "arguments are: [2], [3], [4]}}" msgstr "" +"L'instal·lador s'ha topat amb un error inesperat en instal·lar aquest " +"paquet. Això pot indicar un problema amb aquest paquet. El codi d'error és " +"[1]. {{Els arguments són: [2], [3], [4]}}" #: msi.rc:76 msgid "{{Disk full: }}" -msgstr "{{El disc està ple: }}" +msgstr "{{Disc ple: }}" #: msi.rc:77 msgid "Action [Time]: [1]. [2]" -msgstr "" +msgstr "Acció [Time]: [1]. [2]" #: msi.rc:78 msgid "Message type: [1], Argument: [2]{, [3]}" -msgstr "" +msgstr "Tipus de missatge: [1], Argument: [2]{, [3]}" #: msi.rc:81 msgid "=== Logging started: [Date] [Time] ===" -msgstr "" +msgstr "=== S'ha començat el registre: [Date] [Time] ===" #: msi.rc:79 msgid "Action start [Time]: [1]." -msgstr "" +msgstr "Inici d'acció [Time]: [1]." #: msi.rc:80 msgid "Action ended [Time]: [1]. Return value [2]." -msgstr "" +msgstr "Fi d'acció [Time]: [1]. El valor retornat és [2]." #: msi.rc:83 msgid "Please insert the disk: [2]" -msgstr "" +msgstr "Si us plau, inseriu el disc: [2]" #: msi.rc:84 msgid "" "Source file not found{{(cabinet)}}: [2]. Verify that the file exists and " "that you can access it." msgstr "" +"No s'ha trobat el fitxer font{{(cabinet)}}: [2]. Verifiqueu que el fitxer " +"existeixi i que el podeu accedir." #: msrle32.rc:31 msgid "Wine MS-RLE video codec" @@ -7636,11 +7569,11 @@ msgstr "botó" #: oleacc.rc:75 msgid "check button" -msgstr "casella de verificació" +msgstr "casella de selecció" #: oleacc.rc:76 msgid "radio button" -msgstr "botó de ràdio" +msgstr "botó d'opció" #: oleacc.rc:77 msgid "combo box" @@ -7668,7 +7601,7 @@ msgstr "control lliscant" #: oleacc.rc:83 msgid "spin box" -msgstr "spinner" +msgstr "quadre de nombre" #: oleacc.rc:84 msgid "diagram" @@ -7940,7 +7873,7 @@ msgstr "Enganxada amb opcions" #: oledlg.rc:85 setupapi.rc:43 msgid "Source:" -msgstr "Origen:" +msgstr "Font:" #: oledlg.rc:86 shdoclc.rc:50 shdoclc.rc:82 shdoclc.rc:95 shdoclc.rc:135 #: shdoclc.rc:162 shdoclc.rc:186 user32.rc:62 wineconsole.rc:33 wordpad.rc:114 @@ -8902,8 +8835,6 @@ msgid "Wine Control Panel" msgstr "Tauler de Control del Wine" #: shell32.rc:195 -#, fuzzy -#| msgid "Unable to display Run File dialog box (internal error)" msgid "Unable to display Run dialog box (internal error)" msgstr "No s'ha pogut mostrar el quadre de diàleg Executar (error intern)" @@ -9023,10 +8954,8 @@ msgid " sec" msgstr " seg" #: twain.rc:29 -#, fuzzy -#| msgid "Select Folder" msgid "Select Source" -msgstr "Selecciona una carpeta" +msgstr "Seleccionar font" #: urlmon.rc:32 wininet.rc:77 msgid "Security Warning" @@ -9208,7 +9137,7 @@ msgstr "Un publicador desconegut o no de confiança ha emès el certificat." #: wininet.rc:30 msgid "The date on the certificate is invalid." -msgstr "La data en el certificat és invàlida." +msgstr "La data en el certificat no és vàlida." #: wininet.rc:31 msgid "The name on the certificate does not match the site." @@ -9222,7 +9151,7 @@ msgstr "" #: winmm.rc:32 msgid "The specified command was carried out." -msgstr "S'ha realitzat l'ordre especificat." +msgstr "S'ha realitzat l'ordre especificada." #: winmm.rc:33 msgid "Undefined external error." @@ -9247,7 +9176,7 @@ msgstr "" #: winmm.rc:37 msgid "The specified device handle is invalid." -msgstr "L'identificador del dispositiu especificat és invàlid." +msgstr "L'identificador del dispositiu especificat no és vàlid." #: winmm.rc:38 msgid "There is no driver installed on your system!" @@ -9276,11 +9205,11 @@ msgstr "Un número d'error s'ha especificat que no està definit en el sistema." #: winmm.rc:42 msgid "An invalid flag was passed to a system function." -msgstr "S'ha passat una bandera invàlida a una funció de sistema." +msgstr "S'ha passat una bandera no vàlida a una funció de sistema." #: winmm.rc:43 msgid "An invalid parameter was passed to a system function." -msgstr "S'ha passat un paràmetre invàlid a una funció de sistema." +msgstr "S'ha passat un paràmetre no vàlid a una funció de sistema." #: winmm.rc:46 msgid "" @@ -9358,7 +9287,7 @@ msgstr "" #: winmm.rc:60 msgid "Invalid MCI device ID. Use the ID returned when opening the MCI device." msgstr "" -"L'ID del dispositiu MCI és invàlida. Utilitzeu l'ID retornada en obrir el " +"L'ID del dispositiu MCI no és vàlid. Utilitzeu l'ID retornat en obrir el " "dispositiu MCI." #: winmm.rc:61 @@ -9367,7 +9296,7 @@ msgstr "El controlador no pot reconèixer el paràmetre d'ordre especificat." #: winmm.rc:62 msgid "The driver cannot recognize the specified command." -msgstr "El controlador no pot reconèixer l'ordre especificat." +msgstr "El controlador no pot reconèixer l'ordre especificada." #: winmm.rc:63 msgid "" @@ -9414,19 +9343,19 @@ msgid "" "The specified command requires a character-string parameter. Please provide " "one." msgstr "" -"L'ordre especificat requereix un paràmetre de cadena de caràcters. Si us " +"L'ordre especificada requereix un paràmetre de cadena de caràcters. Si us " "plau, proveïu un." #: winmm.rc:71 msgid "The specified integer is invalid for this command." -msgstr "El nombre enter especificat és invàlid per a aquest ordre." +msgstr "El nombre enter especificat no és vàlid per a aquesta ordre." #: winmm.rc:72 msgid "" "The device driver returned an invalid return type. Check with the device " "manufacturer about obtaining a new driver." msgstr "" -"El controlador de dispositiu ha donat un tipus de retorn invàlid. Consulteu " +"El controlador de dispositiu ha donat un tipus de retorn no vàlid. Consulteu " "amb el fabricant del dispositiu sobre com obtenir un controlador nou." #: winmm.rc:73 @@ -9439,11 +9368,11 @@ msgstr "" #: winmm.rc:74 msgid "The specified command requires a parameter. Please supply one." -msgstr "L'ordre especificat requereix un paràmetre. Si us plau, proveïu un." +msgstr "L'ordre especificada requereix un paràmetre. Si us plau, proveïu un." #: winmm.rc:75 msgid "The MCI device you are using does not support the specified command." -msgstr "El dispositiu MCI que utilitzeu no admet l'ordre especificat." +msgstr "El dispositiu MCI que utilitzeu no admet l'ordre especificada." #: winmm.rc:76 msgid "" @@ -9472,7 +9401,7 @@ msgstr "" #: winmm.rc:80 msgid "Cannot use 'all' as the device name with the specified command." msgstr "" -"No es pot utilitzar 'all' com al nom de dispositiu amb l'ordre especificat." +"No es pot utilitzar 'all' com al nom de dispositiu amb l'ordre especificada." #: winmm.rc:81 msgid "" @@ -9491,7 +9420,8 @@ msgstr "" #: winmm.rc:83 msgid "The specified parameter is out of range for the specified command." -msgstr "El paràmetre especificat és fora de l'interval de l'ordre especificat." +msgstr "" +"El paràmetre especificat és fora de l'interval de l'ordre especificada." #: winmm.rc:84 msgid "The specified parameters cannot be used together." @@ -9531,7 +9461,7 @@ msgstr "" #: winmm.rc:89 msgid "The specified parameter is invalid for this command." -msgstr "El paràmetre especificat no és vàlid per a aquest ordre." +msgstr "El paràmetre especificat no és vàlid per a aquesta ordre." #: winmm.rc:90 msgid "" @@ -9546,7 +9476,7 @@ msgid "" "The specified command requires an alias, file, driver, or device name. " "Please supply one." msgstr "" -"L'ordre especificat requereix un àlies, fitxer, controlador o nom de " +"L'ordre especificada requereix un àlies, fitxer, controlador o nom de " "dispositiu. Si us plau, proveïu un." #: winmm.rc:92 @@ -9554,7 +9484,7 @@ msgid "" "The specified value for the time format is invalid. Refer to the MCI " "documentation for valid formats." msgstr "" -"El valor especificat per al format d'hora és invàlid. Consulteu la " +"El valor especificat per al format d'hora no és vàlid. Consulteu la " "documentació MCI pels formats vàlids." #: winmm.rc:93 @@ -9606,7 +9536,7 @@ msgid "" "Cannot carry out the commands in the order specified. Correct the command " "sequence, and then try again." msgstr "" -"No es pot dur a terme els ordres en l'ordre especificat. Corregiu la " +"No es pot dur a terme les ordres en l'ordre especificat. Corregiu la " "seqüència d'ordres i després torneu a intentar." #: winmm.rc:102 @@ -9614,7 +9544,7 @@ msgid "" "Cannot carry out the specified command on an auto-opened device. Wait until " "the device is closed, and then try again." msgstr "" -"No es pot dur a terme l'ordre especificat en un dispositiu obert " +"No es pot dur a terme l'ordre especificada en un dispositiu obert " "automàticament. Espereu fins que es tanqui el dispositiu i després torneu a " "intentar." @@ -9623,7 +9553,7 @@ msgid "" "The filename is invalid. Make sure the filename is not longer than 8 " "characters, followed by a period and an extension." msgstr "" -"El nom de fitxer és invàlid. Assegureu-vos que el nom del fitxer no estigui " +"El nom de fitxer no és vàlid. Assegureu-vos que el nom del fitxer no estigui " "més llarg de 8 caràcters, seguit d'un període i una extensió." #: winmm.rc:104 @@ -9681,7 +9611,7 @@ msgstr "" msgid "" "The specified command requires an integer parameter. Please provide one." msgstr "" -"L'ordre especificat requereix un paràmetre de nombre sencer. Si us plau, " +"L'ordre especificada requereix un paràmetre de nombre enter. Si us plau, " "proveïu un." #: winmm.rc:112 @@ -9869,7 +9799,7 @@ msgstr "" #: winspool.rc:32 msgid "Unable to create the output file." -msgstr "No s'ha pogut crear el fitxer destinatari." +msgstr "No s'ha pogut crear el fitxer de sortida." #: wldap32.rc:32 msgid "Success" @@ -9928,10 +9858,8 @@ msgid "Confidentiality Required" msgstr "Cal confidencialitat" #: wldap32.rc:46 -#, fuzzy -#| msgid "Shutdown in progress.\n" msgid "SASL Bind in Progress" -msgstr "L'aturada està en curs.\n" +msgstr "Vinculació SASL en curs" #: wldap32.rc:48 msgid "No Such Attribute" @@ -9955,7 +9883,7 @@ msgstr "L'atribut o valor existeix" #: wldap32.rc:53 msgid "Invalid Syntax" -msgstr "Sintaxi invàlida" +msgstr "Sintaxi no vàlida" #: wldap32.rc:64 msgid "No Such Object" @@ -9967,7 +9895,7 @@ msgstr "Problema d'àlies" #: wldap32.rc:66 msgid "Invalid DN Syntax" -msgstr "Sintaxi DN invàlida" +msgstr "Sintaxi DN no vàlida" #: wldap32.rc:67 msgid "Is Leaf" @@ -9983,7 +9911,7 @@ msgstr "Autenticació no apropiada" #: wldap32.rc:81 msgid "Invalid Credentials" -msgstr "Credencials invàlides" +msgstr "Credencials no vàlides" #: wldap32.rc:82 msgid "Insufficient Rights" @@ -10212,8 +10140,8 @@ msgid "" "Changes to default directory, environment variables etc made within a\n" "called procedure are inherited by the caller.\n" msgstr "" -"CALL <nom de fitxer batch> s'utilitza dins un fitxer batch per a executar\n" -"ordres d'un altre fitxer batch. Quan se surt del fitxer batch, el control\n" +"CALL <nom de fitxer BAT> s'utilitza dins un fitxer BAT per a executar\n" +"ordres d'un altre fitxer BAT. Quan se surt del fitxer BAT, el control\n" "retorna al fitxer que l'ha trucat. L'ordre CALL pot proveir paràmetres al\n" "procediment trucat.\n" "\n" @@ -10271,7 +10199,7 @@ msgstr "" "actual.\n" "ECHO <cadena> mostra <cadena> en el dispositiu de terminal actual.\n" "\n" -"ECHO ON causa que tots els ordres següents en un fitxer batch es mostrin en\n" +"ECHO ON causa que totes les ordres següents en un fitxer BAT es mostrin en\n" "el dispositiu de terminal abans d'executar-se.\n" "\n" "ECHO OFF desfà l'efecte d'un ECHO ON anterior (ECHO està OFF per defecte).\n" @@ -10289,12 +10217,12 @@ msgid "" "\n" "The % sign must be doubled when using FOR in a batch file.\n" msgstr "" -"S'utilitza l'ordre FOR per a executar un ordre per cada un d'un conjunt de\n" +"S'utilitza l'ordre FOR per a executar una ordre per cada un d'un conjunt de\n" "fitxers.\n" "\n" "Ús: FOR %variable IN (conjunt) DO ordre\n" "\n" -"S'ha de doblar el signe % quan s'utilitza FOR en un fitxer batch.\n" +"S'ha de doblar el signe % quan s'utilitza FOR en un fitxer BAT.\n" #: cmd.rc:97 msgid "" @@ -10310,13 +10238,13 @@ msgid "" "GOTO has no effect when used interactively.\n" msgstr "" "L'ordre GOTO transfereix l'execució a una altra declaració en un fitxer\n" -"batch.\n" +"BAT.\n" "\n" "L'etiqueta que és la destinació d'un GOTO pot ser de fins a 255 caràcters\n" "de longitud però no pot incloure espais (això és diferent d'altres sistemes\n" -"operatius). Si dos o més etiquetes idèntiques existeixen en un fitxer\n" -"batch, el primer sempre s'executarà. Intentar fer GOTO a una etiqueta no\n" -"existent termina l'execució del fitxer batch.\n" +"operatius). Si dos o més etiquetes idèntiques existeixen en un fitxer BAT,\n" +"el primer sempre s'executarà. Intentar fer GOTO a una etiqueta no existent\n" +"termina l'execució del fitxer BAT.\n" "\n" "GOTO no té cap efecte quan s'utilitza de forma interactiva.\n" @@ -10339,11 +10267,11 @@ msgid "" "In the second form of the command, string1 and string2 must be in double\n" "quotes. The comparison is not case-sensitive.\n" msgstr "" -"S'utilitza IF per a executar condicionalment un ordre.\n" +"S'utilitza IF per a executar condicionalment una ordre.\n" "\n" "Sintaxi: IF [NOT] EXIST nom_de_fitxer ordre\n" " IF [NOT] cadena1==cadena2 ordre\n" -" IF [NOT] ERRORLEVEL nombre ordre\n" +" IF [NOT] ERRORLEVEL número ordre\n" "\n" "En la segona forma de la comanda, cadena1 i cadena2 han de ser entre\n" "cometes dobles. La comparació no distingeix entre majúscules i minúscules.\n" @@ -10417,11 +10345,11 @@ msgid "" "It is mainly useful in batch files to allow the user to read the output of\n" "a previous command before it scrolls off the screen.\n" msgstr "" -"PAUSE mostra un missatge en la pantalla demanant que l'usuari premi una " +"PAUSE mostra un missatge en la pantalla demanant que l'usuari premi una\n" "tecla.\n" "\n" -"És principalment útil en els fitxers batch per a permetre que l'usuari\n" -"llegeixi la sortida d'un ordre anterior abans que es desplaci fora de la\n" +"És principalment útil en els fitxers BAT per a permetre que l'usuari\n" +"llegeixi la sortida d'una ordre anterior abans que es desplaci fora de la\n" "pantalla.\n" #: cmd.rc:169 @@ -10446,7 +10374,7 @@ msgid "" "The prompt can also be changed by altering the PROMPT environment variable,\n" "so the command 'SET PROMPT=text' has the same effect as 'PROMPT text'.\n" msgstr "" -"PROMPT defineix l'indicador de la línia d'ordre.\n" +"PROMPT defineix l'indicador de la línia d'ordres.\n" "\n" "La cadena que segueix l'ordre PROMPT (i l'espai immediatament després)\n" "apareix al principi de la línia quan cmd està esperant l'entrada.\n" @@ -10474,7 +10402,7 @@ msgid "" "and can therefore be used as a comment in a batch file.\n" msgstr "" "Una línia d'ordres que comença amb REM (seguit per un espai) no realitza\n" -"cap acció, i per tant es pot utilitzar com a comentari en un fitxer batch.\n" +"cap acció, i per tant es pot utilitzar com a comentari en un fitxer BAT.\n" #: cmd.rc:176 msgid "REN <filename> is the short version of RENAME. It renames a file.\n" @@ -10535,9 +10463,9 @@ msgid "" "list, so parameter 2 becomes parameter 1 and so on. It has no effect if\n" "called from the command line.\n" msgstr "" -"S'utilitza SHIFT en un fitxer batch per a eliminar un paràmetre del cap de\n" -"la llista, de manera que el paràmetre 2 es converteix en el paràmetre 1,\n" -"etc. No té cap efecte si es truca des de la línia d'ordres.\n" +"S'utilitza SHIFT en un fitxer BAT per a eliminar un paràmetre del cap de la\n" +"llista, de manera que el paràmetre 2 es converteix en el paràmetre 1, etc.\n" +"No té cap efecte si es truca des de la línia d'ordres.\n" #: cmd.rc:212 start.rc:56 msgid "" @@ -10596,7 +10524,7 @@ msgstr "" " el seu codi de sortida.\n" "/unix Utilitza un nom de fitxer d'Unix i inicia el fitxer com\n" " el Windows Explorer.\n" -"/ProgIDOpen Obre un document utilitzant la progID especificada.\n" +"/ProgIDOpen Obre un document utilitzant el progID especificat.\n" "/? Mostra aquesta ajuda i surt.\n" #: cmd.rc:237 @@ -10648,7 +10576,7 @@ msgid "" "ENDLOCAL ends localization of environment changes in a batch file which\n" "were introduced by a preceding SETLOCAL.\n" msgstr "" -"ENDLOCAL acaba la localització de canvis d'entorn en un fitxer batch, els\n" +"ENDLOCAL acaba la localització de canvis d'entorn en un fitxer BAT, els\n" "quals un SETLOCAL anterior ha introduït.\n" #: cmd.rc:271 @@ -10660,12 +10588,12 @@ msgid "" "file, whichever comes first), at which point the previous environment\n" "settings are restored.\n" msgstr "" -"SETLOCAL comença la localització de canvis en l'entorn en un fitxer batch.\n" +"SETLOCAL comença la localització de canvis d'entorn en un fitxer BAT.\n" "\n" -"Els canvis d'entorn fets després d'un SETLOCAL són locals al fitxer batch,\n" -"i es conserven fins que es trobi la següent ENDLOCAL (o al final del\n" -"fitxer, el que passi primer), al qual punt la configuració de l'entorn\n" -"anterior es restaura.\n" +"Els canvis d'entorn fets després d'un SETLOCAL són locals al fitxer BAT, i\n" +"es conserven fins que es trobi la següent ENDLOCAL (o al final del fitxer,\n" +"el que passi primer), al qual punt la configuració d'entorn anterior es\n" +"restaura.\n" #: cmd.rc:275 msgid "" @@ -10712,7 +10640,7 @@ msgid "" "Specifying no open command after the equal sign removes the command string\n" "associated to the specified file type.\n" msgstr "" -"FTYPE mostra o modifica els ordres d'obertura associats amb els tipus de\n" +"FTYPE mostra o modifica les ordres d'obertura associats amb els tipus de\n" "fitxers.\n" "\n" "Sintaxi: FTYPE [tipusDeFitxer[=[ordreDeObertura]]]\n" @@ -10738,7 +10666,7 @@ msgstr "" "CHOICE mostra un text i espera fins que l'usuari premi una tecla permesa\n" "d'una llista seleccionable.\n" "CHOICE s'utilitza principalment per a construir un menú de selecció en un\n" -"fitxer batch.\n" +"fitxer BAT.\n" #: cmd.rc:324 msgid "" @@ -10753,6 +10681,14 @@ msgid "" "link_name is the name of the new symbolic link.\n" "target is the path that link_name points to.\n" msgstr "" +"Sintaxi: MKLINK [opcions] nom_d'enllaç destinació\n" +"\n" +"Opcions:\n" +"/d Crea un enllaç simbòlic de directori\n" +"/h Crea un enllaç dur.\n" +"/j Crea una intersecció de directori.\n" +"nom_d'enllaç és el nom de l'enllaç simbòlic nou.\n" +"destinació és el camí al qual nom_d'enllaç assenyala.\n" #: cmd.rc:312 msgid "" @@ -10763,47 +10699,6 @@ msgstr "" "des del qual heu invocat cmd.\n" #: cmd.rc:364 -#, fuzzy -#| msgid "" -#| "CMD built-in commands are:\n" -#| "ASSOC\t\tShow or modify file extension associations\n" -#| "ATTRIB\t\tShow or change DOS file attributes\n" -#| "CALL\t\tInvoke a batch file from inside another\n" -#| "CD (CHDIR)\tChange current default directory\n" -#| "CHOICE\t\tWait for an keypress from a selectable list\n" -#| "CLS\t\tClear the console screen\n" -#| "COPY\t\tCopy file\n" -#| "CTTY\t\tChange input/output device\n" -#| "DATE\t\tShow or change the system date\n" -#| "DEL (ERASE)\tDelete a file or set of files\n" -#| "DIR\t\tList the contents of a directory\n" -#| "ECHO\t\tCopy text directly to the console output\n" -#| "ENDLOCAL\tEnd localization of environment changes in a batch file\n" -#| "FTYPE\t\tShow or modify open commands associated with file types\n" -#| "HELP\t\tShow brief help details on a topic\n" -#| "MD (MKDIR)\tCreate a subdirectory\n" -#| "MORE\t\tDisplay output in pages\n" -#| "MOVE\t\tMove a file, set of files or directory tree\n" -#| "PATH\t\tSet or show the search path\n" -#| "PAUSE\t\tSuspend execution of a batch file\n" -#| "POPD\t\tRestore the directory to the last one saved with PUSHD\n" -#| "PROMPT\t\tChange the command prompt\n" -#| "PUSHD\t\tChange to a new directory, saving the current one\n" -#| "REN (RENAME)\tRename a file\n" -#| "RD (RMDIR)\tDelete a subdirectory\n" -#| "SET\t\tSet or show environment variables\n" -#| "SETLOCAL\tStart localization of environment changes in a batch file\n" -#| "START\t\tStart a program, or open a document in the associated program\n" -#| "TIME\t\tSet or show the current system time\n" -#| "TITLE\t\tSet the window title for the CMD session\n" -#| "TYPE\t\tType the contents of a text file\n" -#| "VER\t\tShow the current version of CMD\n" -#| "VOL\t\tShow the volume label of a disk device\n" -#| "XCOPY\t\tCopy source files or directory trees to a destination\n" -#| "EXIT\t\tClose down CMD\n" -#| "\n" -#| "Enter HELP <command> for further information on any of the above " -#| "commands.\n" msgid "" "CMD built-in commands are:\n" "ASSOC\t\tShow or modify file extension associations\n" @@ -10845,10 +10740,10 @@ msgid "" "\n" "Enter HELP <command> for further information on any of the above commands.\n" msgstr "" -"Els ordres integrats de CMD són:\n" +"Les ordres integrades de CMD són:\n" "ASSOC\t\tMostra o modifica les associacions d'extensió de fitxer\n" "ATTRIB\t\tMostra o canvia els atributs de fitxer de DOS\n" -"CALL\t\tInvoca un fitxer batch des de dins altre\n" +"CALL\t\tInvoca un fitxer BAT des de dins altre\n" "CD (CHDIR)\tCanvia el directori per defecte actual\n" "CHOICE\t\tEspera una pulsació de tecla d'una llista seleccionable\n" "CLS\t\tEsborra la pantalla de consola\n" @@ -10858,29 +10753,30 @@ msgstr "" "DEL (ERASE)\tSuprimeix un fitxer o conjunt de fitxers\n" "DIR\t\tMostra el contingut d'un directori\n" "ECHO\t\tCopia text directament a la sortida de la consola\n" -"ENDLOCAL\tAcaba la localització de canvis en l'entorn en un fitxer batch\n" +"ENDLOCAL\tAcaba la localització de canvis d'entorn en un fitxer BAT\n" "FTYPE\t\tMostra o modifica els ordres d'obertura associats amb els tipus\n" "\t\tde fitxer\n" "HELP\t\tMostra detalls breus sobre un tema\n" "MD (MKDIR)\tCrea un subdirectori\n" +"MKLINK\tCrea un enllaç simbòlic\n" "MORE\t\tMostra la sortida en pàgines\n" "MOVE\t\tDesplaça un fitxer, conjunt de fitxers o arbre de directori\n" "PATH\t\tEstableix o mostra el camí de cerca\n" -"PAUSE\t\tSuspèn l'execució d'un fitxer batch\n" +"PAUSE\t\tSuspèn l'execució d'un fitxer BAT\n" "POPD\t\tRestaura el directori a l'últim desat amb la PUSHD\n" "PROMPT\t\tCanvia l'indicador d'ordres\n" "PUSHD\t\tCanvia a un directori nou, desant l'actual\n" "REN (RENAME)\tCanvia el nom d'un fitxer\n" "RD (RMDIR)\tSuprimeix un subdirectori\n" "SET\t\tEstableix o mostra les variables d'entorn\n" -"SETLOCAL\tComença la localització de canvis en l'entorn en un fitxer batch\n" +"SETLOCAL\tComença la localització de canvis d'entorn en un fitxer BAT\n" "START\t\tInicia un programa o obrir un document en el programa associat\n" "TIME\t\tEstableix o mostra l'hora de sistema actual\n" "TITLE\t\tEstableix el títol de finestra de la sessió CMD\n" "TYPE\t\tBolca el contingut d'un fitxer de text\n" "VER\t\tMostra la versió actual del CMD\n" "VOL\t\tMostra l'etiqueta de volum d'un dispositiu de disc\n" -"XCOPY\t\tCopia fitxers fonts o arbres de directori a una destinació\n" +"XCOPY\t\tCopia fitxers o arbres de directori a una destinació\n" "EXIT\t\tTanca el CMD\n" "\n" "Introduïu HELP <ordre> per més informació sobre qualsevulla de les ordres\n" @@ -10888,7 +10784,7 @@ msgstr "" #: cmd.rc:365 msgid "Are you sure?" -msgstr "Esteu segur?" +msgstr "N'esteu segur?" #: cmd.rc:366 reg.rc:50 xcopy.rc:43 msgctxt "Yes key" @@ -10906,7 +10802,7 @@ msgstr "Manca una associació de fitxer per a l'extensió %1\n" #: cmd.rc:369 msgid "No open command associated with file type '%1'\n" -msgstr "No hi ha cap ordre d'obertura associat amb el tipus de fitxer '%1'\n" +msgstr "No hi ha cap ordre d'obertura associada amb el tipus de fitxer '%1'\n" #: cmd.rc:370 msgid "Overwrite %1?" @@ -10919,12 +10815,12 @@ msgstr "Més..." #: cmd.rc:372 msgid "Line in Batch processing possibly truncated. Using:\n" msgstr "" -"Hi ha hagut una línia possiblement truncada en el processament batch.\n" +"Hi ha hagut una línia possiblement truncada en el processament BAT.\n" "S'està utilitzant:\n" #: cmd.rc:374 msgid "Argument missing\n" -msgstr "Manca un paràmetre\n" +msgstr "Manca un argument\n" #: cmd.rc:375 msgid "Syntax error\n" @@ -10964,7 +10860,7 @@ msgstr "S'ha fallat en obrir '%1'\n" #: cmd.rc:385 msgid "Cannot call batch label outside of a batch script\n" -msgstr "No es pot trucar a una etiqueta de batch fora d'un script batch\n" +msgstr "No es pot trucar a una etiqueta BAT fora d'un script BAT\n" #: cmd.rc:386 xcopy.rc:45 msgctxt "All key" @@ -11047,7 +10943,7 @@ msgstr " (Sí|No|Tots)" msgid "" "Can't recognize '%1' as an internal or external command, or batch script.\n" msgstr "" -"No es pot reconèixer '%1' com a ordre intern ni extern, ni script batch.\n" +"No es pot reconèixer '%1' com a ordre interna ni externa, ni script BAT.\n" #: cmd.rc:405 msgid "Division by zero error.\n" @@ -11100,7 +10996,7 @@ msgstr "Ús: hostname\n" #: hostname.rc:31 msgid "Error: Invalid option '%c'.\n" -msgstr "Error: L'opció '%c' és invàlida.\n" +msgstr "Error: L'opció '%c' no és vàlida.\n" #: hostname.rc:32 msgid "" @@ -11117,8 +11013,8 @@ msgstr "Ús: ipconfig [ /? | /all ]\n" #: ipconfig.rc:31 msgid "Error: Unknown or invalid command line parameters specified\n" msgstr "" -"Error: S'han especificat paràmetres de línia d'ordres desconeguts o " -"invàlids\n" +"Error: S'han especificat paràmetres de línia d'ordres desconeguts o no " +"vàlids\n" #: ipconfig.rc:32 msgid "%1 adapter %2\n" @@ -11194,9 +11090,9 @@ msgid "" "\n" "Where 'command' is one of HELP, START, STOP or USE.\n" msgstr "" -"La sintaxi d'aquest ordre és:\n" +"La sintaxi d'aquesta ordre és:\n" "\n" -"NET ordre [paràmetres]\n" +"NET ordre [arguments]\n" " -o-\n" "NET ordre /HELP\n" "\n" @@ -11211,7 +11107,7 @@ msgid "" "Displays the list of running services if 'service' is omitted. Otherwise " "'service' is the name of the service to start.\n" msgstr "" -"La sintaxi d'aquest ordre és:\n" +"La sintaxi d'aquesta ordre és:\n" "\n" "NET START [servei]\n" "\n" @@ -11226,7 +11122,7 @@ msgid "" "\n" "Where 'service' is the name of the service to stop.\n" msgstr "" -"La sintaxi d'aquest ordre és:\n" +"La sintaxi d'aquesta ordre és:\n" "\n" "NET STOP servei\n" "\n" @@ -11666,7 +11562,7 @@ msgstr "" #: oleview.rc:32 msgid "&Bind to file..." -msgstr "&Lligar a fitxer..." +msgstr "&Vincula a fitxer..." #: oleview.rc:33 msgid "&View TypeLib..." @@ -11838,7 +11734,7 @@ msgstr "Fitxers TypeLib (*.tlb; *.olb; *.dll; *.ocx; *.exe)" #: oleview.rc:105 msgid "Bind to file via a File Moniker" -msgstr "Lliga a fitxer a través d'un File Moniker" +msgstr "Vincula a un fitxer a través d'un File Moniker" #: oleview.rc:106 msgid "Open a TypeLib file and view the contents" @@ -11870,7 +11766,7 @@ msgstr "Lliura la instància d'objecte actualment seleccionada" #: oleview.rc:113 msgid "Copy the GUID of the currently selected item to the clipboard" -msgstr "Copia la GUID de l'element actualment seleccionat al porta-retalls" +msgstr "Copia el GUID de l'element actualment seleccionat al porta-retalls" #: oleview.rc:114 msgid "Display the viewer for the selected item" @@ -11901,7 +11797,7 @@ msgstr "Actualitza totes les llistes" #: oleview.rc:124 msgid "Display program information, version number and copyright" -msgstr "Mostra informació de programa, nombre de versió i drets d'autor" +msgstr "Mostra informació de programa, número de versió i drets d'autor" #: oleview.rc:115 msgid "Ask for an in-process server when calling CoGetClassObject" @@ -12213,17 +12109,6 @@ msgid "Icons (*.ico)" msgstr "Icones (*.ico)" #: reg.rc:35 -#, fuzzy -#| msgid "" -#| "Usage:\n" -#| " REG [operation] [parameters]\n" -#| "\n" -#| "Supported operations:\n" -#| " ADD | DELETE | QUERY\n" -#| "\n" -#| "For help on a specific operation, type:\n" -#| " REG [operation] /?\n" -#| "\n" msgid "" "Usage:\n" " REG [operation] [parameters]\n" @@ -12239,7 +12124,7 @@ msgstr "" " REG [operació] [paràmetres]\n" "\n" "Operacions admeses:\n" -" ADD | DELETE | QUERY\n" +" ADD | DELETE | IMPORT | EXPORT | QUERY\n" "\n" "Per ajuda sobre una operació específica, teclegeu:\n" " REG [operació] /?\n" @@ -12267,11 +12152,11 @@ msgstr "L'operació s'ha acabat amb èxit\n" #: reg.rc:40 msgid "reg: Invalid key name\n" -msgstr "reg: Nom de clau invàlid\n" +msgstr "reg: Nom de clau no vàlid\n" #: reg.rc:41 msgid "reg: Invalid command line parameters\n" -msgstr "reg: Paràmetres de línia d'ordres invàlids\n" +msgstr "reg: Paràmetres de línia d'ordres no vàlids\n" #: reg.rc:42 msgid "reg: Unable to access remote machine\n" @@ -12350,11 +12235,11 @@ msgstr "S'ha completat la cerca. Nombre de coincidències trobades: %1!d!\n" #: reg.rc:61 msgid "reg: Invalid syntax. " -msgstr "reg: La sintaxi és invàlida. " +msgstr "reg: La sintaxi no és vàlida. " #: reg.rc:62 msgid "reg: Invalid option [%1]. " -msgstr "reg: L'opció [%1] és invàlida. " +msgstr "reg: L'opció [%1] no és vàlida. " #: reg.rc:63 msgid "Type \"REG /?\" for help.\n" @@ -12370,43 +12255,31 @@ msgstr "(valor no definit)" #: reg.rc:66 msgid "REG IMPORT file.reg\n" -msgstr "" +msgstr "REG IMPORT fitxer.reg\n" #: reg.rc:67 -#, fuzzy -#| msgid "regedit: The file '%1' was not found.\n" msgid "reg: The file '%1' was not found.\n" -msgstr "regedit: No s'ha trobat el fitxer '%1'.\n" +msgstr "reg: No s'ha trobat el fitxer '%1'.\n" #: reg.rc:68 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "reg: Unable to open the registry key '%1'.\n" -msgstr "regedit: No s'ha pogut obrir la clau de registre '%1'.\n" +msgstr "reg: No s'ha pogut obrir la clau de registre '%1'.\n" #: reg.rc:69 -#, fuzzy -#| msgid "regedit: Unrecognized escape sequence [\\%1!c!]\n" msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" -msgstr "regedit: Seqüència d'escapada no reconeguda [\\%1!c!]\n" +msgstr "reg: Seqüència d'escapada no reconeguda [\\%1!c!]\n" #: reg.rc:70 -#, fuzzy -#| msgid "REG QUERY key_name [/v value_name | /ve] [/s]\n" msgid "REG EXPORT key_name file.reg [/y]\n" -msgstr "REG QUERY nom_de_clau [/v nom_de_valor | /ve] [/s]\n" +msgstr "REG EXPORT nom_de_clau fitxer.reg [/y]\n" #: reg.rc:71 -#, fuzzy -#| msgid "reg: Invalid key name\n" msgid "reg: Invalid system key [%1]\n" -msgstr "reg: Nom de clau invàlid\n" +msgstr "reg: Nom de clau de sistema no vàlid [%1]\n" #: reg.rc:72 -#, fuzzy -#| msgid "The registry value '%1' already exists. Do you want to overwrite it?" msgid "The file '%1' already exists. Do you want to overwrite it?" -msgstr "El valor de registre '%1' ja existeix. El voleu sobreescriure?" +msgstr "El fitxer '%1' ja existeix. El voleu sobreescriure?" #: regedit.rc:34 msgid "&Registry" @@ -12477,17 +12350,12 @@ msgid "&About Registry Editor" msgstr "&Quant a l'Editor de Registre" #: regedit.rc:89 regedit.rc:96 regedit.rc:230 -#, fuzzy -#| msgctxt "object state" -#| msgid "expanded" msgid "Expand" -msgstr "expandit" +msgstr "Expandeix" #: regedit.rc:134 regedit.rc:233 -#, fuzzy -#| msgid "Modify Binary Data..." msgid "Modify &Binary Data..." -msgstr "Modifica dades binàries..." +msgstr "Modifica dades &binàries..." #: regedit.rc:267 msgid "Export registry" @@ -12586,14 +12454,10 @@ msgid "Contains commands for accessing frequently used keys" msgstr "Conté ordres per a accedir a les claus freqüentment utilitzades" #: regedit.rc:163 -#, fuzzy -#| msgid "" -#| "Contains commands for displaying help and information about registry " -#| "editor" msgid "" "Contains commands for displaying Help and information about Registry Editor" msgstr "" -"Conté ordres per a mostrar ajuda i informació quant a l'editor de registre" +"Conté ordres per a mostrar Ajuda i informació quant a l'Editor de Registre" #: regedit.rc:164 msgid "Contains commands for creating new keys or values" @@ -12632,101 +12496,58 @@ msgid "(unknown %d)" msgstr "(desconegut %d)" #: regedit.rc:247 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to modify the selected registry value." -msgstr "regedit: No s'ha pogut obrir la clau de registre '%1'.\n" +msgstr "No s'ha pogut modificar el valor de registre seleccionat." #: regedit.rc:248 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to create a new registry key." -msgstr "regedit: No s'ha pogut obrir la clau de registre '%1'.\n" +msgstr "No s'ha pogut crear una clau de registre nova." #: regedit.rc:249 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to create a new registry value." -msgstr "regedit: No s'ha pogut obrir la clau de registre '%1'.\n" +msgstr "No s'ha pogut crear un valor de registre nou." #: regedit.rc:250 msgid "" "Unable to rename the key '%1'.\n" "The specified key name already exists." msgstr "" +"No es pot canviar el nom de la clau '%1'.\n" +"El nom de clau especificat ja existeix." #: regedit.rc:251 msgid "" "Unable to rename the value '%1'.\n" "The specified value name already exists." msgstr "" +"No s'ha pogut canviar el nom del valor '%1'.\n" +"El nom de valor especificat ja existeix." #: regedit.rc:252 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to delete the selected registry key." -msgstr "regedit: No s'ha pogut obrir la clau de registre '%1'.\n" +msgstr "No s'ha pogut suprimir la clau de registre seleccionada." #: regedit.rc:253 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to rename the selected registry key." -msgstr "regedit: No s'ha pogut obrir la clau de registre '%1'.\n" +msgstr "No s'ha pogut canviar el nom de la clau de registre seleccionada." #: regedit.rc:254 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to rename the selected registry value." -msgstr "regedit: No s'ha pogut obrir la clau de registre '%1'.\n" +msgstr "No s'ha pogut canviar el nom del valor de registre seleccionat." #: regedit.rc:255 msgid "" "The keys and values contained in %1 were successfully added to the registry." msgstr "" +"Les claus i els valors continguts en %1 s'han afegit al registre amb èxit." #: regedit.rc:256 -#, fuzzy -#| msgid "" -#| "regedit: Unable to export '%1'. The specified registry key was not " -#| "found.\n" msgid "Unable to import %1. The specified file is not a valid registry file." msgstr "" -"regedit: No s'ha pogut exportar '%1'. No s'ha trobat la clau de registre " -"especificada.\n" +"No s'ha pogut importar %1. El fitxer especificat no és un fitxer de registre " +"vàlid." #: regedit.rc:408 -#, fuzzy -#| msgid "" -#| "Usage:\n" -#| " regedit [options] [filename] [reg_key]\n" -#| "\n" -#| "Options:\n" -#| " [no option] Launch the graphical version of this program.\n" -#| " /L:system.dat The location of the system.dat file to be modified.\n" -#| " Compatible with any other switch. Ignored.\n" -#| " /R:user.dat The location of the user.dat file to be modified.\n" -#| " Compatible with any other switch. Ignored.\n" -#| " /C Import the contents of a registry file.\n" -#| " /D Delete a specified registry key.\n" -#| " /E Export the contents of a specified registry key to a " -#| "file.\n" -#| " If no key is specified, the entire registry is " -#| "exported.\n" -#| " /S Silent mode. No messages will be displayed.\n" -#| " /V Launch the GUI in advanced mode. Ignored.\n" -#| " /? Display this information and exit.\n" -#| " [filename] The location of the file containing registry information " -#| "to\n" -#| " be imported. When used with [/E], this option specifies " -#| "the\n" -#| " file location where registry information will be " -#| "exported.\n" -#| " [reg_key] The registry key to be modified.\n" -#| "\n" -#| "Usage examples:\n" -#| " regedit \"import.reg\"\n" -#| " regedit /E \"export.reg\" \"HKEY_CURRENT_USER\\Console\"\n" -#| " regedit /D \"HKEY_LOCAL_MACHINE\\Error\\Path\"\n" msgid "" "Usage:\n" " regedit [options] [filename] [reg_key]\n" @@ -12782,11 +12603,11 @@ msgstr "" "Exemples d'ús:\n" " regedit \"import.reg\"\n" " regedit /E \"export.reg\" \"HKEY_CURRENT_USER\\Console\"\n" -" regedit /D \"HKEY_LOCAL_MACHINE\\Error\\Path\"\n" +" regedit /D \"HKEY_LOCAL_MACHINE\\Camí\\de\\clau\"\n" #: regedit.rc:409 msgid "regedit: Invalid or unrecognized switch [%1]\n" -msgstr "regedit: Commutador invàlid o no reconegut [%1]\n" +msgstr "regedit: Commutador no vàlid o no reconegut [%1]\n" #: regedit.rc:410 msgid "Type \"regedit /?\" for help.\n" @@ -12818,7 +12639,7 @@ msgstr "regedit: No resta memòria! (%1!S!, línia %2!u!)\n" #: regedit.rc:417 msgid "regedit: Invalid hexadecimal value.\n" -msgstr "regedit: El valor hexadecimal és invàlid.\n" +msgstr "regedit: El valor hexadecimal no és vàlid.\n" #: regedit.rc:418 msgid "" @@ -12826,17 +12647,15 @@ msgid "" "encountered at '%1'.\n" msgstr "" "regedit: No s'ha pogut convertir les dades hexadecimals. S'ha trobat un " -"valor invàlid a '%1'.\n" +"valor no vàlid a '%1'.\n" #: regedit.rc:419 msgid "regedit: Unrecognized escape sequence [\\%1!c!]\n" msgstr "regedit: Seqüència d'escapada no reconeguda [\\%1!c!]\n" #: regedit.rc:420 -#, fuzzy -#| msgid "regedit: Unsupported registry data type [%1]\n" msgid "regedit: Unsupported registry data type [0x%1!x!]\n" -msgstr "regedit: Tipus de dades de registre incompatible [%1]\n" +msgstr "regedit: Tipus de dades de registre incompatible [0x%1!x!]\n" #: regedit.rc:421 msgid "regedit: Unexpected end of line in '%1'.\n" @@ -12855,12 +12674,10 @@ msgid "regedit: Unable to open the registry key '%1'.\n" msgstr "regedit: No s'ha pogut obrir la clau de registre '%1'.\n" #: regedit.rc:425 -#, fuzzy -#| msgid "regedit: Unsupported registry data type [%1] encountered in '%2'.\n" msgid "" "regedit: Unsupported registry data type [0x%1!x!] encountered in '%2'.\n" msgstr "" -"regedit: S'ha trobat un tipus de dades de registre incompatible [%1] en " +"regedit: S'ha trobat un tipus de dades de registre incompatible [0x%1!x!] en " "'%2'.\n" #: regedit.rc:426 @@ -12868,10 +12685,8 @@ msgid "regedit: The registry value '%1' will be exported as binary data.\n" msgstr "regedit: El valor de registre '%1' s'exportarà com a dades binàries.\n" #: regedit.rc:427 -#, fuzzy -#| msgid "reg: Invalid key name\n" msgid "regedit: Invalid system key [%1]\n" -msgstr "reg: Nom de clau invàlid\n" +msgstr "regedit: Clau de sistema no vàlida [%1]\n" #: regedit.rc:428 msgid "" @@ -12881,22 +12696,16 @@ msgstr "" "especificada.\n" #: regedit.rc:429 -#, fuzzy -#| msgid "regedit: Unable to delete the registry class '%1'.\n" msgid "regedit: Unable to delete the registry key '%1'.\n" -msgstr "regedit: No s'ha pogut suprimir la classe de registre '%1'.\n" +msgstr "regedit: No s'ha pogut suprimir la clau de registre '%1'.\n" #: regedit.rc:431 -#, fuzzy -#| msgid "regedit: The line '%1' was not recognized.\n" msgid "regedit: The line contains invalid syntax.\n" -msgstr "regedit: No s'ha reconegut la línia '%1'.\n" +msgstr "regedit: La línia conté sintaxi no vàlida.\n" #: regedit.rc:187 -#, fuzzy -#| msgid "Quits the registry editor" msgid "Quits the Registry Editor" -msgstr "Tanca l'editor de registre" +msgstr "Tanca l'Editor de Registre" #: regedit.rc:188 msgid "Adds keys to the favorites list" @@ -12911,8 +12720,6 @@ msgid "Shows or hides the status bar" msgstr "Mostra o amaga la barra d'estat" #: regedit.rc:191 -#, fuzzy -#| msgid "Change position of split between two panes" msgid "Changes the position of the split between two panes" msgstr "Canvia la posició de la divisió entre dos panells" @@ -12957,10 +12764,8 @@ msgid "Adds a new binary value" msgstr "Afegeix un valor binari nou" #: regedit.rc:174 -#, fuzzy -#| msgid "Adds a new binary value" msgid "Adds a new 32-bit value" -msgstr "Afegeix un valor binari nou" +msgstr "Afegeix un valor nou de 32 bits" #: regedit.rc:177 msgid "Imports a text file into the registry" @@ -12975,42 +12780,32 @@ msgid "Prints all or part of the registry" msgstr "Imprimeix tot o part del registre" #: regedit.rc:181 -#, fuzzy -#| msgid "Registry Editor" msgid "Opens Registry Editor Help" -msgstr "Editor de Registre" +msgstr "Obre l'Ajuda de l'Editor de Registre" #: regedit.rc:182 msgid "Displays program information, version number and copyright" -msgstr "Mostra informació de programa, nombre de versió i drets d'autor" +msgstr "Mostra informació de programa, número de versió i drets d'autor" #: regedit.rc:206 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to query the registry value '%1'." -msgstr "regedit: No s'ha pogut obrir la clau de registre '%1'.\n" +msgstr "No s'ha pogut consultar el valor de registre '%1'." #: regedit.rc:207 -#, fuzzy -#| msgid "Can't edit keys of this type (%u)" msgid "Unable to edit registry keys of this type (%1!u!)." -msgstr "No es pot editar les claus d'aquest tipus (%u)" +msgstr "No es pot editar les claus d'aquest tipus (%1!u!)." #: regedit.rc:208 -#, fuzzy -#| msgid "Value is too big (%u)" msgid "The value is too big (%1!u!)." -msgstr "El valor és massa gran (%u)" +msgstr "El valor és massa gran (%1!u!)." #: regedit.rc:209 msgid "Confirm Value Delete" msgstr "Confirmar eliminació de valor" #: regedit.rc:216 -#, fuzzy -#| msgid "Search string '%s' not found" msgid "Search complete. The string '%1' was not found." -msgstr "Cadena de cerca '%s' no trobada" +msgstr "S'ha acabat la cerca. No s'ha trobat la cadena '%1'." #: regedit.rc:211 msgid "Are you sure you want to delete these values?" @@ -13025,56 +12820,43 @@ msgid "New Value #%d" msgstr "Valor nou #%d" #: regedit.rc:205 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to query the registry key '%1'." -msgstr "regedit: No s'ha pogut obrir la clau de registre '%1'.\n" +msgstr "No s'ha pogut consultar la clau de registre '%1'." #: regedit.rc:170 -#, fuzzy -#| msgid "Modifies the value's data" msgid "Modifies the value's data in binary form" -msgstr "Modifica les dades del valor" +msgstr "Modifica les dades del valor en forma binària" #: regedit.rc:175 msgid "Adds a new multi-string value" msgstr "Afegeix un valor de cadena múltiple nou" #: regedit.rc:198 -#, fuzzy -#| msgid "Exports selected branch of the registry to a text file" msgid "Exports the selected branch of the registry to a text file" msgstr "Exporta la branca seleccionada del registre a un fitxer de text" #: regedit.rc:176 -#, fuzzy -#| msgid "Adds a new string value" msgid "Adds a new expandable string value" -msgstr "Afegeix un valor de cadena nou" +msgstr "Afegeix un valor nou de cadena expansible" #: regedit.rc:212 -#, fuzzy -#| msgid "Confirm Value Delete" msgid "Confirm Key Delete" -msgstr "Confirmar eliminació de valor" +msgstr "Confirmar eliminació de clau" #: regedit.rc:213 -#, fuzzy -#| msgid "Are you sure you want to delete the registry key '%1'?" msgid "" "Are you sure you want to delete this registry key and all of its subkeys?" -msgstr "Esteu segur que voleu suprimir la clau de registre '%1'?" +msgstr "" +"Esteu segur que voleu suprimir aquesta clau de registre i totes les seves " +"subclaus?" #: regedit.rc:199 msgid "Expands or collapses the selected node" -msgstr "" +msgstr "Expandeix o col·lapsa el node seleccionat" #: regedit.rc:231 -#, fuzzy -#| msgctxt "object state" -#| msgid "collapsed" msgid "Collapse" -msgstr "col·lapsat" +msgstr "Col·lapsa" #: regsvr32.rc:32 msgid "" @@ -13107,11 +12889,11 @@ msgstr "" "Options:\n" " [/u] Desregistra un servidor.\n" " [/s] Mode silent (no es mostrarà cap missatge).\n" -" [/i] Truca DllInstall, passant una [línia d'ordres] opcional.\n" -"\tQuan s'utilitza amb [/u], es truca DllInstall en el mode de " -"desinstal·lació.\n" -" [/n] No truquis DllRegisterServer. S'ha d'utilitzar aquesta opció amb [/" -"i].\n" +" [/i] Truca a DllInstall, passant una [línia d'ordres] opcional.\n" +"\tQuan s'utilitza amb [/u], es truca a DllInstall en el mode de\n" +"\tdesinstal·lació.\n" +" [/n] No truquis a DllRegisterServer. S'ha d'utilitzar aquesta opció amb\n" +"\t[/i].\n" "\n" #: regsvr32.rc:41 @@ -13119,7 +12901,7 @@ msgid "" "regsvr32: Invalid or unrecognized switch [%1]\n" "\n" msgstr "" -"regsvr32: Commutador invàlid o no reconegut [%1]\n" +"regsvr32: Commutador no vàlid o no reconegut [%1]\n" "\n" #: regsvr32.rc:42 @@ -13185,11 +12967,12 @@ msgstr "Ús: taskkill [/?] [/f] [/im NomDeProcés | /pid IdDeProcés]\n" #: taskkill.rc:31 msgid "Error: Unknown or invalid command line option specified.\n" msgstr "" -"Error: S'ha especificat una opció de línia d'ordres invàlida o desconeguda.\n" +"Error: S'ha especificat una opció de línia d'ordres no vàlida o " +"desconeguda.\n" #: taskkill.rc:32 msgid "Error: Invalid command line parameter specified.\n" -msgstr "Error: S'ha especificat un paràmetre de línia d'ordres invàlid.\n" +msgstr "Error: S'ha especificat un paràmetre de línia d'ordres no vàlid.\n" #: taskkill.rc:33 msgid "Error: One of options /im or /pid must be specified.\n" @@ -13799,7 +13582,7 @@ msgstr "Mostra temes d'ajuda de l'Administrador de Tasques" #: taskmgr.rc:212 msgid "Displays program information, version number, and copyright" -msgstr "Mostra informació de programa, nombre de versió i drets d'autor" +msgstr "Mostra informació de programa, número de versió i drets d'autor" #: taskmgr.rc:213 msgid "Exits the Task Manager application" @@ -14021,7 +13804,7 @@ msgstr "El procés ha de tenir afinitat amb almenys un processador" #: taskmgr.rc:316 msgid "Invalid Option" -msgstr "Opció invàlida" +msgstr "Opció no vàlida" #: taskmgr.rc:317 msgid "Unable to Access or Set Process Affinity" @@ -14054,22 +13837,21 @@ msgid "" "Do you want to remove the uninstall entry from the registry?" msgstr "" "L'execució de l'ordre de desinstal·lació '%s' ha fallat, potser perquè " -"l'executable manqui.\n" +"manqui l'executable.\n" "Voleu eliminar l'entrada de desinstal·lació del registre?" #: uninstaller.rc:31 msgid "uninstaller: The application with GUID '%1' was not found\n" -msgstr "desinstal·lador: No s'ha trobat l'aplicació amb la GUID '%1'\n" +msgstr "desinstal·lador: No s'ha trobat l'aplicació amb el GUID '%1'\n" #: uninstaller.rc:32 msgid "" "uninstaller: The option '--remove' must be followed by an application GUID\n" -msgstr "" -"desinstal·lador: Una GUID d'aplicació ha de seguir l'opció '--remove'\n" +msgstr "desinstal·lador: Un GUID d'aplicació ha de seguir l'opció '--remove'\n" #: uninstaller.rc:33 msgid "uninstaller: Invalid option [%1]\n" -msgstr "desinstal·lador: Opció invàlida [%1]\n" +msgstr "desinstal·lador: Opció no vàlida [%1]\n" #: uninstaller.rc:35 msgid "" @@ -14312,7 +14094,7 @@ msgstr "A&fegeix..." #: winecfg.rc:238 msgid "Aut&odetect" -msgstr "Autodetecta" +msgstr "Aut&odetecta" #: winecfg.rc:241 msgid "&Path:" @@ -14902,7 +14684,7 @@ msgstr "wineconsole: No s'ha pogut processar l'id del esdeveniment\n" #: wineconsole.rc:45 msgid "wineconsole: Invalid backend\n" -msgstr "wineconsole: Backend invàlid\n" +msgstr "wineconsole: Rerefons no vàlid\n" #: wineconsole.rc:46 msgid "wineconsole: Unrecognized command line option\n" @@ -14918,7 +14700,7 @@ msgid "" "The command is invalid.\n" msgstr "" "wineconsole: L'inici del programa %s ha fallat.\n" -"L'ordre és invàlid.\n" +"L'ordre no és vàlida.\n" #: wineconsole.rc:50 msgid "" @@ -15014,7 +14796,7 @@ msgstr "Caiguda de programa del Wine" #: winedbg.rc:39 msgid "Internal errors - invalid parameters received" -msgstr "Errors interns - paràmetres invàlids rebuts" +msgstr "Errors interns - paràmetres no vàlids rebuts" #: winedbg.rc:40 msgid "(unidentified)" @@ -15290,10 +15072,8 @@ msgid "Expert" msgstr "Expert" #: winemine.rc:74 winemine.rc:33 -#, fuzzy -#| msgid "Result" msgid "Reset Results" -msgstr "Resultat" +msgstr "Reinicia els resultats" #: winemine.rc:80 msgid "Congratulations!" @@ -15321,7 +15101,7 @@ msgstr "Mines" #: winemine.rc:34 msgid "All results will be lost. Are you sure?" -msgstr "" +msgstr "Es perdran tots els resultats. N'esteu segur?" #: winemine.rc:30 msgid "WineMine" @@ -15437,11 +15217,11 @@ msgstr "Error: Àlies no trobat\n" #: wmic.rc:30 msgid "Error: Invalid query\n" -msgstr "Error: Cerca invàlida\n" +msgstr "Error: Consulta no vàlida\n" #: wmic.rc:31 msgid "Error: Invalid syntax for PATH\n" -msgstr "Error: Sintaxi invàlida per a PATH\n" +msgstr "Error: Sintaxi no vàlida per a PATH\n" #: wordpad.rc:31 msgid "&New...\tCtrl+N" @@ -15633,7 +15413,7 @@ msgstr "&Cap ajust de línia" #: wordpad.rc:269 msgid "Wrap text by the &window border" -msgstr "Ajusta el text pela vora de la &finestra" +msgstr "Ajusta el text per la vora de la &finestra" #: wordpad.rc:270 msgid "Wrap text by the &margin" @@ -15801,7 +15581,7 @@ msgstr "" #: wordpad.rc:198 msgid "Invalid number format." -msgstr "El format de nombre és invàlid." +msgstr "El format de nombre no és vàlid." #: wordpad.rc:199 msgid "OLE storage documents are not supported." @@ -15837,11 +15617,11 @@ msgstr "L'inici del Wordpad ha fallat" #: xcopy.rc:30 msgid "Invalid number of parameters - Use xcopy /? for help\n" -msgstr "Nombre de paràmetres invàlid - Utilitzeu xcopy /? per ajuda\n" +msgstr "Nombre de paràmetres no vàlid - Utilitzeu xcopy /? per ajuda\n" #: xcopy.rc:31 msgid "Invalid parameter '%1' - Use xcopy /? for help\n" -msgstr "Paràmetre invàlid '%1' - Utilitzeu xcopy /? per ajuda\n" +msgstr "Paràmetre no vàlid '%1' - Utilitzeu xcopy /? per ajuda\n" #: xcopy.rc:32 msgid "Press <Enter> to begin copying\n" @@ -15939,7 +15719,7 @@ msgstr "" "[/S] Copia els directoris i subdirectoris.\n" "[/E] Copia els directoris i subdirectoris, incloent-hi els buits.\n" "[/Q] No mostris els noms durant la còpia, és a dir, sigues silent.\n" -"[/F] Mostra els noms complets de la font i el destinatari durant la còpia.\n" +"[/F] Mostra els noms complets de la font i la destinació durant la còpia.\n" "[/L] Simula l'operació, mostrant els noms que es copiarien.\n" "[/W] Pregunta abans de començar l'operació de còpia.\n" "[/T] Crea una estructura de directoris buits però no copiïs els fitxers.\n" -- 2.15.1

1 2

[PATCH 1/2] testbot: Re-save the database diagram with the current dia.
by Francois Gouget 18 Dec '17

18 Dec '17

The goal is to minimize the diff in coming changes. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/doc/winetestbot-schema.dia | 1082 ++++++++++++++++++++++-------------- 1 file changed, 657 insertions(+), 425 deletions(-) diff --git a/testbot/doc/winetestbot-schema.dia b/testbot/doc/winetestbot-schema.dia index 056412c3..de91f9aa 100644 --- a/testbot/doc/winetestbot-schema.dia +++ b/testbot/doc/winetestbot-schema.dia @@ -2,10 +2,10 @@ <dia:diagram xmlns:dia="http://www.lysator.liu.se/~alla/dia/"> <dia:diagramdata> <dia:attribute name="background"> - <dia:color val="#ffffff"/> + <dia:color val="#ffffffff"/> </dia:attribute> <dia:attribute name="pagebreak"> - <dia:color val="#000099"/> + <dia:color val="#000099ff"/> </dia:attribute> <dia:attribute name="paper"> <dia:composite type="paper"> @@ -37,6 +37,9 @@ </dia:attribute> <dia:attribute name="grid"> <dia:composite type="grid"> + <dia:attribute name="dynamic"> + <dia:boolean val="true"/> + </dia:attribute> <dia:attribute name="width_x"> <dia:real val="1"/> </dia:attribute> @@ -53,7 +56,7 @@ </dia:composite> </dia:attribute> <dia:attribute name="color"> - <dia:color val="#d8e5e5"/> + <dia:color val="#d8e5e5ff"/> </dia:attribute> <dia:attribute name="guides"> <dia:composite type="guides"> @@ -61,8 +64,27 @@ <dia:attribute name="vguides"/> </dia:composite> </dia:attribute> + <dia:attribute name="display"> + <dia:composite type="display"> + <dia:attribute name="antialiased"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="snap-to-grid"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="snap-to-object"> + <dia:boolean val="true"/> + </dia:attribute> + <dia:attribute name="show-grid"> + <dia:boolean val="true"/> + </dia:attribute> + <dia:attribute name="show-connection-points"> + <dia:boolean val="true"/> + </dia:attribute> + </dia:composite> + </dia:attribute> </dia:diagramdata> - <dia:layer name="Background" visible="true" active="true"> + <dia:layer name="Background" visible="true" connectable="true" active="true"> <dia:object type="Database - Table" version="0" id="O0"> <dia:attribute name="obj_pos"> <dia:point val="-4.3875,-24.05"/> @@ -82,18 +104,6 @@ <dia:attribute name="elem_height"> <dia:real val="6.2000000000000002"/> </dia:attribute> - <dia:attribute name="text_colour"> - <dia:color val="#000000"/> - </dia:attribute> - <dia:attribute name="line_colour"> - <dia:color val="#000000"/> - </dia:attribute> - <dia:attribute name="fill_colour"> - <dia:color val="#ffffff"/> - </dia:attribute> - <dia:attribute name="line_width"> - <dia:real val="0.10000000000000001"/> - </dia:attribute> <dia:attribute name="name"> <dia:string>#Users#</dia:string> </dia:attribute> @@ -103,33 +113,15 @@ <dia:attribute name="visible_comment"> <dia:boolean val="false"/> </dia:attribute> - <dia:attribute name="tagging_comment"> + <dia:attribute name="underline_primary_key"> <dia:boolean val="false"/> </dia:attribute> - <dia:attribute name="underline_primary_key"> + <dia:attribute name="tagging_comment"> <dia:boolean val="false"/> </dia:attribute> <dia:attribute name="bold_primary_keys"> <dia:boolean val="true"/> </dia:attribute> - <dia:attribute name="normal_font"> - <dia:font family="monospace" style="0" name="Courier"/> - </dia:attribute> - <dia:attribute name="name_font"> - <dia:font family="sans" style="80" name="Helvetica-Bold"/> - </dia:attribute> - <dia:attribute name="comment_font"> - <dia:font family="sans" style="8" name="Helvetica-Oblique"/> - </dia:attribute> - <dia:attribute name="normal_font_height"> - <dia:real val="0.80000000000000004"/> - </dia:attribute> - <dia:attribute name="name_font_height"> - <dia:real val="0.99999999999999989"/> - </dia:attribute> - <dia:attribute name="comment_font_height"> - <dia:real val="0.69999999999999996"/> - </dia:attribute> <dia:attribute name="attributes"> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -150,6 +142,9 @@ <dia:attribute name="unique"> <dia:boolean val="true"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -170,6 +165,9 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -190,6 +188,9 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -210,6 +211,9 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -230,6 +234,9 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -250,8 +257,41 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> </dia:attribute> + <dia:attribute name="normal_font"> + <dia:font family="monospace" style="0" name="Courier"/> + </dia:attribute> + <dia:attribute name="name_font"> + <dia:font family="sans" style="80" name="Helvetica-Bold"/> + </dia:attribute> + <dia:attribute name="comment_font"> + <dia:font family="sans" style="8" name="Helvetica-Oblique"/> + </dia:attribute> + <dia:attribute name="normal_font_height"> + <dia:real val="0.80000000000000004"/> + </dia:attribute> + <dia:attribute name="name_font_height"> + <dia:real val="0.99999999999999989"/> + </dia:attribute> + <dia:attribute name="comment_font_height"> + <dia:real val="0.69999999999999996"/> + </dia:attribute> + <dia:attribute name="text_colour"> + <dia:color val="#000000ff"/> + </dia:attribute> + <dia:attribute name="line_colour"> + <dia:color val="#000000ff"/> + </dia:attribute> + <dia:attribute name="fill_colour"> + <dia:color val="#ffffffff"/> + </dia:attribute> + <dia:attribute name="line_width"> + <dia:real val="0.10000000000000001"/> + </dia:attribute> </dia:object> <dia:object type="Database - Table" version="0" id="O1"> <dia:attribute name="obj_pos"> @@ -272,18 +312,6 @@ <dia:attribute name="elem_height"> <dia:real val="3.7999999999999998"/> </dia:attribute> - <dia:attribute name="text_colour"> - <dia:color val="#000000"/> - </dia:attribute> - <dia:attribute name="line_colour"> - <dia:color val="#000000"/> - </dia:attribute> - <dia:attribute name="fill_colour"> - <dia:color val="#ffffff"/> - </dia:attribute> - <dia:attribute name="line_width"> - <dia:real val="0.10000000000000001"/> - </dia:attribute> <dia:attribute name="name"> <dia:string>#Sessions#</dia:string> </dia:attribute> @@ -293,33 +321,15 @@ <dia:attribute name="visible_comment"> <dia:boolean val="false"/> </dia:attribute> - <dia:attribute name="tagging_comment"> + <dia:attribute name="underline_primary_key"> <dia:boolean val="false"/> </dia:attribute> - <dia:attribute name="underline_primary_key"> + <dia:attribute name="tagging_comment"> <dia:boolean val="false"/> </dia:attribute> <dia:attribute name="bold_primary_keys"> <dia:boolean val="true"/> </dia:attribute> - <dia:attribute name="normal_font"> - <dia:font family="monospace" style="0" name="Courier"/> - </dia:attribute> - <dia:attribute name="name_font"> - <dia:font family="sans" style="80" name="Helvetica-Bold"/> - </dia:attribute> - <dia:attribute name="comment_font"> - <dia:font family="sans" style="8" name="Helvetica-Oblique"/> - </dia:attribute> - <dia:attribute name="normal_font_height"> - <dia:real val="0.80000000000000004"/> - </dia:attribute> - <dia:attribute name="name_font_height"> - <dia:real val="0.99999999999999989"/> - </dia:attribute> - <dia:attribute name="comment_font_height"> - <dia:real val="0.69999999999999996"/> - </dia:attribute> <dia:attribute name="attributes"> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -340,6 +350,9 @@ <dia:attribute name="unique"> <dia:boolean val="true"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -360,6 +373,9 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -380,8 +396,41 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> </dia:attribute> + <dia:attribute name="normal_font"> + <dia:font family="monospace" style="0" name="Courier"/> + </dia:attribute> + <dia:attribute name="name_font"> + <dia:font family="sans" style="80" name="Helvetica-Bold"/> + </dia:attribute> + <dia:attribute name="comment_font"> + <dia:font family="sans" style="8" name="Helvetica-Oblique"/> + </dia:attribute> + <dia:attribute name="normal_font_height"> + <dia:real val="0.80000000000000004"/> + </dia:attribute> + <dia:attribute name="name_font_height"> + <dia:real val="0.99999999999999989"/> + </dia:attribute> + <dia:attribute name="comment_font_height"> + <dia:real val="0.69999999999999996"/> + </dia:attribute> + <dia:attribute name="text_colour"> + <dia:color val="#000000ff"/> + </dia:attribute> + <dia:attribute name="line_colour"> + <dia:color val="#000000ff"/> + </dia:attribute> + <dia:attribute name="fill_colour"> + <dia:color val="#ffffffff"/> + </dia:attribute> + <dia:attribute name="line_width"> + <dia:real val="0.10000000000000001"/> + </dia:attribute> </dia:object> <dia:object type="Database - Table" version="0" id="O2"> <dia:attribute name="obj_pos"> @@ -402,18 +451,6 @@ <dia:attribute name="elem_height"> <dia:real val="3"/> </dia:attribute> - <dia:attribute name="text_colour"> - <dia:color val="#000000"/> - </dia:attribute> - <dia:attribute name="line_colour"> - <dia:color val="#000000"/> - </dia:attribute> - <dia:attribute name="fill_colour"> - <dia:color val="#ffffff"/> - </dia:attribute> - <dia:attribute name="line_width"> - <dia:real val="0.10000000000000001"/> - </dia:attribute> <dia:attribute name="name"> <dia:string>#UserRoles#</dia:string> </dia:attribute> @@ -423,33 +460,15 @@ <dia:attribute name="visible_comment"> <dia:boolean val="false"/> </dia:attribute> - <dia:attribute name="tagging_comment"> + <dia:attribute name="underline_primary_key"> <dia:boolean val="false"/> </dia:attribute> - <dia:attribute name="underline_primary_key"> + <dia:attribute name="tagging_comment"> <dia:boolean val="false"/> </dia:attribute> <dia:attribute name="bold_primary_keys"> <dia:boolean val="true"/> </dia:attribute> - <dia:attribute name="normal_font"> - <dia:font family="monospace" style="0" name="Courier"/> - </dia:attribute> - <dia:attribute name="name_font"> - <dia:font family="sans" style="80" name="Helvetica-Bold"/> - </dia:attribute> - <dia:attribute name="comment_font"> - <dia:font family="sans" style="8" name="Helvetica-Oblique"/> - </dia:attribute> - <dia:attribute name="normal_font_height"> - <dia:real val="0.80000000000000004"/> - </dia:attribute> - <dia:attribute name="name_font_height"> - <dia:real val="0.99999999999999989"/> - </dia:attribute> - <dia:attribute name="comment_font_height"> - <dia:real val="0.69999999999999996"/> - </dia:attribute> <dia:attribute name="attributes"> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -470,6 +489,9 @@ <dia:attribute name="unique"> <dia:boolean val="true"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -490,8 +512,41 @@ <dia:attribute name="unique"> <dia:boolean val="true"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> </dia:attribute> + <dia:attribute name="normal_font"> + <dia:font family="monospace" style="0" name="Courier"/> + </dia:attribute> + <dia:attribute name="name_font"> + <dia:font family="sans" style="80" name="Helvetica-Bold"/> + </dia:attribute> + <dia:attribute name="comment_font"> + <dia:font family="sans" style="8" name="Helvetica-Oblique"/> + </dia:attribute> + <dia:attribute name="normal_font_height"> + <dia:real val="0.80000000000000004"/> + </dia:attribute> + <dia:attribute name="name_font_height"> + <dia:real val="0.99999999999999989"/> + </dia:attribute> + <dia:attribute name="comment_font_height"> + <dia:real val="0.69999999999999996"/> + </dia:attribute> + <dia:attribute name="text_colour"> + <dia:color val="#000000ff"/> + </dia:attribute> + <dia:attribute name="line_colour"> + <dia:color val="#000000ff"/> + </dia:attribute> + <dia:attribute name="fill_colour"> + <dia:color val="#ffffffff"/> + </dia:attribute> + <dia:attribute name="line_width"> + <dia:real val="0.10000000000000001"/> + </dia:attribute> </dia:object> <dia:object type="Database - Table" version="0" id="O3"> <dia:attribute name="obj_pos"> @@ -512,18 +567,6 @@ <dia:attribute name="elem_height"> <dia:real val="3"/> </dia:attribute> - <dia:attribute name="text_colour"> - <dia:color val="#000000"/> - </dia:attribute> - <dia:attribute name="line_colour"> - <dia:color val="#000000"/> - </dia:attribute> - <dia:attribute name="fill_colour"> - <dia:color val="#ffffff"/> - </dia:attribute> - <dia:attribute name="line_width"> - <dia:real val="0.10000000000000001"/> - </dia:attribute> <dia:attribute name="name"> <dia:string>#Roles#</dia:string> </dia:attribute> @@ -533,33 +576,15 @@ <dia:attribute name="visible_comment"> <dia:boolean val="false"/> </dia:attribute> - <dia:attribute name="tagging_comment"> + <dia:attribute name="underline_primary_key"> <dia:boolean val="false"/> </dia:attribute> - <dia:attribute name="underline_primary_key"> + <dia:attribute name="tagging_comment"> <dia:boolean val="false"/> </dia:attribute> <dia:attribute name="bold_primary_keys"> <dia:boolean val="true"/> </dia:attribute> - <dia:attribute name="normal_font"> - <dia:font family="monospace" style="0" name="Courier"/> - </dia:attribute> - <dia:attribute name="name_font"> - <dia:font family="sans" style="80" name="Helvetica-Bold"/> - </dia:attribute> - <dia:attribute name="comment_font"> - <dia:font family="sans" style="8" name="Helvetica-Oblique"/> - </dia:attribute> - <dia:attribute name="normal_font_height"> - <dia:real val="0.80000000000000004"/> - </dia:attribute> - <dia:attribute name="name_font_height"> - <dia:real val="0.99999999999999989"/> - </dia:attribute> - <dia:attribute name="comment_font_height"> - <dia:real val="0.69999999999999996"/> - </dia:attribute> <dia:attribute name="attributes"> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -580,6 +605,9 @@ <dia:attribute name="unique"> <dia:boolean val="true"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -600,15 +628,48 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> </dia:attribute> + <dia:attribute name="normal_font"> + <dia:font family="monospace" style="0" name="Courier"/> + </dia:attribute> + <dia:attribute name="name_font"> + <dia:font family="sans" style="80" name="Helvetica-Bold"/> + </dia:attribute> + <dia:attribute name="comment_font"> + <dia:font family="sans" style="8" name="Helvetica-Oblique"/> + </dia:attribute> + <dia:attribute name="normal_font_height"> + <dia:real val="0.80000000000000004"/> + </dia:attribute> + <dia:attribute name="name_font_height"> + <dia:real val="0.99999999999999989"/> + </dia:attribute> + <dia:attribute name="comment_font_height"> + <dia:real val="0.69999999999999996"/> + </dia:attribute> + <dia:attribute name="text_colour"> + <dia:color val="#000000ff"/> + </dia:attribute> + <dia:attribute name="line_colour"> + <dia:color val="#000000ff"/> + </dia:attribute> + <dia:attribute name="fill_colour"> + <dia:color val="#ffffffff"/> + </dia:attribute> + <dia:attribute name="line_width"> + <dia:real val="0.10000000000000001"/> + </dia:attribute> </dia:object> <dia:object type="Database - Reference" version="0" id="O4"> <dia:attribute name="obj_pos"> <dia:point val="-7.87083,-21.5"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="-7.87083,-23;-4.3875,-21.5"/> + <dia:rectangle val="-7.92083,-23;-4.3375,-21.45"/> </dia:attribute> <dia:attribute name="meta"> <dia:composite type="dict"/> @@ -628,10 +689,10 @@ <dia:boolean val="false"/> </dia:attribute> <dia:attribute name="text_colour"> - <dia:color val="#000000"/> + <dia:color val="#000000ff"/> </dia:attribute> <dia:attribute name="line_colour"> - <dia:color val="#000000"/> + <dia:color val="#000000ff"/> </dia:attribute> <dia:attribute name="line_width"> <dia:real val="0.10000000000000001"/> @@ -668,7 +729,7 @@ <dia:point val="4.6125,-22.35"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="4.6125,-23;11.0458,-22.3334"/> + <dia:rectangle val="4.5625,-23;11.0958,-22.2834"/> </dia:attribute> <dia:attribute name="meta"> <dia:composite type="dict"/> @@ -688,10 +749,10 @@ <dia:boolean val="true"/> </dia:attribute> <dia:attribute name="text_colour"> - <dia:color val="#000000"/> + <dia:color val="#000000ff"/> </dia:attribute> <dia:attribute name="line_colour"> - <dia:color val="#000000"/> + <dia:color val="#000000ff"/> </dia:attribute> <dia:attribute name="line_width"> <dia:real val="0.10000000000000001"/> @@ -728,7 +789,7 @@ <dia:point val="19.6608,-21.5334"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="19.6608,-22.2;25.3958,-21.5334"/> + <dia:rectangle val="19.6108,-22.2;25.4458,-21.4834"/> </dia:attribute> <dia:attribute name="meta"> <dia:composite type="dict"/> @@ -748,10 +809,10 @@ <dia:boolean val="false"/> </dia:attribute> <dia:attribute name="text_colour"> - <dia:color val="#000000"/> + <dia:color val="#000000ff"/> </dia:attribute> <dia:attribute name="line_colour"> - <dia:color val="#000000"/> + <dia:color val="#000000ff"/> </dia:attribute> <dia:attribute name="line_width"> <dia:real val="0.10000000000000001"/> @@ -802,18 +863,6 @@ <dia:attribute name="elem_height"> <dia:real val="3"/> </dia:attribute> - <dia:attribute name="text_colour"> - <dia:color val="#000000"/> - </dia:attribute> - <dia:attribute name="line_colour"> - <dia:color val="#000000"/> - </dia:attribute> - <dia:attribute name="fill_colour"> - <dia:color val="#ffffff"/> - </dia:attribute> - <dia:attribute name="line_width"> - <dia:real val="0.10000000000000001"/> - </dia:attribute> <dia:attribute name="name"> <dia:string>#Branches#</dia:string> </dia:attribute> @@ -823,33 +872,15 @@ <dia:attribute name="visible_comment"> <dia:boolean val="false"/> </dia:attribute> - <dia:attribute name="tagging_comment"> + <dia:attribute name="underline_primary_key"> <dia:boolean val="false"/> </dia:attribute> - <dia:attribute name="underline_primary_key"> + <dia:attribute name="tagging_comment"> <dia:boolean val="false"/> </dia:attribute> <dia:attribute name="bold_primary_keys"> <dia:boolean val="true"/> </dia:attribute> - <dia:attribute name="normal_font"> - <dia:font family="monospace" style="0" name="Courier"/> - </dia:attribute> - <dia:attribute name="name_font"> - <dia:font family="sans" style="80" name="Helvetica-Bold"/> - </dia:attribute> - <dia:attribute name="comment_font"> - <dia:font family="sans" style="8" name="Helvetica-Oblique"/> - </dia:attribute> - <dia:attribute name="normal_font_height"> - <dia:real val="0.80000000000000004"/> - </dia:attribute> - <dia:attribute name="name_font_height"> - <dia:real val="0.99999999999999989"/> - </dia:attribute> - <dia:attribute name="comment_font_height"> - <dia:real val="0.69999999999999996"/> - </dia:attribute> <dia:attribute name="attributes"> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -870,6 +901,9 @@ <dia:attribute name="unique"> <dia:boolean val="true"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -890,15 +924,48 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> </dia:attribute> + <dia:attribute name="normal_font"> + <dia:font family="monospace" style="0" name="Courier"/> + </dia:attribute> + <dia:attribute name="name_font"> + <dia:font family="sans" style="80" name="Helvetica-Bold"/> + </dia:attribute> + <dia:attribute name="comment_font"> + <dia:font family="sans" style="8" name="Helvetica-Oblique"/> + </dia:attribute> + <dia:attribute name="normal_font_height"> + <dia:real val="0.80000000000000004"/> + </dia:attribute> + <dia:attribute name="name_font_height"> + <dia:real val="0.99999999999999989"/> + </dia:attribute> + <dia:attribute name="comment_font_height"> + <dia:real val="0.69999999999999996"/> + </dia:attribute> + <dia:attribute name="text_colour"> + <dia:color val="#000000ff"/> + </dia:attribute> + <dia:attribute name="line_colour"> + <dia:color val="#000000ff"/> + </dia:attribute> + <dia:attribute name="fill_colour"> + <dia:color val="#ffffffff"/> + </dia:attribute> + <dia:attribute name="line_width"> + <dia:real val="0.10000000000000001"/> + </dia:attribute> </dia:object> <dia:object type="Database - Table" version="0" id="O8"> <dia:attribute name="obj_pos"> <dia:point val="-16.4708,-2.55002"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="-16.4708,-2.55002;-5.9308,5.24998"/> + <dia:rectangle val="-16.4708,-2.55002;-5.9308,6.04998"/> </dia:attribute> <dia:attribute name="meta"> <dia:composite type="dict"/> @@ -910,19 +977,7 @@ <dia:real val="10.539999999999999"/> </dia:attribute> <dia:attribute name="elem_height"> - <dia:real val="7.7999999999999998"/> - </dia:attribute> - <dia:attribute name="text_colour"> - <dia:color val="#000000"/> - </dia:attribute> - <dia:attribute name="line_colour"> - <dia:color val="#000000"/> - </dia:attribute> - <dia:attribute name="fill_colour"> - <dia:color val="#ffffff"/> - </dia:attribute> - <dia:attribute name="line_width"> - <dia:real val="0.10000000000000001"/> + <dia:real val="8.5999999999999996"/> </dia:attribute> <dia:attribute name="name"> <dia:string>#Patches#</dia:string> @@ -933,33 +988,15 @@ <dia:attribute name="visible_comment"> <dia:boolean val="false"/> </dia:attribute> - <dia:attribute name="tagging_comment"> + <dia:attribute name="underline_primary_key"> <dia:boolean val="false"/> </dia:attribute> - <dia:attribute name="underline_primary_key"> + <dia:attribute name="tagging_comment"> <dia:boolean val="false"/> </dia:attribute> <dia:attribute name="bold_primary_keys"> <dia:boolean val="true"/> </dia:attribute> - <dia:attribute name="normal_font"> - <dia:font family="monospace" style="0" name="Courier"/> - </dia:attribute> - <dia:attribute name="name_font"> - <dia:font family="sans" style="80" name="Helvetica-Bold"/> - </dia:attribute> - <dia:attribute name="comment_font"> - <dia:font family="sans" style="8" name="Helvetica-Oblique"/> - </dia:attribute> - <dia:attribute name="normal_font_height"> - <dia:real val="0.80000000000000004"/> - </dia:attribute> - <dia:attribute name="name_font_height"> - <dia:real val="0.99999999999999989"/> - </dia:attribute> - <dia:attribute name="comment_font_height"> - <dia:real val="0.69999999999999996"/> - </dia:attribute> <dia:attribute name="attributes"> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -980,6 +1017,9 @@ <dia:attribute name="unique"> <dia:boolean val="true"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -1000,6 +1040,9 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -1020,6 +1063,9 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -1040,6 +1086,9 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -1060,6 +1109,9 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -1080,6 +1132,9 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -1100,6 +1155,9 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -1148,6 +1206,36 @@ </dia:attribute> </dia:composite> </dia:attribute> + <dia:attribute name="normal_font"> + <dia:font family="monospace" style="0" name="Courier"/> + </dia:attribute> + <dia:attribute name="name_font"> + <dia:font family="sans" style="80" name="Helvetica-Bold"/> + </dia:attribute> + <dia:attribute name="comment_font"> + <dia:font family="sans" style="8" name="Helvetica-Oblique"/> + </dia:attribute> + <dia:attribute name="normal_font_height"> + <dia:real val="0.80000000000000004"/> + </dia:attribute> + <dia:attribute name="name_font_height"> + <dia:real val="0.99999999999999989"/> + </dia:attribute> + <dia:attribute name="comment_font_height"> + <dia:real val="0.69999999999999996"/> + </dia:attribute> + <dia:attribute name="text_colour"> + <dia:color val="#000000ff"/> + </dia:attribute> + <dia:attribute name="line_colour"> + <dia:color val="#000000ff"/> + </dia:attribute> + <dia:attribute name="fill_colour"> + <dia:color val="#ffffffff"/> + </dia:attribute> + <dia:attribute name="line_width"> + <dia:real val="0.10000000000000001"/> + </dia:attribute> </dia:object> <dia:object type="Database - Table" version="0" id="O9"> <dia:attribute name="obj_pos"> @@ -1168,18 +1256,6 @@ <dia:attribute name="elem_height"> <dia:real val="9.3999999999999986"/> </dia:attribute> - <dia:attribute name="text_colour"> - <dia:color val="#000000"/> - </dia:attribute> - <dia:attribute name="line_colour"> - <dia:color val="#000000"/> - </dia:attribute> - <dia:attribute name="fill_colour"> - <dia:color val="#ffffff"/> - </dia:attribute> - <dia:attribute name="line_width"> - <dia:real val="0.10000000000000001"/> - </dia:attribute> <dia:attribute name="name"> <dia:string>#Jobs#</dia:string> </dia:attribute> @@ -1189,33 +1265,15 @@ <dia:attribute name="visible_comment"> <dia:boolean val="false"/> </dia:attribute> - <dia:attribute name="tagging_comment"> + <dia:attribute name="underline_primary_key"> <dia:boolean val="false"/> </dia:attribute> - <dia:attribute name="underline_primary_key"> + <dia:attribute name="tagging_comment"> <dia:boolean val="false"/> </dia:attribute> <dia:attribute name="bold_primary_keys"> <dia:boolean val="true"/> </dia:attribute> - <dia:attribute name="normal_font"> - <dia:font family="monospace" style="0" name="Courier"/> - </dia:attribute> - <dia:attribute name="name_font"> - <dia:font family="sans" style="80" name="Helvetica-Bold"/> - </dia:attribute> - <dia:attribute name="comment_font"> - <dia:font family="sans" style="8" name="Helvetica-Oblique"/> - </dia:attribute> - <dia:attribute name="normal_font_height"> - <dia:real val="0.80000000000000004"/> - </dia:attribute> - <dia:attribute name="name_font_height"> - <dia:real val="0.99999999999999989"/> - </dia:attribute> - <dia:attribute name="comment_font_height"> - <dia:real val="0.69999999999999996"/> - </dia:attribute> <dia:attribute name="attributes"> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -1236,6 +1294,9 @@ <dia:attribute name="unique"> <dia:boolean val="true"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -1256,6 +1317,9 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -1276,6 +1340,9 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -1296,6 +1363,9 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -1316,6 +1386,9 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -1336,6 +1409,9 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -1356,6 +1432,9 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -1376,6 +1455,9 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -1396,6 +1478,9 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -1416,8 +1501,41 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> </dia:attribute> + <dia:attribute name="normal_font"> + <dia:font family="monospace" style="0" name="Courier"/> + </dia:attribute> + <dia:attribute name="name_font"> + <dia:font family="sans" style="80" name="Helvetica-Bold"/> + </dia:attribute> + <dia:attribute name="comment_font"> + <dia:font family="sans" style="8" name="Helvetica-Oblique"/> + </dia:attribute> + <dia:attribute name="normal_font_height"> + <dia:real val="0.80000000000000004"/> + </dia:attribute> + <dia:attribute name="name_font_height"> + <dia:real val="0.99999999999999989"/> + </dia:attribute> + <dia:attribute name="comment_font_height"> + <dia:real val="0.69999999999999996"/> + </dia:attribute> + <dia:attribute name="text_colour"> + <dia:color val="#000000ff"/> + </dia:attribute> + <dia:attribute name="line_colour"> + <dia:color val="#000000ff"/> + </dia:attribute> + <dia:attribute name="fill_colour"> + <dia:color val="#ffffffff"/> + </dia:attribute> + <dia:attribute name="line_width"> + <dia:real val="0.10000000000000001"/> + </dia:attribute> </dia:object> <dia:object type="Database - Table" version="0" id="O10"> <dia:attribute name="obj_pos"> @@ -1438,18 +1556,6 @@ <dia:attribute name="elem_height"> <dia:real val="4.6000000000000005"/> </dia:attribute> - <dia:attribute name="text_colour"> - <dia:color val="#000000"/> - </dia:attribute> - <dia:attribute name="line_colour"> - <dia:color val="#000000"/> - </dia:attribute> - <dia:attribute name="fill_colour"> - <dia:color val="#ffffff"/> - </dia:attribute> - <dia:attribute name="line_width"> - <dia:real val="0.10000000000000001"/> - </dia:attribute> <dia:attribute name="name"> <dia:string>#PendingPatches#</dia:string> </dia:attribute> @@ -1459,33 +1565,15 @@ <dia:attribute name="visible_comment"> <dia:boolean val="false"/> </dia:attribute> - <dia:attribute name="tagging_comment"> + <dia:attribute name="underline_primary_key"> <dia:boolean val="false"/> </dia:attribute> - <dia:attribute name="underline_primary_key"> + <dia:attribute name="tagging_comment"> <dia:boolean val="false"/> </dia:attribute> <dia:attribute name="bold_primary_keys"> <dia:boolean val="true"/> </dia:attribute> - <dia:attribute name="normal_font"> - <dia:font family="monospace" style="0" name="Courier"/> - </dia:attribute> - <dia:attribute name="name_font"> - <dia:font family="sans" style="80" name="Helvetica-Bold"/> - </dia:attribute> - <dia:attribute name="comment_font"> - <dia:font family="sans" style="8" name="Helvetica-Oblique"/> - </dia:attribute> - <dia:attribute name="normal_font_height"> - <dia:real val="0.80000000000000004"/> - </dia:attribute> - <dia:attribute name="name_font_height"> - <dia:real val="0.99999999999999989"/> - </dia:attribute> - <dia:attribute name="comment_font_height"> - <dia:real val="0.69999999999999996"/> - </dia:attribute> <dia:attribute name="attributes"> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -1506,6 +1594,9 @@ <dia:attribute name="unique"> <dia:boolean val="true"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -1526,6 +1617,9 @@ <dia:attribute name="unique"> <dia:boolean val="true"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -1546,6 +1640,9 @@ <dia:attribute name="unique"> <dia:boolean val="true"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -1566,8 +1663,41 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> </dia:attribute> + <dia:attribute name="normal_font"> + <dia:font family="monospace" style="0" name="Courier"/> + </dia:attribute> + <dia:attribute name="name_font"> + <dia:font family="sans" style="80" name="Helvetica-Bold"/> + </dia:attribute> + <dia:attribute name="comment_font"> + <dia:font family="sans" style="8" name="Helvetica-Oblique"/> + </dia:attribute> + <dia:attribute name="normal_font_height"> + <dia:real val="0.80000000000000004"/> + </dia:attribute> + <dia:attribute name="name_font_height"> + <dia:real val="0.99999999999999989"/> + </dia:attribute> + <dia:attribute name="comment_font_height"> + <dia:real val="0.69999999999999996"/> + </dia:attribute> + <dia:attribute name="text_colour"> + <dia:color val="#000000ff"/> + </dia:attribute> + <dia:attribute name="line_colour"> + <dia:color val="#000000ff"/> + </dia:attribute> + <dia:attribute name="fill_colour"> + <dia:color val="#ffffffff"/> + </dia:attribute> + <dia:attribute name="line_width"> + <dia:real val="0.10000000000000001"/> + </dia:attribute> </dia:object> <dia:object type="Database - Table" version="0" id="O11"> <dia:attribute name="obj_pos"> @@ -1588,18 +1718,6 @@ <dia:attribute name="elem_height"> <dia:real val="8.5999999999999996"/> </dia:attribute> - <dia:attribute name="text_colour"> - <dia:color val="#000000"/> - </dia:attribute> - <dia:attribute name="line_colour"> - <dia:color val="#000000"/> - </dia:attribute> - <dia:attribute name="fill_colour"> - <dia:color val="#ffffff"/> - </dia:attribute> - <dia:attribute name="line_width"> - <dia:real val="0.10000000000000001"/> - </dia:attribute> <dia:attribute name="name"> <dia:string>#Steps#</dia:string> </dia:attribute> @@ -1609,33 +1727,15 @@ <dia:attribute name="visible_comment"> <dia:boolean val="false"/> </dia:attribute> - <dia:attribute name="tagging_comment"> + <dia:attribute name="underline_primary_key"> <dia:boolean val="false"/> </dia:attribute> - <dia:attribute name="underline_primary_key"> + <dia:attribute name="tagging_comment"> <dia:boolean val="false"/> </dia:attribute> <dia:attribute name="bold_primary_keys"> <dia:boolean val="true"/> </dia:attribute> - <dia:attribute name="normal_font"> - <dia:font family="monospace" style="0" name="Courier"/> - </dia:attribute> - <dia:attribute name="name_font"> - <dia:font family="sans" style="80" name="Helvetica-Bold"/> - </dia:attribute> - <dia:attribute name="comment_font"> - <dia:font family="sans" style="8" name="Helvetica-Oblique"/> - </dia:attribute> - <dia:attribute name="normal_font_height"> - <dia:real val="0.80000000000000004"/> - </dia:attribute> - <dia:attribute name="name_font_height"> - <dia:real val="0.99999999999999989"/> - </dia:attribute> - <dia:attribute name="comment_font_height"> - <dia:real val="0.69999999999999996"/> - </dia:attribute> <dia:attribute name="attributes"> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -1656,6 +1756,9 @@ <dia:attribute name="unique"> <dia:boolean val="true"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -1676,6 +1779,9 @@ <dia:attribute name="unique"> <dia:boolean val="true"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -1696,6 +1802,9 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -1716,6 +1825,9 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -1736,6 +1848,9 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -1756,6 +1871,9 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -1776,6 +1894,9 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -1796,6 +1917,9 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -1816,8 +1940,41 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> </dia:attribute> + <dia:attribute name="normal_font"> + <dia:font family="monospace" style="0" name="Courier"/> + </dia:attribute> + <dia:attribute name="name_font"> + <dia:font family="sans" style="80" name="Helvetica-Bold"/> + </dia:attribute> + <dia:attribute name="comment_font"> + <dia:font family="sans" style="8" name="Helvetica-Oblique"/> + </dia:attribute> + <dia:attribute name="normal_font_height"> + <dia:real val="0.80000000000000004"/> + </dia:attribute> + <dia:attribute name="name_font_height"> + <dia:real val="0.99999999999999989"/> + </dia:attribute> + <dia:attribute name="comment_font_height"> + <dia:real val="0.69999999999999996"/> + </dia:attribute> + <dia:attribute name="text_colour"> + <dia:color val="#000000ff"/> + </dia:attribute> + <dia:attribute name="line_colour"> + <dia:color val="#000000ff"/> + </dia:attribute> + <dia:attribute name="fill_colour"> + <dia:color val="#ffffffff"/> + </dia:attribute> + <dia:attribute name="line_width"> + <dia:real val="0.10000000000000001"/> + </dia:attribute> </dia:object> <dia:object type="Database - Table" version="0" id="O12"> <dia:attribute name="obj_pos"> @@ -1838,18 +1995,6 @@ <dia:attribute name="elem_height"> <dia:real val="10.199999999999999"/> </dia:attribute> - <dia:attribute name="text_colour"> - <dia:color val="#000000"/> - </dia:attribute> - <dia:attribute name="line_colour"> - <dia:color val="#000000"/> - </dia:attribute> - <dia:attribute name="fill_colour"> - <dia:color val="#ffffff"/> - </dia:attribute> - <dia:attribute name="line_width"> - <dia:real val="0.10000000000000001"/> - </dia:attribute> <dia:attribute name="name"> <dia:string>#Tasks#</dia:string> </dia:attribute> @@ -1859,33 +2004,15 @@ <dia:attribute name="visible_comment"> <dia:boolean val="false"/> </dia:attribute> - <dia:attribute name="tagging_comment"> + <dia:attribute name="underline_primary_key"> <dia:boolean val="false"/> </dia:attribute> - <dia:attribute name="underline_primary_key"> + <dia:attribute name="tagging_comment"> <dia:boolean val="false"/> </dia:attribute> <dia:attribute name="bold_primary_keys"> <dia:boolean val="true"/> </dia:attribute> - <dia:attribute name="normal_font"> - <dia:font family="monospace" style="0" name="Courier"/> - </dia:attribute> - <dia:attribute name="name_font"> - <dia:font family="sans" style="80" name="Helvetica-Bold"/> - </dia:attribute> - <dia:attribute name="comment_font"> - <dia:font family="sans" style="8" name="Helvetica-Oblique"/> - </dia:attribute> - <dia:attribute name="normal_font_height"> - <dia:real val="0.80000000000000004"/> - </dia:attribute> - <dia:attribute name="name_font_height"> - <dia:real val="0.99999999999999989"/> - </dia:attribute> - <dia:attribute name="comment_font_height"> - <dia:real val="0.69999999999999996"/> - </dia:attribute> <dia:attribute name="attributes"> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -1906,6 +2033,9 @@ <dia:attribute name="unique"> <dia:boolean val="true"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -1926,6 +2056,9 @@ <dia:attribute name="unique"> <dia:boolean val="true"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -1946,6 +2079,9 @@ <dia:attribute name="unique"> <dia:boolean val="true"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -1966,6 +2102,9 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -1986,6 +2125,9 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -2006,6 +2148,9 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -2026,6 +2171,9 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -2046,6 +2194,9 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -2066,6 +2217,9 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -2086,6 +2240,9 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -2106,15 +2263,48 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> </dia:attribute> + <dia:attribute name="normal_font"> + <dia:font family="monospace" style="0" name="Courier"/> + </dia:attribute> + <dia:attribute name="name_font"> + <dia:font family="sans" style="80" name="Helvetica-Bold"/> + </dia:attribute> + <dia:attribute name="comment_font"> + <dia:font family="sans" style="8" name="Helvetica-Oblique"/> + </dia:attribute> + <dia:attribute name="normal_font_height"> + <dia:real val="0.80000000000000004"/> + </dia:attribute> + <dia:attribute name="name_font_height"> + <dia:real val="0.99999999999999989"/> + </dia:attribute> + <dia:attribute name="comment_font_height"> + <dia:real val="0.69999999999999996"/> + </dia:attribute> + <dia:attribute name="text_colour"> + <dia:color val="#000000ff"/> + </dia:attribute> + <dia:attribute name="line_colour"> + <dia:color val="#000000ff"/> + </dia:attribute> + <dia:attribute name="fill_colour"> + <dia:color val="#ffffffff"/> + </dia:attribute> + <dia:attribute name="line_width"> + <dia:real val="0.10000000000000001"/> + </dia:attribute> </dia:object> <dia:object type="Database - Table" version="0" id="O13"> <dia:attribute name="obj_pos"> <dia:point val="25.6708,-2.02919"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="25.6708,-2.02919;36.2108,8.17081"/> + <dia:rectangle val="25.6708,-2.02919;36.2108,8.97081"/> </dia:attribute> <dia:attribute name="meta"> <dia:composite type="dict"/> @@ -2126,19 +2316,7 @@ <dia:real val="10.539999999999999"/> </dia:attribute> <dia:attribute name="elem_height"> - <dia:real val="10.199999999999999"/> - </dia:attribute> - <dia:attribute name="text_colour"> - <dia:color val="#000000"/> - </dia:attribute> - <dia:attribute name="line_colour"> - <dia:color val="#000000"/> - </dia:attribute> - <dia:attribute name="fill_colour"> - <dia:color val="#ffffff"/> - </dia:attribute> - <dia:attribute name="line_width"> - <dia:real val="0.10000000000000001"/> + <dia:real val="11"/> </dia:attribute> <dia:attribute name="name"> <dia:string>#VMs#</dia:string> @@ -2149,33 +2327,15 @@ <dia:attribute name="visible_comment"> <dia:boolean val="false"/> </dia:attribute> - <dia:attribute name="tagging_comment"> + <dia:attribute name="underline_primary_key"> <dia:boolean val="false"/> </dia:attribute> - <dia:attribute name="underline_primary_key"> + <dia:attribute name="tagging_comment"> <dia:boolean val="false"/> </dia:attribute> <dia:attribute name="bold_primary_keys"> <dia:boolean val="true"/> </dia:attribute> - <dia:attribute name="normal_font"> - <dia:font family="monospace" style="0" name="Courier"/> - </dia:attribute> - <dia:attribute name="name_font"> - <dia:font family="sans" style="80" name="Helvetica-Bold"/> - </dia:attribute> - <dia:attribute name="comment_font"> - <dia:font family="sans" style="8" name="Helvetica-Oblique"/> - </dia:attribute> - <dia:attribute name="normal_font_height"> - <dia:real val="0.80000000000000004"/> - </dia:attribute> - <dia:attribute name="name_font_height"> - <dia:real val="0.99999999999999989"/> - </dia:attribute> - <dia:attribute name="comment_font_height"> - <dia:real val="0.69999999999999996"/> - </dia:attribute> <dia:attribute name="attributes"> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -2196,6 +2356,9 @@ <dia:attribute name="unique"> <dia:boolean val="true"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -2216,6 +2379,9 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -2236,6 +2402,9 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -2256,6 +2425,9 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -2276,6 +2448,9 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -2296,6 +2471,9 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -2316,6 +2494,9 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -2336,6 +2517,9 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -2356,6 +2540,9 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -2376,6 +2563,9 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -2396,6 +2586,9 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -2416,15 +2609,48 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> </dia:attribute> + <dia:attribute name="normal_font"> + <dia:font family="monospace" style="0" name="Courier"/> + </dia:attribute> + <dia:attribute name="name_font"> + <dia:font family="sans" style="80" name="Helvetica-Bold"/> + </dia:attribute> + <dia:attribute name="comment_font"> + <dia:font family="sans" style="8" name="Helvetica-Oblique"/> + </dia:attribute> + <dia:attribute name="normal_font_height"> + <dia:real val="0.80000000000000004"/> + </dia:attribute> + <dia:attribute name="name_font_height"> + <dia:real val="0.99999999999999989"/> + </dia:attribute> + <dia:attribute name="comment_font_height"> + <dia:real val="0.69999999999999996"/> + </dia:attribute> + <dia:attribute name="text_colour"> + <dia:color val="#000000ff"/> + </dia:attribute> + <dia:attribute name="line_colour"> + <dia:color val="#000000ff"/> + </dia:attribute> + <dia:attribute name="fill_colour"> + <dia:color val="#ffffffff"/> + </dia:attribute> + <dia:attribute name="line_width"> + <dia:real val="0.10000000000000001"/> + </dia:attribute> </dia:object> <dia:object type="Database - Reference" version="0" id="O14"> <dia:attribute name="obj_pos"> <dia:point val="-7.82083,-11.5667"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="-7.82083,-12.2167;-4.57083,-11.5667"/> + <dia:rectangle val="-7.87083,-12.2167;-4.52083,-11.5167"/> </dia:attribute> <dia:attribute name="meta"> <dia:composite type="dict"/> @@ -2444,10 +2670,10 @@ <dia:boolean val="false"/> </dia:attribute> <dia:attribute name="text_colour"> - <dia:color val="#000000"/> + <dia:color val="#000000ff"/> </dia:attribute> <dia:attribute name="line_colour"> - <dia:color val="#000000"/> + <dia:color val="#000000ff"/> </dia:attribute> <dia:attribute name="line_width"> <dia:real val="0.10000000000000001"/> @@ -2484,7 +2710,7 @@ <dia:point val="4.81417,-13.1667"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="4.81417,-13.8334;8.24583,-13.1667"/> + <dia:rectangle val="4.76417,-13.8334;8.29583,-13.1167"/> </dia:attribute> <dia:attribute name="meta"> <dia:composite type="dict"/> @@ -2504,10 +2730,10 @@ <dia:boolean val="false"/> </dia:attribute> <dia:attribute name="text_colour"> - <dia:color val="#000000"/> + <dia:color val="#000000ff"/> </dia:attribute> <dia:attribute name="line_colour"> - <dia:color val="#000000"/> + <dia:color val="#000000ff"/> </dia:attribute> <dia:attribute name="line_width"> <dia:real val="0.10000000000000001"/> @@ -2544,7 +2770,7 @@ <dia:point val="22.2508,-12.3834"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="22.2508,-13.0334;25.4792,-12.3834"/> + <dia:rectangle val="22.2008,-13.0334;25.5292,-12.3334"/> </dia:attribute> <dia:attribute name="meta"> <dia:composite type="dict"/> @@ -2564,10 +2790,10 @@ <dia:boolean val="false"/> </dia:attribute> <dia:attribute name="text_colour"> - <dia:color val="#000000"/> + <dia:color val="#000000ff"/> </dia:attribute> <dia:attribute name="line_colour"> - <dia:color val="#000000"/> + <dia:color val="#000000ff"/> </dia:attribute> <dia:attribute name="line_width"> <dia:real val="0.10000000000000001"/> @@ -2604,7 +2830,7 @@ <dia:point val="36.0192,-9.98336"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="36.0192,-10.6334;37.6193,-0.32919"/> + <dia:rectangle val="35.9692,-10.6334;37.6693,-0.27919"/> </dia:attribute> <dia:attribute name="meta"> <dia:composite type="dict"/> @@ -2624,10 +2850,10 @@ <dia:boolean val="false"/> </dia:attribute> <dia:attribute name="text_colour"> - <dia:color val="#000000"/> + <dia:color val="#000000ff"/> </dia:attribute> <dia:attribute name="line_colour"> - <dia:color val="#000000"/> + <dia:color val="#000000ff"/> </dia:attribute> <dia:attribute name="line_width"> <dia:real val="0.10000000000000001"/> @@ -2664,7 +2890,7 @@ <dia:point val="0.1125,-17.85"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="0.1125,-17.85;1.48167,-14.8667"/> + <dia:rectangle val="0.0625,-17.9;1.48167,-14.8167"/> </dia:attribute> <dia:attribute name="meta"> <dia:composite type="dict"/> @@ -2684,10 +2910,10 @@ <dia:boolean val="false"/> </dia:attribute> <dia:attribute name="text_colour"> - <dia:color val="#000000"/> + <dia:color val="#000000ff"/> </dia:attribute> <dia:attribute name="line_colour"> - <dia:color val="#000000"/> + <dia:color val="#000000ff"/> </dia:attribute> <dia:attribute name="line_width"> <dia:real val="0.10000000000000001"/> @@ -2724,7 +2950,7 @@ <dia:point val="-4.57083,-5.96669"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="-18.2307,-6.61669;-4.57083,-0.85002"/> + <dia:rectangle val="-18.2807,-6.61669;-4.52083,-0.80002"/> </dia:attribute> <dia:attribute name="meta"> <dia:composite type="dict"/> @@ -2744,10 +2970,10 @@ <dia:boolean val="false"/> </dia:attribute> <dia:attribute name="text_colour"> - <dia:color val="#000000"/> + <dia:color val="#000000ff"/> </dia:attribute> <dia:attribute name="line_colour"> - <dia:color val="#000000"/> + <dia:color val="#000000ff"/> </dia:attribute> <dia:attribute name="line_width"> <dia:real val="0.10000000000000001"/> @@ -2784,7 +3010,7 @@ <dia:point val="-5.9308,-0.85002"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="-5.9308,-1.50002;-2.65417,2.33331"/> + <dia:rectangle val="-5.9808,-1.50002;-2.60417,2.38331"/> </dia:attribute> <dia:attribute name="meta"> <dia:composite type="dict"/> @@ -2804,10 +3030,10 @@ <dia:boolean val="false"/> </dia:attribute> <dia:attribute name="text_colour"> - <dia:color val="#000000"/> + <dia:color val="#000000ff"/> </dia:attribute> <dia:attribute name="line_colour"> - <dia:color val="#000000"/> + <dia:color val="#000000ff"/> </dia:attribute> <dia:attribute name="line_width"> <dia:real val="0.10000000000000001"/> @@ -2844,7 +3070,7 @@ <dia:point val="12.5058,-0.06669"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="12.5058,-0.71669;15.2693,-0.0500233"/> + <dia:rectangle val="12.4558,-0.71669;15.3193,-2.33e-05"/> </dia:attribute> <dia:attribute name="meta"> <dia:composite type="dict"/> @@ -2864,10 +3090,10 @@ <dia:boolean val="false"/> </dia:attribute> <dia:attribute name="text_colour"> - <dia:color val="#000000"/> + <dia:color val="#000000ff"/> </dia:attribute> <dia:attribute name="line_colour"> - <dia:color val="#000000"/> + <dia:color val="#000000ff"/> </dia:attribute> <dia:attribute name="line_width"> <dia:real val="0.10000000000000001"/> @@ -2918,18 +3144,6 @@ <dia:attribute name="elem_height"> <dia:real val="3"/> </dia:attribute> - <dia:attribute name="text_colour"> - <dia:color val="#000000"/> - </dia:attribute> - <dia:attribute name="line_colour"> - <dia:color val="#000000"/> - </dia:attribute> - <dia:attribute name="fill_colour"> - <dia:color val="#ffffff"/> - </dia:attribute> - <dia:attribute name="line_width"> - <dia:real val="0.10000000000000001"/> - </dia:attribute> <dia:attribute name="name"> <dia:string>#PendingPatchSets#</dia:string> </dia:attribute> @@ -2939,33 +3153,15 @@ <dia:attribute name="visible_comment"> <dia:boolean val="false"/> </dia:attribute> - <dia:attribute name="tagging_comment"> + <dia:attribute name="underline_primary_key"> <dia:boolean val="false"/> </dia:attribute> - <dia:attribute name="underline_primary_key"> + <dia:attribute name="tagging_comment"> <dia:boolean val="false"/> </dia:attribute> <dia:attribute name="bold_primary_keys"> <dia:boolean val="true"/> </dia:attribute> - <dia:attribute name="normal_font"> - <dia:font family="monospace" style="0" name="Courier"/> - </dia:attribute> - <dia:attribute name="name_font"> - <dia:font family="sans" style="80" name="Helvetica-Bold"/> - </dia:attribute> - <dia:attribute name="comment_font"> - <dia:font family="sans" style="8" name="Helvetica-Oblique"/> - </dia:attribute> - <dia:attribute name="normal_font_height"> - <dia:real val="0.80000000000000004"/> - </dia:attribute> - <dia:attribute name="name_font_height"> - <dia:real val="0.99999999999999989"/> - </dia:attribute> - <dia:attribute name="comment_font_height"> - <dia:real val="0.69999999999999996"/> - </dia:attribute> <dia:attribute name="attributes"> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -2986,6 +3182,9 @@ <dia:attribute name="unique"> <dia:boolean val="true"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -3006,8 +3205,41 @@ <dia:attribute name="unique"> <dia:boolean val="true"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> </dia:attribute> + <dia:attribute name="normal_font"> + <dia:font family="monospace" style="0" name="Courier"/> + </dia:attribute> + <dia:attribute name="name_font"> + <dia:font family="sans" style="80" name="Helvetica-Bold"/> + </dia:attribute> + <dia:attribute name="comment_font"> + <dia:font family="sans" style="8" name="Helvetica-Oblique"/> + </dia:attribute> + <dia:attribute name="normal_font_height"> + <dia:real val="0.80000000000000004"/> + </dia:attribute> + <dia:attribute name="name_font_height"> + <dia:real val="0.99999999999999989"/> + </dia:attribute> + <dia:attribute name="comment_font_height"> + <dia:real val="0.69999999999999996"/> + </dia:attribute> + <dia:attribute name="text_colour"> + <dia:color val="#000000ff"/> + </dia:attribute> + <dia:attribute name="line_colour"> + <dia:color val="#000000ff"/> + </dia:attribute> + <dia:attribute name="fill_colour"> + <dia:color val="#ffffffff"/> + </dia:attribute> + <dia:attribute name="line_width"> + <dia:real val="0.10000000000000001"/> + </dia:attribute> </dia:object> </dia:layer> </dia:diagram> -- 2.15.1

1 1

[PATCH v2 1/4] krnl386.exe16: NE files which have an OS type of 0x00 (unknown) or linker
by Martin Payne 17 Dec '17

17 Dec '17

major version 4 must have their imported modules checked to determine whether they are Windows or OS/2 or Multitasking DOS 4 executables. Tested on Fedora 26 x86 --- dlls/krnl386.exe16/ne_module.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/dlls/krnl386.exe16/ne_module.c b/dlls/krnl386.exe16/ne_module.c index 14f8075166..e9009677d0 100644 --- a/dlls/krnl386.exe16/ne_module.c +++ b/dlls/krnl386.exe16/ne_module.c @@ -697,6 +697,46 @@ static HMODULE16 build_module( const void *mapping, SIZE_T mapping_size, LPCSTR ne_header->ne_enttab - ne_header->ne_imptab )) goto failed; pData += ne_header->ne_enttab - ne_header->ne_imptab; + /* If the linker version is 4.x or the executable type is unknown, it is necessary to check the import table for + known Windows and OS/2 libraries to determine whether it's a Windows executable. Executables with no module table + or which don't import known Windows or OS/2 libraries are also assumed to be Windows. */ + if (((ne_header->ne_ver == 0x04) || (ne_header->ne_exetyp == 0x00)) && pModule->ne_modtab) + { + /* Array of offsets into the imported names table where module names are located */ + WORD* module_table; + + /* Series of Pascal strings containing the module names */ + LPCSTR imported_names; + + int i; + BOOL importsDosCalls = FALSE; + BOOL importsKernel = FALSE; + + /* Get address of module table and imported names table from their offsets */ + module_table = (WORD*)(((BYTE*)pModule) + pModule->ne_modtab); + imported_names = (LPCSTR)(((BYTE*)pModule) + pModule->ne_imptab); + + /* Look for imports from DOSCALLS and KERNEL */ + for (i = 0; i < pModule->ne_cmod; i++) + { + /* Module name is a Pascal string with byte length prefix */ + LPCSTR module_name = imported_names + module_table[i]; + + if (!importsDosCalls && !strncmp("DOSCALLS", &module_name[1], module_name[0])) + importsDosCalls = TRUE; + + else if (!importsKernel && !strncmp("KERNEL", &module_name[1], module_name[0])) + importsKernel = TRUE; + + if (importsDosCalls && importsKernel) + break; + } + + /* If the module has imports from DOSCALLS but not KERNEL, assume it's for OS/2 or Multitasking DOS 4. */ + if (importsDosCalls && !importsKernel) + goto failed; + } + /* Load entry table, convert it to the optimized version used by Windows */ pModule->ne_enttab = pData - (BYTE *)pModule; -- 2.15.1.windows.2

3 6

[PATCH] krnl386.exe16: Improved support for early NE format executables.
by Martin Payne 15 Dec '17

15 Dec '17

* If OS type in NE header is 0x00 (unknown) or the linker version is 4.x, check for imports from DOSCALLS and KERNEL to distinguish between Windows and OS/2 or Multitasking DOS 4 executables. * Prevents DISCARDABLE segments from link4 4.x executables being loaded as 32 bit segments. * Assumes target Windows version is 1.01 if linker version is 4 or there is no expected version set in NE header. * Don't try to load NE files with OS type of Windows/386. Even Windows/386 doesn't recognise these as Windows executables. Tested on Fedora 26 x86 Signed-off-by: Martin Payne <development(a)martinpayne.me.uk> --- dlls/krnl386.exe16/ne_module.c | 70 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 66 insertions(+), 4 deletions(-) diff --git a/dlls/krnl386.exe16/ne_module.c b/dlls/krnl386.exe16/ne_module.c index 14f8075166..72043a90ff 100644 --- a/dlls/krnl386.exe16/ne_module.c +++ b/dlls/krnl386.exe16/ne_module.c @@ -597,11 +597,10 @@ static HMODULE16 build_module( const void *mapping, SIZE_T mapping_size, LPCSTR /* We now have a valid NE header */ - /* check to be able to fall back to loading OS/2 programs as DOS - * FIXME: should this check be reversed in order to be less strict? - * (only fail for OS/2 ne_exetyp 0x01 here?) */ + /* check to be able to fall back to loading OS/2 programs as DOS */ if ((ne_header->ne_exetyp != 0x02 /* Windows */) - && (ne_header->ne_exetyp != 0x04) /* Windows 386 */) + && (ne_header->ne_exetyp != 0x00 /* Unknown - possible early 1.x or 2.x app */) + && (ne_header->ne_ver == 0x04 /* link4 version 4.x has no ne_exetyp field - possible early 1.x app */)) return ERROR_BAD_FORMAT; size = sizeof(NE_MODULE) + @@ -649,6 +648,11 @@ static HMODULE16 build_module( const void *mapping, SIZE_T mapping_size, LPCSTR pModule->ne_flags &= ~(NE_FFLAGS_BUILTIN | NE_FFLAGS_WIN32); + /* The original NE spec (which link4 version 4.x follows) doesn't have an ne_expver field and reserves it for + future use. Other early executables have the version set to 0.0. Assume Windows 1.01 in either case. */ + if ((ne_header->ne_ver == 0x04) || (ne_header->ne_expver == 0x0000)) + pModule->ne_expver = 0x0101; + /* Get the segment table */ pModule->ne_segtab = pData - (BYTE *)pModule; @@ -658,6 +662,24 @@ static HMODULE16 build_module( const void *mapping, SIZE_T mapping_size, LPCSTR for (i = ne_header->ne_cseg; i > 0; i--, pSeg++) { memcpy( pData, pSeg, sizeof(*pSeg) ); + + /* The original NE spec (which link4 version 4.x follows) uses the top four bits of the segment flags to set a + discard priority (0 = not discardable, 15 = highest priority). Later specs repurpose the top three bits and + use a single bit for the discardable flag. The top three bits must be masked off and discardable flag set + appropriately, otherwise a discard priority could get misinterpreted as a 32 bit segment flag which results + in an application crash. */ + if (ne_header->ne_ver == 0x04) + { + WORD* seg_flags; + BOOL isDiscardable; + + seg_flags = (WORD*)(pData + FIELD_OFFSET(SEGTABLEENTRY, flags)); + isDiscardable = ((*seg_flags & 0xF000) > 0); + + if (isDiscardable) + *seg_flags = ((*seg_flags & 0x0FFF) | NE_SEGFLAGS_DISCARDABLE); + } + pData += sizeof(SEGTABLEENTRY); } @@ -697,6 +719,46 @@ static HMODULE16 build_module( const void *mapping, SIZE_T mapping_size, LPCSTR ne_header->ne_enttab - ne_header->ne_imptab )) goto failed; pData += ne_header->ne_enttab - ne_header->ne_imptab; + /* If the linker version is 4.x or the executable type is unknown, it is necessary to check the import table for + known Windows and OS/2 libraries to determine whether it's a Windows executable. Executables with no module table + or which don't import known Windows or OS/2 libraries are also assumed to be Windows. */ + if (((ne_header->ne_ver == 0x04) || (ne_header->ne_exetyp == 0x00)) && pModule->ne_modtab) + { + /* Array of offsets into the imported names table where module names are located */ + WORD* module_table; + + /* Series of Pascal strings containing the module names */ + LPCSTR imported_names; + + int i; + BOOL importsDosCalls = FALSE; + BOOL importsKernel = FALSE; + + /* Get address of module table and imported names table from their offsets */ + module_table = (WORD*)(((BYTE*)pModule) + pModule->ne_modtab); + imported_names = (LPCSTR)(((BYTE*)pModule) + pModule->ne_imptab); + + /* Look for imports from DOSCALLS and KERNEL */ + for (i = 0; i < pModule->ne_cmod; i++) + { + /* Module name is a Pascal string with byte length prefix */ + LPCSTR module_name = imported_names + module_table[i]; + + if (!importsDosCalls && !strncmp("DOSCALLS", &module_name[1], module_name[0])) + importsDosCalls = TRUE; + + else if (!importsKernel && !strncmp("KERNEL", &module_name[1], module_name[0])) + importsKernel = TRUE; + + if (importsDosCalls && importsKernel) + break; + } + + /* If the module has imports from DOSCALLS but not KERNEL, assume it's for OS/2 or Multitasking DOS 4. */ + if (importsDosCalls && !importsKernel) + goto failed; + } + /* Load entry table, convert it to the optimized version used by Windows */ pModule->ne_enttab = pData - (BYTE *)pModule; -- 2.15.1.windows.2

2 2

[v2 PATCH] d2d1/tests: A test to show that DC is validated on BindDC()
by Nikolay Sivov 15 Dec '17

15 Dec '17

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: change tracing format for color values. dlls/d2d1/tests/d2d1.c | 40 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 36 insertions(+), 4 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index af023a10d8..9bd9e2b19d 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -4813,7 +4813,7 @@ static void test_dc_target(void) ok(SUCCEEDED(hr), "EndDraw() failed, hr %#x.\n", hr); clr = GetPixel(hdc, 0, 0); - ok(clr == RGB(255, 0, 0), "Got color %#x\n", clr); + ok(clr == RGB(255, 0, 0), "Unexpected color 0x%08x.\n", clr); hdc2 = CreateCompatibleDC(NULL); ok(hdc2 != NULL, "Failed to create an HDC.\n"); @@ -4824,7 +4824,7 @@ static void test_dc_target(void) ok(hr == S_OK, "BindDC() returned %#x.\n", hr); clr = GetPixel(hdc2, 0, 0); - ok(clr == 0, "Got color %#x\n", clr); + ok(clr == 0, "Unexpected color 0x%08x.\n", clr); set_color(&color, 0.0f, 1.0f, 0.0f, 1.0f); hr = ID2D1DCRenderTarget_CreateSolidColorBrush(rt, &color, NULL, &brush); @@ -4843,10 +4843,42 @@ static void test_dc_target(void) ID2D1SolidColorBrush_Release(brush); clr = GetPixel(hdc2, 0, 0); - ok(clr == RGB(0, 255, 0), "Got color %#x\n", clr); + ok(clr == RGB(0, 255, 0), "Unexpected color 0x%08x.\n", clr); clr = GetPixel(hdc2, 10, 0); - ok(clr == 0, "Got color %#x\n", clr); + ok(clr == 0, "Unexpected color 0x%08x.\n", clr); + + /* Invalid DC. */ + hr = ID2D1DCRenderTarget_BindDC(rt, (HDC)0xdeadbeef, &rect); +todo_wine + ok(hr == E_INVALIDARG, "BindDC() returned %#x.\n", hr); + + ID2D1DCRenderTarget_BeginDraw(rt); + + set_color(&color, 1.0f, 0.0f, 0.0f, 1.0f); + ID2D1DCRenderTarget_Clear(rt, &color); + + hr = ID2D1DCRenderTarget_EndDraw(rt, NULL, NULL); + ok(SUCCEEDED(hr), "EndDraw() failed, hr %#x.\n", hr); + + clr = GetPixel(hdc2, 0, 0); +todo_wine + ok(clr == RGB(255, 0, 0), "Unexpected color 0x%08x.\n", clr); + + hr = ID2D1DCRenderTarget_BindDC(rt, NULL, &rect); + ok(hr == E_INVALIDARG, "BindDC() returned %#x.\n", hr); + + ID2D1DCRenderTarget_BeginDraw(rt); + + set_color(&color, 0.0f, 0.0f, 1.0f, 1.0f); + ID2D1DCRenderTarget_Clear(rt, &color); + + hr = ID2D1DCRenderTarget_EndDraw(rt, NULL, NULL); + ok(SUCCEEDED(hr), "EndDraw() failed, hr %#x.\n", hr); + + clr = GetPixel(hdc2, 0, 0); +todo_wine + ok(clr == RGB(0, 0, 255), "Unexpected color 0x%08x.\n", clr); DeleteDC(hdc); DeleteDC(hdc2); -- 2.15.1

2 1

[website] German translation for release 3.0-rc1
by Julian Rüger 15 Dec '17

15 Dec '17

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 2.22
by Julian Rüger 15 Dec '17

15 Dec '17

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[PATCH] d2d1/tests: A test to show that DC is validate on BindDC()
by Nikolay Sivov 15 Dec '17

15 Dec '17

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/tests/d2d1.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index af023a10d8..7de9d4abfe 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -4848,6 +4848,38 @@ static void test_dc_target(void) clr = GetPixel(hdc2, 10, 0); ok(clr == 0, "Got color %#x\n", clr); + /* Invalid DC. */ + hr = ID2D1DCRenderTarget_BindDC(rt, (HDC)0xdeadbeef, &rect); +todo_wine + ok(hr == E_INVALIDARG, "BindDC() returned %#x.\n", hr); + + ID2D1DCRenderTarget_BeginDraw(rt); + + set_color(&color, 1.0f, 0.0f, 0.0f, 1.0f); + ID2D1DCRenderTarget_Clear(rt, &color); + + hr = ID2D1DCRenderTarget_EndDraw(rt, NULL, NULL); + ok(SUCCEEDED(hr), "EndDraw() failed, hr %#x.\n", hr); + + clr = GetPixel(hdc2, 0, 0); +todo_wine + ok(clr == RGB(255, 0, 0), "Got color %#x\n", clr); + + hr = ID2D1DCRenderTarget_BindDC(rt, NULL, &rect); + ok(hr == E_INVALIDARG, "BindDC() returned %#x.\n", hr); + + ID2D1DCRenderTarget_BeginDraw(rt); + + set_color(&color, 0.0f, 0.0f, 1.0f, 1.0f); + ID2D1DCRenderTarget_Clear(rt, &color); + + hr = ID2D1DCRenderTarget_EndDraw(rt, NULL, NULL); + ok(SUCCEEDED(hr), "EndDraw() failed, hr %#x.\n", hr); + + clr = GetPixel(hdc2, 0, 0); +todo_wine + ok(clr == RGB(0, 0, 255), "Got color %#x\n", clr); + DeleteDC(hdc); DeleteDC(hdc2); ID2D1DCRenderTarget_Release(rt); -- 2.15.1

2 1

[PATCH] po: Update German translation.
by Julian Rüger 15 Dec '17

15 Dec '17

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[PATCH vkd3d 1/4] libs/vkd3d-shader: Fix result type for OpImageSampleDref instructions.
by Józef Kucia 15 Dec '17

15 Dec '17

From: Józef Kucia <jkucia(a)codeweavers.com> Per the SPIR-V spec: "Result Type must be a scalar of integer type or floating-point type." Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index e749873f663b..6fd198b4883d 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2616,6 +2616,25 @@ static void vkd3d_dxbc_compiler_emit_store_dst_components(struct vkd3d_dxbc_comp vkd3d_dxbc_compiler_emit_store_dst(compiler, dst, val_id); } +static void vkd3d_dxbc_compiler_emit_store_dst_scalar(struct vkd3d_dxbc_compiler *compiler, + const struct vkd3d_shader_dst_param *dst, uint32_t val_id, + enum vkd3d_component_type component_type, DWORD swizzle) +{ + unsigned int component_count = vkd3d_write_mask_component_count(dst->write_mask); + uint32_t component_ids[VKD3D_VEC4_SIZE]; + unsigned int component_idx, i; + + component_idx = vkd3d_write_mask_get_component_idx(dst->write_mask); + for (i = 0; i < component_count; ++i) + { + if (vkd3d_swizzle_get_component(swizzle, component_idx + i)) + ERR("Invalid swizzle %#x for scalar value, write mask %#x.\n", swizzle, dst->write_mask); + + component_ids[i] = val_id; + } + vkd3d_dxbc_compiler_emit_store_dst_components(compiler, dst, component_type, component_ids); +} + static void vkd3d_dxbc_compiler_decorate_builtin(struct vkd3d_dxbc_compiler *compiler, uint32_t target_id, SpvBuiltIn builtin) { @@ -4641,7 +4660,7 @@ static void vkd3d_dxbc_compiler_emit_sample_c(struct vkd3d_dxbc_compiler *compil vkd3d_dxbc_compiler_prepare_sampled_image(compiler, &image, &src[1].reg, &src[2].reg, VKD3D_IMAGE_FLAG_DEPTH); - sampled_type_id = vkd3d_spirv_get_type_id(builder, image.sampled_type, VKD3D_VEC4_SIZE); + sampled_type_id = vkd3d_spirv_get_type_id(builder, image.sampled_type, 1); coordinate_id = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[0], VKD3DSP_WRITEMASK_ALL); ref_id = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[3], VKD3DSP_WRITEMASK_0); /* XXX: Nvidia is broken and expects that the D_ref is packed together with coordinates. */ @@ -4652,7 +4671,7 @@ static void vkd3d_dxbc_compiler_emit_sample_c(struct vkd3d_dxbc_compiler *compil image.sampled_image_id, coordinate_id, ref_id, operands_mask, image_operands, image_operand_count); - vkd3d_dxbc_compiler_emit_store_dst_swizzled(compiler, + vkd3d_dxbc_compiler_emit_store_dst_scalar(compiler, dst, val_id, image.sampled_type, src[1].swizzle); } -- 2.13.6

3 8

[PATCH] po: Update Ukrainian translation.
by Andrey Gusev 15 Dec '17

15 Dec '17

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- po/uk.po | 172 +++++++++++++++------------------------------------------------ 1 file changed, 39 insertions(+), 133 deletions(-) diff --git a/po/uk.po b/po/uk.po index b496a3507c..5a8a9dc0a6 100644 --- a/po/uk.po +++ b/po/uk.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-07-05 17:28+0200\n" +"PO-Revision-Date: 2017-12-15 16:20+0200\n" "Last-Translator: Andrey Gusev <andrey.goosev(a)gmail.com>\n" "Language-Team: Ukrainian\n" "Language: uk\n" @@ -7299,19 +7299,19 @@ msgstr "Ключ: [1], Ім'я: [2], Значення: [3]" #: msi.rc:71 msgid "{{Fatal error: }}" -msgstr "" +msgstr "{{Критична помилка: }}" #: msi.rc:72 msgid "{{Error [1]. }}" -msgstr "" +msgstr "{{Помилка [1]. }}" #: msi.rc:73 msgid "Warning [1]." -msgstr "" +msgstr "Попередження [1]." #: msi.rc:74 msgid "Info [1]." -msgstr "Info [1]." +msgstr "Інфо [1]." #: msi.rc:75 msgid "" @@ -7319,6 +7319,9 @@ msgid "" "This may indicate a problem with this package. The error code is [1]. {{The " "arguments are: [2], [3], [4]}}" msgstr "" +"Встановлювач виявив несподівану помилку під час встановлення цього пакета. " +"Це може свідчити про проблему з цим пакетом. Код помилки [1]. {{Аргументи: " +"[2], [3], [4]}}" #: msi.rc:76 msgid "{{Disk full: }}" @@ -7346,13 +7349,15 @@ msgstr "Дія завершилася [Time]: [1]. Повернене значе #: msi.rc:83 msgid "Please insert the disk: [2]" -msgstr "" +msgstr "Будь ласка, вставте диск: [2]" #: msi.rc:84 msgid "" "Source file not found{{(cabinet)}}: [2]. Verify that the file exists and " "that you can access it." msgstr "" +"Вихідний файл не знайдено{{(cabinet)}}: [2]. Переконайтеся, що файл існує " +"і ви маєте до нього доступ." #: msrle32.rc:31 msgid "Wine MS-RLE video codec" @@ -8997,10 +9002,8 @@ msgid " sec" msgstr " сек" #: twain.rc:29 -#, fuzzy -#| msgid "New Folder" msgid "Select Source" -msgstr "Нова Тека" +msgstr "Виберіть джерело" #: urlmon.rc:32 wininet.rc:77 msgid "Security Warning" @@ -10664,6 +10667,16 @@ msgid "" "link_name is the name of the new symbolic link.\n" "target is the path that link_name points to.\n" msgstr "" +"Створити символьне посилання.\n" +"\n" +"Синтаксис: MKLINK [опції] ім'я_посилання ціль\n" +"\n" +"Опції:\n" +"/d Створити символьне посилання каталогу.\n" +"/h Створити жорстке посилання.\n" +"/j Створити каталог з'єднання.\n" +"ім'я_посилання - це назва нового символьного посилання.\n" +"ім'я_посилання вказує на шлях цілі.\n" #: cmd.rc:312 msgid "" @@ -10674,47 +10687,6 @@ msgstr "" "системи чи оболонки, з якої ви запустили cmd.\n" #: cmd.rc:364 -#, fuzzy -#| msgid "" -#| "CMD built-in commands are:\n" -#| "ASSOC\t\tShow or modify file extension associations\n" -#| "ATTRIB\t\tShow or change DOS file attributes\n" -#| "CALL\t\tInvoke a batch file from inside another\n" -#| "CD (CHDIR)\tChange current default directory\n" -#| "CHOICE\t\tWait for an keypress from a selectable list\n" -#| "CLS\t\tClear the console screen\n" -#| "COPY\t\tCopy file\n" -#| "CTTY\t\tChange input/output device\n" -#| "DATE\t\tShow or change the system date\n" -#| "DEL (ERASE)\tDelete a file or set of files\n" -#| "DIR\t\tList the contents of a directory\n" -#| "ECHO\t\tCopy text directly to the console output\n" -#| "ENDLOCAL\tEnd localization of environment changes in a batch file\n" -#| "FTYPE\t\tShow or modify open commands associated with file types\n" -#| "HELP\t\tShow brief help details on a topic\n" -#| "MD (MKDIR)\tCreate a subdirectory\n" -#| "MORE\t\tDisplay output in pages\n" -#| "MOVE\t\tMove a file, set of files or directory tree\n" -#| "PATH\t\tSet or show the search path\n" -#| "PAUSE\t\tSuspend execution of a batch file\n" -#| "POPD\t\tRestore the directory to the last one saved with PUSHD\n" -#| "PROMPT\t\tChange the command prompt\n" -#| "PUSHD\t\tChange to a new directory, saving the current one\n" -#| "REN (RENAME)\tRename a file\n" -#| "RD (RMDIR)\tDelete a subdirectory\n" -#| "SET\t\tSet or show environment variables\n" -#| "SETLOCAL\tStart localization of environment changes in a batch file\n" -#| "START\t\tStart a program, or open a document in the associated program\n" -#| "TIME\t\tSet or show the current system time\n" -#| "TITLE\t\tSet the window title for the CMD session\n" -#| "TYPE\t\tType the contents of a text file\n" -#| "VER\t\tShow the current version of CMD\n" -#| "VOL\t\tShow the volume label of a disk device\n" -#| "XCOPY\t\tCopy source files or directory trees to a destination\n" -#| "EXIT\t\tClose down CMD\n" -#| "\n" -#| "Enter HELP <command> for further information on any of the above " -#| "commands.\n" msgid "" "CMD built-in commands are:\n" "ASSOC\t\tShow or modify file extension associations\n" @@ -10773,6 +10745,7 @@ msgstr "" "FTYPE\t\tПоказ та зміна команд відкриття, асоційованих з типами файлів\n" "HELP\t\tПоказ короткої довідкової інформації про команду\n" "MD (MKDIR)\tСтворення підтеки\n" +"MKLINK\tСтворення символьного посилання\n" "MORE\t\tВідображення виводу сторінками\n" "MOVE\t\tПереміщення файлу, набору файлів чи дерева каталогів\n" "PATH\t\tЗадання чи відображення шляху пошуку\n" @@ -12127,17 +12100,6 @@ msgid "Icons (*.ico)" msgstr "Значки (*.ico)" #: reg.rc:35 -#, fuzzy -#| msgid "" -#| "Usage:\n" -#| " REG [operation] [parameters]\n" -#| "\n" -#| "Supported operations:\n" -#| " ADD | DELETE | QUERY\n" -#| "\n" -#| "For help on a specific operation, type:\n" -#| " REG [operation] /?\n" -#| "\n" msgid "" "Usage:\n" " REG [operation] [parameters]\n" @@ -12153,7 +12115,7 @@ msgstr "" " REG [операція] [параметри]\n" "\n" "Підтримувані операції:\n" -" ADD | DELETE | QUERY\n" +" ADD | DELETE | IMPORT | EXPORT | QUERY\n" "\n" "Для довідки по конкретній операції, введіть:\n" " REG [операція] /?\n" @@ -12283,43 +12245,31 @@ msgstr "(значення не задане)" #: reg.rc:66 msgid "REG IMPORT file.reg\n" -msgstr "" +msgstr "REG IMPORT file.reg\n" #: reg.rc:67 -#, fuzzy -#| msgid "regedit: The file '%1' was not found.\n" msgid "reg: The file '%1' was not found.\n" -msgstr "regedit: Файл '%1' не знайдено.\n" +msgstr "reg: Файл '%1' не знайдено.\n" #: reg.rc:68 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "reg: Unable to open the registry key '%1'.\n" -msgstr "regedit: Неможливо відкрити ключ '%1'.\n" +msgstr "reg: Неможливо відкрити ключ реєстру '%1'.\n" #: reg.rc:69 -#, fuzzy -#| msgid "regedit: Unrecognized escape sequence [\\%1!c!]\n" msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" -msgstr "regedit: Нерозпізнана послідовність [\\%1!c!]\n" +msgstr "reg: Нерозпізнана керівна послідовність [\\%1!c!]\n" #: reg.rc:70 -#, fuzzy -#| msgid "REG QUERY key_name [/v value_name | /ve] [/s]\n" msgid "REG EXPORT key_name file.reg [/y]\n" -msgstr "REG QUERY <ключ> [/v <параметр> | /ve] [/s]\n" +msgstr "REG EXPORT ім'я_ключа file.reg [/y]\n" #: reg.rc:71 -#, fuzzy -#| msgid "reg: Invalid key name\n" msgid "reg: Invalid system key [%1]\n" -msgstr "reg: невірне ім'я ключа\n" +msgstr "reg: Невірний системний ключ [%1]\n" #: reg.rc:72 -#, fuzzy -#| msgid "The registry value '%1' already exists. Do you want to overwrite it?" msgid "The file '%1' already exists. Do you want to overwrite it?" -msgstr "Значення реєстру '%1' вже існує. Ви хочете його замінити?" +msgstr "Файл '%1' вже існує. Ви хочете його перезаписати?" #: regedit.rc:34 msgid "&Registry" @@ -12391,7 +12341,7 @@ msgstr "&Про Редактор реєстру" #: regedit.rc:89 regedit.rc:96 regedit.rc:230 msgid "Expand" -msgstr "" +msgstr "Розгорнути" #: regedit.rc:134 regedit.rc:233 msgid "Modify &Binary Data..." @@ -12585,38 +12535,6 @@ msgid "Unable to import %1. The specified file is not a valid registry file." msgstr "Неможливо імпортувати '%1'. Вказаний файл не є файлом реєстру." #: regedit.rc:408 -#, fuzzy -#| msgid "" -#| "Usage:\n" -#| " regedit [options] [filename] [reg_key]\n" -#| "\n" -#| "Options:\n" -#| " [no option] Launch the graphical version of this program.\n" -#| " /L:system.dat The location of the system.dat file to be modified.\n" -#| " Compatible with any other switch. Ignored.\n" -#| " /R:user.dat The location of the user.dat file to be modified.\n" -#| " Compatible with any other switch. Ignored.\n" -#| " /C Import the contents of a registry file.\n" -#| " /D Delete a specified registry key.\n" -#| " /E Export the contents of a specified registry key to a " -#| "file.\n" -#| " If no key is specified, the entire registry is " -#| "exported.\n" -#| " /S Silent mode. No messages will be displayed.\n" -#| " /V Launch the GUI in advanced mode. Ignored.\n" -#| " /? Display this information and exit.\n" -#| " [filename] The location of the file containing registry information " -#| "to\n" -#| " be imported. When used with [/E], this option specifies " -#| "the\n" -#| " file location where registry information will be " -#| "exported.\n" -#| " [reg_key] The registry key to be modified.\n" -#| "\n" -#| "Usage examples:\n" -#| " regedit \"import.reg\"\n" -#| " regedit /E \"export.reg\" \"HKEY_CURRENT_USER\\Console\"\n" -#| " regedit /D \"HKEY_LOCAL_MACHINE\\Error\\Path\"\n" msgid "" "Usage:\n" " regedit [options] [filename] [reg_key]\n" @@ -12671,7 +12589,7 @@ msgstr "" "Приклади використання:\n" " regedit \"import.reg\"\n" " regedit /E \"export.reg\" \"HKEY_CURRENT_USER\\Console\"\n" -" regedit /D \"HKEY_LOCAL_MACHINE\\Error\\Path\"\n" +" regedit /D \"HKEY_LOCAL_MACHINE\\Key\\Path\"\n" #: regedit.rc:409 msgid "regedit: Invalid or unrecognized switch [%1]\n" @@ -12742,11 +12660,9 @@ msgid "regedit: Unable to open the registry key '%1'.\n" msgstr "regedit: Неможливо відкрити ключ '%1'.\n" #: regedit.rc:425 -#, fuzzy -#| msgid "regedit: Unsupported registry data type [%1] encountered in '%2'.\n" msgid "" "regedit: Unsupported registry data type [0x%1!x!] encountered in '%2'.\n" -msgstr "regedit: '%2' містить непідтримуваний тип даних [%1].\n" +msgstr "regedit: '%2' містить непідтримуваний тип даних [0x%1!x!].\n" #: regedit.rc:426 msgid "regedit: The registry value '%1' will be exported as binary data.\n" @@ -12754,10 +12670,8 @@ msgstr "" "regedit: Значення реєстру '%1' буде експортоване у двійковому вигляді.\n" #: regedit.rc:427 -#, fuzzy -#| msgid "reg: Invalid key name\n" msgid "regedit: Invalid system key [%1]\n" -msgstr "reg: невірне ім'я ключа\n" +msgstr "regedit: Невірне ім'я ключа [%1]\n" #: regedit.rc:428 msgid "" @@ -12766,10 +12680,8 @@ msgstr "" "regedit: Неможливо експортувати '%1'. Вказаний ключ не був знайдений.\n" #: regedit.rc:429 -#, fuzzy -#| msgid "regedit: Unable to delete the registry class '%1'.\n" msgid "regedit: Unable to delete the registry key '%1'.\n" -msgstr "regedit: Неможливо видалити клас реєстру '%1'.\n" +msgstr "regedit: Неможливо видалити ключ реєстру '%1'.\n" #: regedit.rc:431 msgid "regedit: The line contains invalid syntax.\n" @@ -12916,24 +12828,18 @@ msgid "Confirm Key Delete" msgstr "Підтвердження видалення ключа" #: regedit.rc:213 -#, fuzzy -#| msgid "" -#| "Are you sure you want to delete the registry key '%1' and all of its " -#| "subkeys?" msgid "" "Are you sure you want to delete this registry key and all of its subkeys?" msgstr "" -"Ви впевнені, що хочете видалити ключ реєстру '%1' та всі його підрозділи?" +"Ви впевнені, що хочете видалити цей ключ реєстру та всі його підрозділи?" #: regedit.rc:199 msgid "Expands or collapses the selected node" msgstr "Розгортає або згортає вибраний розділ" #: regedit.rc:231 -#, fuzzy -#| msgid "C&ollate" msgid "Collapse" -msgstr "&Розбити" +msgstr "Згорнути" #: regsvr32.rc:32 msgid "" @@ -15157,7 +15063,7 @@ msgstr "Мін" #: winemine.rc:34 msgid "All results will be lost. Are you sure?" -msgstr "" +msgstr "Всі результати будуть втрачені. Ви впевнені?" #: winemine.rc:30 msgid "WineMine" -- 2.13.6

1 0

[PATCH] kernelbase: Quiet a noisy fixme in QuirkIsEnabled3
by Louis Lenders 15 Dec '17

15 Dec '17

This one spams the console while running several .Net programs

1 0

[PATCH] testbot/web: Remove an unnecessary WineTestBot::Config prefix.
by Francois Gouget 15 Dec '17

15 Dec '17

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/index.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/web/index.pl b/testbot/web/index.pl index b0c2d450..deacf909 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -277,7 +277,7 @@ sub GenerateBody($) my $JobsCollectionBlock = new JobStatusBlock($Jobs, $self); $JobsCollectionBlock->GenerateList(); - if ($WineTestBot::Config::JobArchiveDays != 0) + if ($JobArchiveDays != 0) { my $PropertyDescriptor = $Jobs->GetPropertyDescriptorByName('Id'); my $MaxIdLength = $PropertyDescriptor->GetMaxLength(); -- 2.15.1

1 0

[PATCH] testbot/Engine: Fix handling of --kill-vms.
by Francois Gouget 15 Dec '17

15 Dec '17

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/Engine.pl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index dfe266f1..7dab98e6 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -207,6 +207,12 @@ sub Cleanup($;$$) $VM->RunPowerOff(); } } + # $KillVMs is normally used on shutdown so don't start a process that + # will get stuck 'forever' waiting for an offline VM. + elsif ($KillVMs and $VM->Status !~ /^(?:off|offline)$/) + { + $VM->RunPowerOff(); + } } } -- 2.15.1

1 0

[PATCH] testbot/Engine: Don't override $MaxVMsWhenIdle == 0.
by Francois Gouget 15 Dec '17

15 Dec '17

It should only be set to the default if left undefined. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/Engine.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index ad492f61..dfe266f1 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -714,7 +714,7 @@ sub main() $MaxRevertsWhileRunningVMs = $MaxRevertingVMs; LogMsg "Capping MaxRevertsWhileRunningVMs to MaxRevertingVMs ($MaxRevertsWhileRunningVMs)\n"; } - $MaxVMsWhenIdle ||= $MaxActiveVMs; + $MaxVMsWhenIdle = $MaxActiveVMs if (!defined $MaxVMsWhenIdle); Cleanup(1); # Check for patches that arrived while the server was off. -- 2.15.1

1 0

[PATCH] testbot: Set $MaxRevertsWhileRunningVMs = 0 in the default configuration.
by Francois Gouget 15 Dec '17

15 Dec '17

It's the safe option as it ensure the revert will not interfere with the tests. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- It's also what we use on the TestBot (I think). testbot/lib/WineTestBot/Config.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index b0492a39..8388a0ed 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -67,7 +67,7 @@ $BinDir = "$::RootDir/bin"; # See the ScheduleOnHost() documentation in lib/WineTestBot/Jobs.pm $MaxRevertingVMs = 1; -$MaxRevertsWhileRunningVMs = 1; +$MaxRevertsWhileRunningVMs = 0; $MaxActiveVMs = 2; $MaxVMsWhenIdle = undef; -- 2.15.1

1 0

[PATCH] testbot/web: Document that the Redirect() calls don't return.
by Francois Gouget 15 Dec '17

15 Dec '17

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/ItemPage.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/ObjectModel/CGI/ItemPage.pm b/testbot/lib/ObjectModel/CGI/ItemPage.pm index 9d1525d1..a07f02be 100644 --- a/testbot/lib/ObjectModel/CGI/ItemPage.pm +++ b/testbot/lib/ObjectModel/CGI/ItemPage.pm @@ -171,7 +171,7 @@ sub RedirectToList($) "=" . url_escape($MasterColValues->[$ColIndex]); } } - $self->Redirect($Target); + $self->Redirect($Target); # does not return } 1; -- 2.15.1

1 0

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-devel