Ros-diffs December 2015

ros-diffs@reactos.org

12 participants
252 discussions

[akhaldi] 70297: [NETAPI32_WINETEST] Remove a meaningless line.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Dec 8 11:06:25 2015 New Revision: 70297 URL: http://svn.reactos.org/svn/reactos?rev=70297&view=rev Log: [NETAPI32_WINETEST] Remove a meaningless line. Modified: trunk/rostests/winetests/netapi32/CMakeLists.txt Modified: trunk/rostests/winetests/netapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/netapi32/CMakeL… ============================================================================== --- trunk/rostests/winetests/netapi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/netapi32/CMakeLists.txt [iso-8859-1] Tue Dec 8 11:06:25 2015 @@ -7,7 +7,6 @@ testlist.c) add_executable(netapi32_winetest ${SOURCE}) -target_link_libraries(netapi32_winetest) set_module_type(netapi32_winetest win32cui) add_importlibs(netapi32_winetest advapi32 msvcrt kernel32) add_cd_file(TARGET netapi32_winetest DESTINATION reactos/bin FOR all)

9 years

[akhaldi] 70296: [BROWSEUI_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Dec 8 10:49:38 2015 New Revision: 70296 URL: http://svn.reactos.org/svn/reactos?rev=70296&view=rev Log: [BROWSEUI_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/rostests/winetests/browseui/autocomplete.c Modified: trunk/rostests/winetests/browseui/autocomplete.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/browseui/autoco… ============================================================================== --- trunk/rostests/winetests/browseui/autocomplete.c [iso-8859-1] (original) +++ trunk/rostests/winetests/browseui/autocomplete.c [iso-8859-1] Tue Dec 8 10:49:38 2015 @@ -368,9 +368,37 @@ CoTaskMemFree(acl2); } +static void test_ACListISF(void) +{ + IEnumString *enumstring; + IACList *list, *list2; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_ACListISF, NULL, CLSCTX_INPROC, &IID_IACList, (void**)&list); + ok(hr == S_OK, "failed to create ACListISF instance, 0x%08x\n", hr); + + hr = IACList_QueryInterface(list, &IID_IEnumString, (void**)&enumstring); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IEnumString_QueryInterface(enumstring, &IID_IACList, (void**)&list2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(list == list2, "got %p, %p\n", list, list2); + IACList_Release(list2); + + IEnumString_Release(enumstring); + IACList_Release(list); +} + START_TEST(autocomplete) { CoInitialize(NULL); + test_ACLMulti(); + + if (!winetest_interactive) + skip("ROSTESTS-210: Skipping test_ACListISF().\n"); + else + test_ACListISF(); + CoUninitialize(); }

9 years

[akhaldi] 70295: [SHELL32_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Dec 8 10:33:14 2015 New Revision: 70295 URL: http://svn.reactos.org/svn/reactos?rev=70295&view=rev Log: [SHELL32_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/rostests/winetests/shell32/appbar.c trunk/rostests/winetests/shell32/assoc.c trunk/rostests/winetests/shell32/ebrowser.c trunk/rostests/winetests/shell32/progman_dde.c trunk/rostests/winetests/shell32/shelldispatch.c trunk/rostests/winetests/shell32/shelllink.c trunk/rostests/winetests/shell32/shellole.c trunk/rostests/winetests/shell32/shellpath.c trunk/rostests/winetests/shell32/shlexec.c trunk/rostests/winetests/shell32/shlfileop.c trunk/rostests/winetests/shell32/shlfolder.c trunk/rostests/winetests/shell32/string.c trunk/rostests/winetests/shell32/systray.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/winetests/shell32/appbar.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/appbar.… Modified: trunk/rostests/winetests/shell32/assoc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/assoc.c… Modified: trunk/rostests/winetests/shell32/ebrowser.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/ebrowse… Modified: trunk/rostests/winetests/shell32/progman_dde.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/progman… Modified: trunk/rostests/winetests/shell32/shelldispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shelldi… Modified: trunk/rostests/winetests/shell32/shelllink.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shellli… Modified: trunk/rostests/winetests/shell32/shellole.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shellol… Modified: trunk/rostests/winetests/shell32/shellpath.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shellpa… Modified: trunk/rostests/winetests/shell32/shlexec.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shlexec… Modified: trunk/rostests/winetests/shell32/shlfileop.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shlfile… Modified: trunk/rostests/winetests/shell32/shlfolder.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shlfold… Modified: trunk/rostests/winetests/shell32/string.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/string.… Modified: trunk/rostests/winetests/shell32/systray.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/systray…

9 years

[akhaldi] 70294: [MMDEVAPI_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Dec 8 10:24:11 2015 New Revision: 70294 URL: http://svn.reactos.org/svn/reactos?rev=70294&view=rev Log: [MMDEVAPI_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/rostests/winetests/mmdevapi/capture.c trunk/rostests/winetests/mmdevapi/render.c Modified: trunk/rostests/winetests/mmdevapi/capture.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mmdevapi/captur… ============================================================================== --- trunk/rostests/winetests/mmdevapi/capture.c [iso-8859-1] (original) +++ trunk/rostests/winetests/mmdevapi/capture.c [iso-8859-1] Tue Dec 8 10:24:11 2015 @@ -38,6 +38,9 @@ #define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER) +/* undocumented error code */ +#define D3D11_ERROR_4E MAKE_HRESULT(SEVERITY_ERROR, FACILITY_DIRECT3D11, 0x4e) + static IMMDevice *dev = NULL; static const LARGE_INTEGER ullZero; @@ -83,7 +86,7 @@ HRESULT hr; UINT32 frames, next, pad, sum = 0; BYTE *data; - DWORD flags, r; + DWORD flags; UINT64 pos, qpc; REFERENCE_TIME period; @@ -241,7 +244,11 @@ ok(hr == S_OK, "Valid IAudioCaptureClient_GetBuffer returns %08x\n", hr); ok(frames2 == frames, "GetBuffer after ReleaseBuffer(0) %u/%u\n", frames2, frames); ok(pos2 == pos, "Position after ReleaseBuffer(0) %u/%u\n", (UINT)pos2, (UINT)pos); - todo_wine ok(qpc2 == qpc, "HPC after ReleaseBuffer(0) %u vs. %u\n", (UINT)qpc2, (UINT)qpc); + if(qpc2 != qpc) + /* FIXME: Some drivers fail */ + todo_wine ok(qpc2 == qpc, "HPC after ReleaseBuffer(0) %u vs. %u\n", (UINT)qpc2, (UINT)qpc); + else + ok(qpc2 == qpc, "HPC after ReleaseBuffer(0) %u vs. %u\n", (UINT)qpc2, (UINT)qpc); } /* trace after the GCP test because log output to MS-DOS console disturbs timing */ @@ -304,14 +311,23 @@ if(hr == S_OK){ /* The discontinuity is reported here, but is this an old or new packet? */ - todo_wine ok(flags & AUDCLNT_BUFFERFLAGS_DATA_DISCONTINUITY, "expect DISCONTINUITY %x\n", flags); + if(!(flags & AUDCLNT_BUFFERFLAGS_DATA_DISCONTINUITY)){ + /* FIXME: Some drivers fail */ + todo_wine ok(flags & AUDCLNT_BUFFERFLAGS_DATA_DISCONTINUITY, "expect DISCONTINUITY %x\n", flags); + todo_wine ok(pos == sum + frames, "Position %u gap %d\n", + (UINT)pos, (UINT)pos - sum); + }else{ + ok(flags & AUDCLNT_BUFFERFLAGS_DATA_DISCONTINUITY, "expect DISCONTINUITY %x\n", flags); + + /* Native's position is one period further than what we read. + * Perhaps that's precisely the meaning of DATA_DISCONTINUITY: + * signal when the position jump left a gap. */ + ok(pos == sum + frames, "Position %u gap %d\n", + (UINT)pos, (UINT)pos - sum); + } + ok(pad == next, "GCP %u vs. BufferSize %u\n", (UINT32)pad, next); - /* Native's position is one period further than what we read. - * Perhaps that's precisely the meaning of DATA_DISCONTINUITY: - * signal when the position jump left a gap. */ - todo_wine ok(pos == sum + frames, "Position %u gap %d\n", - (UINT)pos, (UINT)pos - sum); if(flags & AUDCLNT_BUFFERFLAGS_DATA_DISCONTINUITY) sum = pos; } @@ -416,32 +432,6 @@ ok(pos >= sum, "Position %u gap %d\n", (UINT)pos, (UINT)pos - sum); IAudioCaptureClient_ReleaseBuffer(acc, frames); } - - hr = IAudioClient_Stop(ac); - ok(hr == S_OK, "Stop failed: %08x\n", hr); - - ok(ResetEvent(handle), "ResetEvent\n"); - - /* Still receiving events! */ - r = WaitForSingleObject(handle, 20); - ok(r == WAIT_OBJECT_0, "Wait(event) after Stop gave %x\n", r); - - hr = IAudioClient_Reset(ac); - ok(hr == S_OK, "Reset failed: %08x\n", hr); - - ok(ResetEvent(handle), "ResetEvent\n"); - - r = WaitForSingleObject(handle, 120); - ok(r == WAIT_OBJECT_0, "Wait(event) after Reset gave %x\n", r); - - hr = IAudioClient_SetEventHandle(ac, NULL); - ok(hr == E_INVALIDARG, "SetEventHandle(NULL) returns %08x\n", hr); - - r = WaitForSingleObject(handle, 70); - ok(r == WAIT_OBJECT_0, "Wait(NULL event) gave %x\n", r); - - hr = IAudioClient_Start(ac); - ok(hr == S_OK, "Start failed: %08x\n", hr); IAudioCaptureClient_Release(acc); } @@ -593,7 +583,8 @@ ok(hr == E_INVALIDARG, "SetEventHandle(NULL) returns %08x\n", hr); hr = IAudioClient_Start(ac); - ok(hr == AUDCLNT_E_EVENTHANDLE_NOT_SET, "Start before SetEventHandle returns %08x\n", hr); + ok(hr == AUDCLNT_E_EVENTHANDLE_NOT_SET || + hr == D3D11_ERROR_4E /* win10 */, "Start before SetEventHandle returns %08x\n", hr); hr = IAudioClient_SetEventHandle(ac, handle); ok(hr == S_OK, "SetEventHandle returns %08x\n", hr); @@ -847,7 +838,6 @@ hr = ISimpleAudioVolume_GetMasterVolume(sav, &vol); ok(hr == S_OK, "GetMasterVolume failed: %08x\n", hr); - ok(vol == 1.f, "Master volume wasn't 1: %f\n", vol); hr = ISimpleAudioVolume_SetMasterVolume(sav, -1.f, NULL); ok(hr == E_INVALIDARG, "SetMasterVolume gave wrong error: %08x\n", hr); Modified: trunk/rostests/winetests/mmdevapi/render.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mmdevapi/render… ============================================================================== --- trunk/rostests/winetests/mmdevapi/render.c [iso-8859-1] (original) +++ trunk/rostests/winetests/mmdevapi/render.c [iso-8859-1] Tue Dec 8 10:24:11 2015 @@ -54,9 +54,13 @@ #define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER) +/* undocumented error code */ +#define D3D11_ERROR_4E MAKE_HRESULT(SEVERITY_ERROR, FACILITY_DIRECT3D11, 0x4e) + static IMMDeviceEnumerator *mme = NULL; static IMMDevice *dev = NULL; static HRESULT hexcl = S_OK; /* or AUDCLNT_E_EXCLUSIVE_MODE_NOT_ALLOWED */ +static BOOL win10 = FALSE; static const LARGE_INTEGER ullZero; @@ -281,7 +285,8 @@ fmtex->dwChannelMask = 0xffff; hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, 0, pwfx, NULL); - ok(hr == S_OK, "Initialize(dwChannelMask = 0xffff) returns %08x\n", hr); + ok(hr == S_OK || + hr == AUDCLNT_E_UNSUPPORTED_FORMAT /* win10 */, "Initialize(dwChannelMask = 0xffff) returns %08x\n", hr); IAudioClient_Release(ac); @@ -330,9 +335,13 @@ ok(hr == S_OK, "Valid GetStreamLatency call returns %08x\n", hr); trace("Returned latency: %u.%04u ms\n", (UINT)(t2/10000), (UINT)(t2 % 10000)); - ok(t2 >= t1 || broken(t2 >= t1/2 && pwfx->nSamplesPerSec > 48000), - "Latency < default period, delta %ldus\n", (long)((t2-t1)/10)); + ok(t2 >= t1 || broken(t2 >= t1/2 && pwfx->nSamplesPerSec > 48000) || + broken(t2 == 0) /* (!) win10 */, + "Latency < default period, delta %dus (%x%08x vs %x%08x)\n", + (LONG)((t2-t1)/10), (DWORD)(t2 >> 32), (DWORD)t2, (DWORD)(t1 >> 32), (DWORD)t1); /* Native appears to add the engine period to the HW latency in shared mode */ + if(t2 == 0) + win10 = TRUE; hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, 0, pwfx, NULL); ok(hr == AUDCLNT_E_ALREADY_INITIALIZED, "Calling Initialize twice returns %08x\n", hr); @@ -467,169 +476,6 @@ } } -static void test_formats2(void) -{ - IAudioClient *ac; - HRESULT hr; - WAVEFORMATEX *pwfx, *pwfx2; - WAVEFORMATEXTENSIBLE *pwfe, wfe, *pwfe2; - - hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, - NULL, (void**)&ac); - - ok(hr == S_OK, "Activation failed with %08x\n", hr); - if (hr != S_OK) - return; - - hr = IAudioClient_GetMixFormat(ac, &pwfx); - ok(hr == S_OK, "GetMixFormat failed: %08x\n", hr); - if (hr != S_OK) - return; - - ok(pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE, "Invalid wFormatTag\n"); - if (pwfx->wFormatTag != WAVE_FORMAT_EXTENSIBLE) { - CoTaskMemFree(pwfx); - return; - } - - pwfe = (WAVEFORMATEXTENSIBLE*)pwfx; - ok(pwfe->Samples.wValidBitsPerSample, "wValidBitsPerSample should be non-zero\n"); - - if (pwfx->nChannels > 2) { - trace("Limiting channels to 2\n"); - pwfx->nChannels = 2; - pwfx->nBlockAlign = pwfx->wBitsPerSample / 8 * pwfx->nChannels; - pwfx->nAvgBytesPerSec = pwfx->nBlockAlign * pwfx->nSamplesPerSec; - pwfe->dwChannelMask = SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT; - } - - wfe = *pwfe; - pwfx->nAvgBytesPerSec = pwfx->nBlockAlign = 0; - - hr = IAudioClient_IsFormatSupported(ac, AUDCLNT_SHAREMODE_EXCLUSIVE, pwfx, NULL); - ok(hr == AUDCLNT_E_UNSUPPORTED_FORMAT || hr == AUDCLNT_E_EXCLUSIVE_MODE_NOT_ALLOWED, - "Exclusive IsFormatSupported with nAvgBytesPerSec=0 and nBlockAlign=0 returned %08x\n", hr); - - pwfx2 = NULL; - hr = IAudioClient_IsFormatSupported(ac, AUDCLNT_SHAREMODE_SHARED, pwfx, &pwfx2); - ok((hr == E_INVALIDARG || hr == AUDCLNT_E_UNSUPPORTED_FORMAT) && !pwfx2, - "Shared IsFormatSupported with nAvgBytesPerSec=0 and nBlockAlign=0 returned %08x %p\n", hr, pwfx2); - CoTaskMemFree(pwfx2); - - pwfx->wFormatTag = WAVE_FORMAT_PCM; - pwfx2 = NULL; - hr = IAudioClient_IsFormatSupported(ac, AUDCLNT_SHAREMODE_SHARED, pwfx, &pwfx2); - ok((hr == S_OK || hr == AUDCLNT_E_UNSUPPORTED_FORMAT) && !pwfx2, - "Shared IsFormatSupported with nAvgBytesPerSec=0 and nBlockAlign=0 returned %08x %p\n", hr, pwfx2); - CoTaskMemFree(pwfx2); - - *pwfe = wfe; - pwfe->dwChannelMask = 0; - hr = IAudioClient_IsFormatSupported(ac, AUDCLNT_SHAREMODE_EXCLUSIVE, pwfx, NULL); - ok(hr == AUDCLNT_E_UNSUPPORTED_FORMAT || hr == AUDCLNT_E_EXCLUSIVE_MODE_NOT_ALLOWED, - "Exclusive IsFormatSupported with dwChannelMask=0 returned %08x\n", hr); - - pwfx2 = NULL; - hr = IAudioClient_IsFormatSupported(ac, AUDCLNT_SHAREMODE_SHARED, pwfx, &pwfx2); - ok(hr == S_OK, - "Shared IsFormatSupported with dwChannelMask=0 returned %08x\n", hr); - CoTaskMemFree(pwfx2); - - - pwfe->dwChannelMask = 0x3ffff; - hr = IAudioClient_IsFormatSupported(ac, AUDCLNT_SHAREMODE_EXCLUSIVE, pwfx, NULL); - ok(hr == AUDCLNT_E_UNSUPPORTED_FORMAT || hr == AUDCLNT_E_EXCLUSIVE_MODE_NOT_ALLOWED, - "Exclusive IsFormatSupported with dwChannelMask=0x3ffff returned %08x\n", hr); - - pwfx2 = NULL; - hr = IAudioClient_IsFormatSupported(ac, AUDCLNT_SHAREMODE_SHARED, pwfx, &pwfx2); - ok(hr == S_OK && !pwfx2, - "Shared IsFormatSupported with dwChannelMask=0x3ffff returned %08x %p\n", hr, pwfx2); - CoTaskMemFree(pwfx2); - - - pwfe->dwChannelMask = 0x40000000; - hr = IAudioClient_IsFormatSupported(ac, AUDCLNT_SHAREMODE_EXCLUSIVE, pwfx, NULL); - ok(hr == AUDCLNT_E_UNSUPPORTED_FORMAT || hr == AUDCLNT_E_EXCLUSIVE_MODE_NOT_ALLOWED, - "Exclusive IsFormatSupported with dwChannelMask=0x40000000 returned %08x\n", hr); - - pwfx2 = NULL; - hr = IAudioClient_IsFormatSupported(ac, AUDCLNT_SHAREMODE_SHARED, pwfx, &pwfx2); - ok(hr == S_OK && !pwfx2, - "Shared IsFormatSupported with dwChannelMask=0x40000000 returned %08x %p\n", hr, pwfx2); - CoTaskMemFree(pwfx2); - - pwfe->dwChannelMask = SPEAKER_ALL | SPEAKER_RESERVED; - hr = IAudioClient_IsFormatSupported(ac, AUDCLNT_SHAREMODE_EXCLUSIVE, pwfx, NULL); - ok(hr == AUDCLNT_E_UNSUPPORTED_FORMAT || hr == AUDCLNT_E_EXCLUSIVE_MODE_NOT_ALLOWED, - "Exclusive IsFormatSupported with dwChannelMask=SPEAKER_ALL | SPEAKER_RESERVED returned %08x\n", hr); - - pwfx2 = NULL; - hr = IAudioClient_IsFormatSupported(ac, AUDCLNT_SHAREMODE_SHARED, pwfx, &pwfx2); - ok(hr == S_OK && !pwfx2, - "Shared IsFormatSupported with dwChannelMask=SPEAKER_ALL | SPEAKER_RESERVED returned %08x %p\n", hr, pwfx2); - CoTaskMemFree(pwfx2); - - *pwfe = wfe; - pwfe->Samples.wValidBitsPerSample = 0; - hr = IAudioClient_IsFormatSupported(ac, AUDCLNT_SHAREMODE_EXCLUSIVE, pwfx, NULL); - ok(hr == AUDCLNT_E_UNSUPPORTED_FORMAT || hr == AUDCLNT_E_EXCLUSIVE_MODE_NOT_ALLOWED, - "Exclusive IsFormatSupported with wValidBitsPerSample=0 returned %08x\n", hr); - - pwfx2 = NULL; - hr = IAudioClient_IsFormatSupported(ac, AUDCLNT_SHAREMODE_SHARED, pwfx, &pwfx2); - ok((hr == S_FALSE || hr == AUDCLNT_E_UNSUPPORTED_FORMAT) && pwfx2, - "Shared IsFormatSupported with wValidBitsPerSample=0 returned %08x %p\n", hr, pwfx2); - if (pwfx2) { - pwfe2 = (WAVEFORMATEXTENSIBLE*)pwfx2; - ok(pwfe2->Samples.wValidBitsPerSample == pwfx->wBitsPerSample, - "Shared IsFormatSupported had wValidBitsPerSample set to %u, not %u\n", - pwfe2->Samples.wValidBitsPerSample, pwfx->wBitsPerSample); - CoTaskMemFree(pwfx2); - } - - pwfx2 = NULL; - pwfe->Samples.wValidBitsPerSample = pwfx->wBitsPerSample + 1; - hr = IAudioClient_IsFormatSupported(ac, AUDCLNT_SHAREMODE_SHARED, pwfx, &pwfx2); - ok((hr == E_INVALIDARG || hr == AUDCLNT_E_UNSUPPORTED_FORMAT) && !pwfx2, - "Shared IsFormatSupported with wValidBitsPerSample += 1 returned %08x %p\n", hr, pwfx2); - - *pwfe = wfe; - memset(&pwfe->SubFormat, 0xff, 16); - pwfx2 = NULL; - hr = IAudioClient_IsFormatSupported(ac, AUDCLNT_SHAREMODE_SHARED, pwfx, &pwfx2); - ok(hr == AUDCLNT_E_UNSUPPORTED_FORMAT && !pwfx2, - "Shared IsFormatSupported with SubFormat=-1 returned %08x %p\n", hr, pwfx2); - CoTaskMemFree(pwfx2); - - *pwfe = wfe; - pwfx2 = NULL; - pwfe->Samples.wValidBitsPerSample = pwfx->wBitsPerSample = 256; - pwfx->nBlockAlign = pwfx->wBitsPerSample / 8 * pwfx->nChannels; - pwfx->nAvgBytesPerSec = pwfx->nBlockAlign * pwfx->nSamplesPerSec; - hr = IAudioClient_IsFormatSupported(ac, AUDCLNT_SHAREMODE_SHARED, pwfx, &pwfx2); - ok((hr == E_INVALIDARG || hr == AUDCLNT_E_UNSUPPORTED_FORMAT) && !pwfx2, - "Shared IsFormatSupported with wBitsPerSample=256 returned %08x %p\n", hr, pwfx2); - CoTaskMemFree(pwfx2); - - *pwfe = wfe; - pwfx2 = NULL; - pwfe->Samples.wValidBitsPerSample = pwfx->wBitsPerSample - 1; - hr = IAudioClient_IsFormatSupported(ac, AUDCLNT_SHAREMODE_SHARED, pwfx, &pwfx2); - ok(hr == S_FALSE && pwfx2, - "Shared IsFormatSupported with wValidBitsPerSample-=1 returned %08x %p\n", hr, pwfx2); - if (pwfx2) { - pwfe2 = (WAVEFORMATEXTENSIBLE*)pwfx2; - ok(pwfe2->Samples.wValidBitsPerSample == pwfx->wBitsPerSample, - "Shared IsFormatSupported had wValidBitsPerSample set to %u, not %u\n", - pwfe2->Samples.wValidBitsPerSample, pwfx->wBitsPerSample); - CoTaskMemFree(pwfx2); - } - - CoTaskMemFree(pwfx); - IAudioClient_Release(ac); -} - static void test_references(void) { IAudioClient *ac; @@ -790,13 +636,15 @@ ok(event != NULL, "CreateEvent failed\n"); hr = IAudioClient_Start(ac); - ok(hr == AUDCLNT_E_EVENTHANDLE_NOT_SET, "Start failed: %08x\n", hr); + ok(hr == AUDCLNT_E_EVENTHANDLE_NOT_SET || + hr == D3D11_ERROR_4E /* win10 */, "Start failed: %08x\n", hr); hr = IAudioClient_SetEventHandle(ac, event); ok(hr == S_OK, "SetEventHandle failed: %08x\n", hr); hr = IAudioClient_SetEventHandle(ac, event); - ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_NAME), "SetEventHandle returns %08x\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_NAME) || + hr == E_UNEXPECTED /* win10 */, "SetEventHandle returns %08x\n", hr); r = WaitForSingleObject(event, 40); ok(r == WAIT_TIMEOUT, "Wait(event) before Start gave %x\n", r); @@ -896,10 +744,13 @@ hr = IAudioRenderClient_GetBuffer(arc, psize, &buf); ok(hr == S_OK, "GetBuffer failed: %08x\n", hr); ok(buf != NULL, "NULL buffer returned\n"); - for(i = 0; i < psize * pwfx->nBlockAlign; ++i){ - if(buf[i] != silence){ - ok(0, "buffer has data in it already\n"); - break; + if(!win10){ + /* win10 appears not to clear the buffer */ + for(i = 0; i < psize * pwfx->nBlockAlign; ++i){ + if(buf[i] != silence){ + ok(0, "buffer has data in it already, i: %u, valu: %f\n", i, *((float*)buf)); + break; + } } } @@ -1073,7 +924,8 @@ hr = IAudioClient_GetStreamLatency(ac, &t2); ok(hr == S_OK, "GetStreamLatency failed: %08x\n", hr); trace("Latency: %u.%04u ms\n", (UINT)(t2/10000), (UINT)(t2 % 10000)); - ok(t2 >= period || broken(t2 >= period/2 && share && pwfx->nSamplesPerSec > 48000), + ok(t2 >= period || broken(t2 >= period/2 && share && pwfx->nSamplesPerSec > 48000) || + broken(t2 == 0) /* win10 */, "Latency < default period, delta %ldus\n", (long)((t2-period)/10)); /** GetBufferSize @@ -2135,7 +1987,6 @@ vol = 0.5f; hr = ISimpleAudioVolume_GetMasterVolume(cap_sav, &vol); ok(hr == S_OK, "GetMasterVolume failed: %08x\n", hr); - ok(vol == 1.f, "Got wrong volume: %f\n", vol); ISimpleAudioVolume_Release(cap_sav); IAudioSessionManager_Release(cap_sesm); @@ -2164,7 +2015,6 @@ vol = 0.5f; hr = ISimpleAudioVolume_GetMasterVolume(cap_sav, &vol); ok(hr == S_OK, "GetMasterVolume failed: %08x\n", hr); - ok(vol == 1.f, "Got wrong volume: %f\n", vol); ISimpleAudioVolume_Release(cap_sav); } @@ -2418,7 +2268,6 @@ test_audioclient(); test_formats(AUDCLNT_SHAREMODE_EXCLUSIVE); test_formats(AUDCLNT_SHAREMODE_SHARED); - test_formats2(); test_references(); test_marshal(); trace("Output to a MS-DOS console is particularly slow and disturbs timing.\n");

9 years

[akhaldi] 70293: [USER32_WINETEST] Sync with Wine Staging 1.7.55 except clipboard tests. CORE-10536

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Dec 8 10:22:43 2015 New Revision: 70293 URL: http://svn.reactos.org/svn/reactos?rev=70293&view=rev Log: [USER32_WINETEST] Sync with Wine Staging 1.7.55 except clipboard tests. CORE-10536 Modified: trunk/rostests/winetests/user32/cursoricon.c trunk/rostests/winetests/user32/menu.c trunk/rostests/winetests/user32/monitor.c trunk/rostests/winetests/user32/msg.c trunk/rostests/winetests/user32/sysparams.c trunk/rostests/winetests/user32/win.c Modified: trunk/rostests/winetests/user32/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/cursoric… ============================================================================== --- trunk/rostests/winetests/user32/cursoricon.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/cursoricon.c [iso-8859-1] Tue Dec 8 10:22:43 2015 @@ -308,21 +308,33 @@ static LRESULT CALLBACK callback_child(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { - BOOL ret; - DWORD error; - switch (msg) { /* Destroy the cursor. */ case WM_USER+1: + { + HCURSOR cursor = (HCURSOR)lParam; + ICONINFO info; + BOOL ret; + DWORD error; + + memset(&info, 0, sizeof(info)); + ret = GetIconInfo(cursor, &info); + todo_wine ok(ret, "GetIconInfoEx failed with error %u\n", GetLastError()); + todo_wine ok(info.hbmColor != NULL, "info.hmbColor was not set\n"); + todo_wine ok(info.hbmMask != NULL, "info.hmbColor was not set\n"); + DeleteObject(info.hbmColor); + DeleteObject(info.hbmMask); + SetLastError(0xdeadbeef); - ret = DestroyCursor((HCURSOR) lParam); + ret = DestroyCursor(cursor); error = GetLastError(); ok(!ret || broken(ret) /* win9x */, "DestroyCursor on the active cursor succeeded.\n"); ok(error == ERROR_DESTROY_OBJECT_OF_OTHER_THREAD || error == 0xdeadbeef, /* vista */ "Last error: %u\n", error); return TRUE; + } case WM_DESTROY: PostQuitMessage(0); return 0; Modified: trunk/rostests/winetests/user32/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/menu.c?r… ============================================================================== --- trunk/rostests/winetests/user32/menu.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/menu.c [iso-8859-1] Tue Dec 8 10:22:43 2015 @@ -2508,9 +2508,10 @@ mii.fMask = MIIM_FTYPE | MIIM_STATE | MIIM_ID | MIIM_SUBMENU; ret = GetMenuItemInfoA(hmenu, i, TRUE, &mii); ok(ret, "GetMenuItemInfo(%u) failed\n", i); -if (0) - trace("item #%u: fType %04x, fState %04x, wID %u, hSubMenu %p\n", - i, mii.fType, mii.fState, mii.wID, mii.hSubMenu); + + if (winetest_debug > 1) + trace("item #%u: fType %04x, fState %04x, wID %u, hSubMenu %p\n", + i, mii.fType, mii.fState, mii.wID, mii.hSubMenu); if (mii.hSubMenu) { @@ -2672,9 +2673,9 @@ mii.fMask = MIIM_FTYPE | MIIM_STATE | MIIM_ID | MIIM_STRING; ret = GetMenuItemInfoA(hmenu, i, TRUE, &mii); ok(ret, "GetMenuItemInfo(%u) failed\n", i); -if (0) - trace("item #%u: fType %04x, fState %04x, wID %u, dwTypeData %s\n", - i, mii.fType, mii.fState, mii.wID, (LPCSTR)mii.dwTypeData); + if (winetest_debug > 1) + trace("item #%u: fType %04x, fState %04x, wID %u, dwTypeData %s\n", + i, mii.fType, mii.fState, mii.wID, (LPCSTR)mii.dwTypeData); ok(mii.fType == menu_data[i].type, "%u: expected fType %04x, got %04x\n", i, menu_data[i].type, mii.fType); @@ -2778,9 +2779,10 @@ mii.fMask = MIIM_FTYPE | MIIM_ID | MIIM_STRING | MIIM_BITMAP; ret = GetMenuItemInfoA(hmenu, i, TRUE, &mii); ok(ret, "GetMenuItemInfo(%u) failed\n", i); -if (0) - trace("item #%u: fType %04x, fState %04x, wID %04x, hbmp %p\n", - i, mii.fType, mii.fState, mii.wID, mii.hbmpItem); + + if (winetest_debug > 1) + trace("item #%u: fType %04x, fState %04x, wID %04x, hbmp %p\n", + i, mii.fType, mii.fState, mii.wID, mii.hbmpItem); ok(mii.fType == item[i].type, "%u: expected fType %04x, got %04x\n", i, item[i].type, mii.fType); Modified: trunk/rostests/winetests/user32/monitor.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/monitor.… ============================================================================== --- trunk/rostests/winetests/user32/monitor.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/monitor.c [iso-8859-1] Tue Dec 8 10:22:43 2015 @@ -34,6 +34,7 @@ static HMONITOR (WINAPI *pMonitorFromPoint)(POINT,DWORD); static HMONITOR (WINAPI *pMonitorFromRect)(LPCRECT,DWORD); static HMONITOR (WINAPI *pMonitorFromWindow)(HWND,DWORD); +static LONG (WINAPI *pGetDisplayConfigBufferSizes)(UINT32,UINT32*,UINT32*); static void init_function_pointers(void) { @@ -48,6 +49,7 @@ GET_PROC(ChangeDisplaySettingsExW) GET_PROC(EnumDisplayDevicesA) GET_PROC(EnumDisplayMonitors) + GET_PROC(GetDisplayConfigBufferSizes) GET_PROC(GetMonitorInfoA) GET_PROC(GetMonitorInfoW) GET_PROC(MonitorFromPoint) @@ -543,6 +545,58 @@ DestroyWindow(hwnd); } +static void test_display_config(void) +{ + UINT32 paths, modes; + LONG ret; + + if (!pGetDisplayConfigBufferSizes) + { + win_skip("GetDisplayConfigBufferSizes is not supported\n"); + return; + } + + ret = pGetDisplayConfigBufferSizes(QDC_ALL_PATHS, NULL, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "got %d\n", ret); + + paths = 100; + ret = pGetDisplayConfigBufferSizes(QDC_ALL_PATHS, &paths, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "got %d\n", ret); + ok(paths == 100, "got %u\n", paths); + + modes = 100; + ret = pGetDisplayConfigBufferSizes(QDC_ALL_PATHS, NULL, &modes); + ok(ret == ERROR_INVALID_PARAMETER, "got %d\n", ret); + ok(modes == 100, "got %u\n", modes); + + paths = modes = 0; + ret = pGetDisplayConfigBufferSizes(QDC_ALL_PATHS, &paths, &modes); + if (!ret) + ok(paths > 0 && modes > 0, "got %u, %u\n", paths, modes); + else + ok(ret == ERROR_NOT_SUPPORTED, "got %d\n", ret); + + /* Invalid flags, non-zero invalid flags validation is version (or driver?) dependent, + it's unreliable to use in tests. */ + ret = pGetDisplayConfigBufferSizes(0, NULL, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "got %d\n", ret); + + paths = 100; + ret = pGetDisplayConfigBufferSizes(0, &paths, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "got %d\n", ret); + ok(paths == 100, "got %u\n", paths); + + modes = 100; + ret = pGetDisplayConfigBufferSizes(0, NULL, &modes); + ok(ret == ERROR_INVALID_PARAMETER, "got %d\n", ret); + ok(modes == 100, "got %u\n", modes); + + paths = modes = 100; + ret = pGetDisplayConfigBufferSizes(0, &paths, &modes); + ok(ret == ERROR_INVALID_PARAMETER || ret == ERROR_NOT_SUPPORTED, "got %d\n", ret); + ok(modes == 0 && paths == 0, "got %u, %u\n", modes, paths); +} + START_TEST(monitor) { init_function_pointers(); @@ -550,4 +604,5 @@ test_ChangeDisplaySettingsEx(); test_monitors(); test_work_area(); -} + test_display_config(); +} Modified: trunk/rostests/winetests/user32/msg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/msg.c?re… ============================================================================== --- trunk/rostests/winetests/user32/msg.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/msg.c [iso-8859-1] Tue Dec 8 10:22:43 2015 @@ -64,6 +64,10 @@ #define ARCH "x86" #elif defined __x86_64__ #define ARCH "amd64" +#elif defined __arm__ +#define ARCH "arm" +#elif defined __aarch64__ +#define ARCH "arm64" #else #define ARCH "none" #endif @@ -793,6 +797,9 @@ { EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam, 0, 0 }, { WM_QUERYNEWPALETTE, sent|wparam|lparam|optional, 0, 0 }, { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, + { WM_NCPAINT, sent|wparam|optional, 1 }, + { WM_ERASEBKGND, sent|optional }, + { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE|SWP_NOMOVE|SWP_NOSIZE }, { WM_ACTIVATEAPP, sent|wparam, 1 }, { WM_NCACTIVATE, sent }, { WM_ACTIVATE, sent|wparam, 1 }, @@ -3206,7 +3213,7 @@ { 0 } }; /* ShowWindow(SW_RESTORE) for a not visible MDI child window */ -static const struct message WmRestoreMDIchildInisibleSeq[] = { +static const struct message WmRestoreMDIchildInvisibleSeq[] = { { HCBT_MINMAX, hook|lparam, 0, SW_RESTORE }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_SHOWWINDOW|SWP_FRAMECHANGED|SWP_STATECHANGED }, { WM_NCCALCSIZE, sent|wparam, 1 }, @@ -3534,7 +3541,7 @@ ok_sequence(WmHideChildSeq, "ShowWindow(SW_HIDE):MDI child", FALSE); ShowWindow(mdi_child2, SW_RESTORE); - ok_sequence(WmRestoreMDIchildInisibleSeq, "ShowWindow(SW_RESTORE):invisible MDI child", FALSE); + ok_sequence(WmRestoreMDIchildInvisibleSeq, "ShowWindow(SW_RESTORE):invisible MDI child", FALSE); flush_sequence(); ok(GetWindowLongA(mdi_child2, GWL_STYLE) & WS_VISIBLE, "MDI child should be visible\n"); @@ -5292,6 +5299,21 @@ { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, { 0 } }; +static const struct message WmLButtonDownStaticSeq[] = +{ + { WM_LBUTTONDOWN, sent|wparam|lparam, 0, 0 }, + { EVENT_SYSTEM_CAPTURESTART, winevent_hook|wparam|lparam, 0, 0 }, + { HCBT_SETFOCUS, hook }, + { WM_IME_SETCONTEXT, sent|wparam|defwinproc|optional, 1 }, + { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { WM_SETFOCUS, sent|wparam|defwinproc, 0 }, + { WM_CTLCOLORSTATIC, sent|defwinproc }, + { BM_SETSTATE, sent|wparam|defwinproc, TRUE }, + { WM_CTLCOLORSTATIC, sent|defwinproc }, + { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { 0 } +}; static const struct message WmLButtonUpSeq[] = { { WM_LBUTTONUP, sent|wparam|lparam, 0, 0 }, @@ -5302,12 +5324,48 @@ { WM_CAPTURECHANGED, sent|wparam|defwinproc, 0 }, { 0 } }; +static const struct message WmLButtonUpStaticSeq[] = +{ + { WM_LBUTTONUP, sent|wparam|lparam, 0, 0 }, + { BM_SETSTATE, sent|wparam|defwinproc, FALSE }, + { WM_CTLCOLORSTATIC, sent|defwinproc }, + { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { EVENT_SYSTEM_CAPTUREEND, winevent_hook|wparam|lparam, 0, 0 }, + { WM_CAPTURECHANGED, sent|wparam|defwinproc, 0 }, + { 0 } +}; +static const struct message WmLButtonUpAutoSeq[] = +{ + { WM_LBUTTONUP, sent|wparam|lparam, 0, 0 }, + { BM_SETSTATE, sent|wparam|defwinproc, FALSE }, + { WM_CTLCOLORSTATIC, sent|defwinproc }, + { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { EVENT_SYSTEM_CAPTUREEND, winevent_hook|wparam|lparam, 0, 0 }, + { BM_SETCHECK, sent|defwinproc }, + { WM_CTLCOLORSTATIC, sent|defwinproc, 0, 0 }, + { WM_CAPTURECHANGED, sent|wparam|defwinproc, 0 }, + { 0 } +}; +static const struct message WmLButtonUpBrokenSeq[] = +{ + { WM_LBUTTONUP, sent|wparam|lparam, 0, 0 }, + { 0 } +}; static const struct message WmSetFontButtonSeq[] = { { WM_SETFONT, sent }, { WM_PAINT, sent }, { WM_ERASEBKGND, sent|defwinproc|optional }, { WM_CTLCOLORBTN, sent|defwinproc }, + { WM_CTLCOLORBTN, sent|defwinproc|optional }, /* FIXME: Wine sends it twice for BS_OWNERDRAW */ + { 0 } +}; +static const struct message WmSetFontStaticSeq[] = +{ + { WM_SETFONT, sent }, + { WM_PAINT, sent }, + { WM_ERASEBKGND, sent|defwinproc|optional }, + { WM_CTLCOLORSTATIC, sent|defwinproc }, { 0 } }; static const struct message WmSetStyleButtonSeq[] = @@ -5468,48 +5526,62 @@ { static const struct { - DWORD style; - DWORD dlg_code; - const struct message *setfocus; - const struct message *killfocus; - const struct message *setstyle; - const struct message *setstate; - const struct message *clearstate; - const struct message *setcheck; + DWORD style; + DWORD dlg_code; + const struct message *setfocus; + const struct message *killfocus; + const struct message *setstyle; + const struct message *setstate; + const struct message *clearstate; + const struct message *setcheck; + const struct message *lbuttondown; + const struct message *lbuttonup; + const struct message *setfont; } button[] = { - { BS_PUSHBUTTON, DLGC_BUTTON | DLGC_UNDEFPUSHBUTTON, - WmSetFocusButtonSeq, WmKillFocusButtonSeq, WmSetStyleButtonSeq, - WmSetStateButtonSeq, WmSetStateButtonSeq, WmSetCheckIgnoredSeq }, - { BS_DEFPUSHBUTTON, DLGC_BUTTON | DLGC_DEFPUSHBUTTON, - WmSetFocusButtonSeq, WmKillFocusButtonSeq, WmSetStyleButtonSeq, - WmSetStateButtonSeq, WmSetStateButtonSeq, WmSetCheckIgnoredSeq }, - { BS_CHECKBOX, DLGC_BUTTON, - WmSetFocusStaticSeq, WmKillFocusStaticSeq, WmSetStyleStaticSeq, - WmSetStateStaticSeq, WmSetStateStaticSeq, WmSetCheckStaticSeq }, - { BS_AUTOCHECKBOX, DLGC_BUTTON, - WmSetFocusStaticSeq, WmKillFocusStaticSeq, WmSetStyleStaticSeq, - WmSetStateStaticSeq, WmSetStateStaticSeq, WmSetCheckStaticSeq }, - { BS_RADIOBUTTON, DLGC_BUTTON | DLGC_RADIOBUTTON, - WmSetFocusStaticSeq, WmKillFocusStaticSeq, WmSetStyleStaticSeq, - WmSetStateStaticSeq, WmSetStateStaticSeq, WmSetCheckStaticSeq }, - { BS_3STATE, DLGC_BUTTON, - WmSetFocusStaticSeq, WmKillFocusStaticSeq, WmSetStyleStaticSeq, - WmSetStateStaticSeq, WmSetStateStaticSeq, WmSetCheckStaticSeq }, - { BS_AUTO3STATE, DLGC_BUTTON, - WmSetFocusStaticSeq, WmKillFocusStaticSeq, WmSetStyleStaticSeq, - WmSetStateStaticSeq, WmSetStateStaticSeq, WmSetCheckStaticSeq }, - { BS_GROUPBOX, DLGC_STATIC, - WmSetFocusStaticSeq, WmKillFocusStaticSeq, WmSetStyleStaticSeq, - WmSetStateStaticSeq, WmSetStateStaticSeq, WmSetCheckIgnoredSeq }, - { BS_USERBUTTON, DLGC_BUTTON | DLGC_UNDEFPUSHBUTTON, - WmSetFocusButtonSeq, WmKillFocusButtonSeq, WmSetStyleUserSeq, - WmSetStateUserSeq, WmClearStateButtonSeq, WmSetCheckIgnoredSeq }, - { BS_AUTORADIOBUTTON, DLGC_BUTTON | DLGC_RADIOBUTTON, - WmSetFocusStaticSeq, WmKillFocusStaticSeq, WmSetStyleStaticSeq, - WmSetStateStaticSeq, WmSetStateStaticSeq, WmSetCheckStaticSeq }, - { BS_OWNERDRAW, DLGC_BUTTON, - WmSetFocusOwnerdrawSeq, WmKillFocusOwnerdrawSeq, WmSetStyleOwnerdrawSeq, - WmSetStateOwnerdrawSeq, WmClearStateOwnerdrawSeq, WmSetCheckIgnoredSeq }, + { BS_PUSHBUTTON, DLGC_BUTTON | DLGC_UNDEFPUSHBUTTON, + WmSetFocusButtonSeq, WmKillFocusButtonSeq, WmSetStyleButtonSeq, + WmSetStateButtonSeq, WmSetStateButtonSeq, WmSetCheckIgnoredSeq, + WmLButtonDownSeq, WmLButtonUpSeq, WmSetFontButtonSeq }, + { BS_DEFPUSHBUTTON, DLGC_BUTTON | DLGC_DEFPUSHBUTTON, + WmSetFocusButtonSeq, WmKillFocusButtonSeq, WmSetStyleButtonSeq, + WmSetStateButtonSeq, WmSetStateButtonSeq, WmSetCheckIgnoredSeq, + WmLButtonDownSeq, WmLButtonUpSeq, WmSetFontButtonSeq }, + { BS_CHECKBOX, DLGC_BUTTON, + WmSetFocusStaticSeq, WmKillFocusStaticSeq, WmSetStyleStaticSeq, + WmSetStateStaticSeq, WmSetStateStaticSeq, WmSetCheckStaticSeq, + WmLButtonDownStaticSeq, WmLButtonUpStaticSeq, WmSetFontStaticSeq }, + { BS_AUTOCHECKBOX, DLGC_BUTTON, + WmSetFocusStaticSeq, WmKillFocusStaticSeq, WmSetStyleStaticSeq, + WmSetStateStaticSeq, WmSetStateStaticSeq, WmSetCheckStaticSeq, + WmLButtonDownStaticSeq, WmLButtonUpAutoSeq, WmSetFontStaticSeq }, + { BS_RADIOBUTTON, DLGC_BUTTON | DLGC_RADIOBUTTON, + WmSetFocusStaticSeq, WmKillFocusStaticSeq, WmSetStyleStaticSeq, + WmSetStateStaticSeq, WmSetStateStaticSeq, WmSetCheckStaticSeq, + WmLButtonDownStaticSeq, WmLButtonUpStaticSeq, WmSetFontStaticSeq }, + { BS_3STATE, DLGC_BUTTON, + WmSetFocusStaticSeq, WmKillFocusStaticSeq, WmSetStyleStaticSeq, + WmSetStateStaticSeq, WmSetStateStaticSeq, WmSetCheckStaticSeq, + WmLButtonDownStaticSeq, WmLButtonUpStaticSeq, WmSetFontStaticSeq }, + { BS_AUTO3STATE, DLGC_BUTTON, + WmSetFocusStaticSeq, WmKillFocusStaticSeq, WmSetStyleStaticSeq, + WmSetStateStaticSeq, WmSetStateStaticSeq, WmSetCheckStaticSeq, + WmLButtonDownStaticSeq, WmLButtonUpAutoSeq, WmSetFontStaticSeq }, + { BS_GROUPBOX, DLGC_STATIC, + WmSetFocusStaticSeq, WmKillFocusStaticSeq, WmSetStyleStaticSeq, + WmSetStateStaticSeq, WmSetStateStaticSeq, WmSetCheckIgnoredSeq, + WmLButtonDownStaticSeq, WmLButtonUpStaticSeq, WmSetFontStaticSeq }, + { BS_USERBUTTON, DLGC_BUTTON | DLGC_UNDEFPUSHBUTTON, + WmSetFocusButtonSeq, WmKillFocusButtonSeq, WmSetStyleUserSeq, + WmSetStateUserSeq, WmClearStateButtonSeq, WmSetCheckIgnoredSeq, + WmLButtonDownSeq, WmLButtonUpSeq, WmSetFontButtonSeq }, + { BS_AUTORADIOBUTTON, DLGC_BUTTON | DLGC_RADIOBUTTON, + WmSetFocusStaticSeq, WmKillFocusStaticSeq, WmSetStyleStaticSeq, + WmSetStateStaticSeq, WmSetStateStaticSeq, WmSetCheckStaticSeq, + NULL /* avoid infinite loop */, WmLButtonUpBrokenSeq, WmSetFontStaticSeq }, + { BS_OWNERDRAW, DLGC_BUTTON, + WmSetFocusOwnerdrawSeq, WmKillFocusOwnerdrawSeq, WmSetStyleOwnerdrawSeq, + WmSetStateOwnerdrawSeq, WmClearStateOwnerdrawSeq, WmSetCheckIgnoredSeq, + WmLButtonDownSeq, WmLButtonUpSeq, WmSetFontButtonSeq }, }; unsigned int i; HWND hwnd, parent; @@ -5537,12 +5609,13 @@ { MSG msg; DWORD style, state; + char desc[64]; trace("button style %08x\n", button[i].style); hwnd = CreateWindowExA(0, "my_button_class", "test", button[i].style | WS_CHILD | BS_NOTIFY, 0, 0, 50, 14, parent, (HMENU)ID_BUTTON, 0, NULL); - ok(hwnd != 0, "Failed to create button window\n"); + ok(hwnd != 0, "Failed to create button window\n"); style = GetWindowLongA(hwnd, GWL_STYLE); style &= ~(WS_CHILD | BS_NOTIFY); @@ -5552,28 +5625,28 @@ else ok(style == button[i].style, "expected style %x got %x\n", button[i].style, style); - dlg_code = SendMessageA(hwnd, WM_GETDLGCODE, 0, 0); - ok(dlg_code == button[i].dlg_code, "%u: wrong dlg_code %08x\n", i, dlg_code); - - ShowWindow(hwnd, SW_SHOW); - UpdateWindow(hwnd); - SetFocus(0); - flush_events(); - SetFocus(0); - flush_sequence(); + dlg_code = SendMessageA(hwnd, WM_GETDLGCODE, 0, 0); + ok(dlg_code == button[i].dlg_code, "%u: wrong dlg_code %08x\n", i, dlg_code); + + ShowWindow(hwnd, SW_SHOW); + UpdateWindow(hwnd); + SetFocus(0); + flush_events(); + SetFocus(0); + flush_sequence(); log_all_parent_messages++; ok(GetFocus() == 0, "expected focus 0, got %p\n", GetFocus()); - SetFocus(hwnd); + SetFocus(hwnd); SendMessageA(hwnd, WM_APP, 0, 0); /* place a separator mark here */ while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); - ok_sequence(button[i].setfocus, "SetFocus(hwnd) on a button", FALSE); - - SetFocus(0); + ok_sequence(button[i].setfocus, "SetFocus(hwnd) on a button", FALSE); + + SetFocus(0); SendMessageA(hwnd, WM_APP, 0, 0); /* place a separator mark here */ while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); - ok_sequence(button[i].killfocus, "SetFocus(0) on a button", FALSE); + ok_sequence(button[i].killfocus, "SetFocus(0) on a button", FALSE); ok(GetFocus() == 0, "expected focus 0, got %p\n", GetFocus()); @@ -5662,39 +5735,45 @@ log_all_parent_messages--; - DestroyWindow(hwnd); + DestroyWindow(hwnd); + + hwnd = CreateWindowExA(0, "my_button_class", "test", button[i].style | WS_POPUP | WS_VISIBLE, + 0, 0, 50, 14, 0, 0, 0, NULL); + ok(hwnd != 0, "Failed to create button window\n"); + + SetForegroundWindow(hwnd); + flush_events(); + + SetActiveWindow(hwnd); + SetFocus(0); + flush_sequence(); + + if (button[i].lbuttondown) + { + SendMessageA(hwnd, WM_LBUTTONDOWN, 0, 0); + sprintf(desc, "button[%i]: WM_LBUTTONDOWN on a button", i); + ok_sequence(button[i].lbuttondown, desc, FALSE); + } + + SendMessageA(hwnd, WM_LBUTTONUP, 0, 0); + sprintf(desc, "button[%i]: WM_LBUTTONUP on a button", i); + ok_sequence(button[i].lbuttonup, desc, FALSE); + + flush_sequence(); + zfont = GetStockObject(SYSTEM_FONT); + SendMessageA(hwnd, WM_SETFONT, (WPARAM)zfont, TRUE); + UpdateWindow(hwnd); + sprintf(desc, "button[%i]: WM_SETFONT on a button", i); + ok_sequence(button[i].setfont, desc, FALSE); + + DestroyWindow(hwnd); } DestroyWindow(parent); - - hwnd = CreateWindowExA(0, "my_button_class", "test", BS_PUSHBUTTON | WS_POPUP | WS_VISIBLE, - 0, 0, 50, 14, 0, 0, 0, NULL); - ok(hwnd != 0, "Failed to create button window\n"); - - SetForegroundWindow(hwnd); - flush_events(); - - SetActiveWindow(hwnd); - SetFocus(0); - flush_sequence(); - - SendMessageA(hwnd, WM_LBUTTONDOWN, 0, 0); - ok_sequence(WmLButtonDownSeq, "WM_LBUTTONDOWN on a button", FALSE); - - SendMessageA(hwnd, WM_LBUTTONUP, 0, 0); - ok_sequence(WmLButtonUpSeq, "WM_LBUTTONUP on a button", FALSE); - - flush_sequence(); - zfont = GetStockObject(SYSTEM_FONT); - SendMessageA(hwnd, WM_SETFONT, (WPARAM)zfont, TRUE); - UpdateWindow(hwnd); - ok_sequence(WmSetFontButtonSeq, "WM_SETFONT on a button", FALSE); - - DestroyWindow(hwnd); } /****************** static message test *************************/ -static const struct message WmSetFontStaticSeq[] = +static const struct message WmSetFontStaticSeq2[] = { { WM_SETFONT, sent }, { WM_PAINT, sent|defwinproc|optional }, @@ -5754,7 +5833,7 @@ const struct message *setfont; } static_ctrl[] = { { SS_LEFT, DLGC_STATIC, - WmSetFontStaticSeq } + WmSetFontStaticSeq2 } }; unsigned int i; HWND hwnd; @@ -6570,6 +6649,20 @@ ok_sequence( WmEmptySeq, "WmChildPaintNc2", FALSE ); RedrawWindow( hparent, NULL, 0, RDW_ERASENOW ); ok_sequence( WmEmptySeq, "WmChildPaintNc3", FALSE ); + + /* WS_CLIPCHILDREN doesn't exclude children from update region */ + flush_sequence(); + RedrawWindow( hparent, NULL, 0, RDW_INVALIDATE | RDW_ERASE | RDW_NOCHILDREN ); + GetClientRect( hparent, &rect ); + SetRectRgn( hrgn, rect.left, rect.top, rect.right, rect.bottom ); + check_update_rgn( hparent, hrgn ); + flush_events(); + + RedrawWindow( hparent, NULL, 0, RDW_INVALIDATE | RDW_ERASE | RDW_ALLCHILDREN ); + GetClientRect( hparent, &rect ); + SetRectRgn( hrgn, rect.left, rect.top, rect.right, rect.bottom ); + check_update_rgn( hparent, hrgn ); + flush_events(); /* test RDW_INTERNALPAINT behavior */ @@ -8428,6 +8521,7 @@ start = GetTickCount(); while (GetTickCount()-start < 1001 && GetMessageA(&msg, info.hWnd, 0, 0)) DispatchMessageA(&msg); +todo_wine ok(abs(count-TIMER_COUNT_EXPECTED) < TIMER_COUNT_TOLERANCE /* xp */ || broken(abs(count-64) < TIMER_COUNT_TOLERANCE) /* most common */ || broken(abs(count-43) < TIMER_COUNT_TOLERANCE) /* w2k3, win8 */, @@ -8496,6 +8590,7 @@ start = GetTickCount(); while (GetTickCount()-start < 1001 && GetMessageA(&msg, NULL, 0, 0)) DispatchMessageA(&msg); +todo_wine ok(abs(count-TIMER_COUNT_EXPECTED) < TIMER_COUNT_TOLERANCE /* xp */ || broken(abs(count-64) < TIMER_COUNT_TOLERANCE) /* most common */, "did not get expected count for minimum timeout (%d != ~%d).\n", @@ -9107,6 +9202,54 @@ "unexpected error %d\n", GetLastError()); } +static HWND hook_hwnd; +static HHOOK recursive_hook; +static int hook_depth, max_hook_depth; + +static LRESULT WINAPI rec_get_message_hook(int code, WPARAM w, LPARAM l) +{ + LRESULT res; + MSG msg; + BOOL b; + + hook_depth++; + if(hook_depth > max_hook_depth) + max_hook_depth = hook_depth; + + b = PeekMessageW(&msg, hook_hwnd, 0, 0, PM_NOREMOVE); + ok(b, "PeekMessage failed\n"); + + res = CallNextHookEx(recursive_hook, code, w, l); + + hook_depth--; + return res; +} + +static void test_recursive_hook(void) +{ + MSG msg; + BOOL b; + + hook_hwnd = CreateWindowA("Static", NULL, WS_POPUP, 0, 0, 200, 60, NULL, NULL, NULL, NULL); + ok(hook_hwnd != NULL, "CreateWindow failed\n"); + + recursive_hook = SetWindowsHookExW(WH_GETMESSAGE, rec_get_message_hook, NULL, GetCurrentThreadId()); + ok(recursive_hook != NULL, "SetWindowsHookEx failed\n"); + + PostMessageW(hook_hwnd, WM_USER, 0, 0); + PostMessageW(hook_hwnd, WM_USER+1, 0, 0); + + hook_depth = 0; + GetMessageW(&msg, hook_hwnd, 0, 0); + ok(15 < max_hook_depth && max_hook_depth < 45, "max_hook_depth = %d\n", max_hook_depth); + trace("max_hook_depth = %d\n", max_hook_depth); + + b = UnhookWindowsHookEx(recursive_hook); + ok(b, "UnhokWindowsHookEx failed\n"); + + DestroyWindow(hook_hwnd); +} + static const struct message ScrollWindowPaint1[] = { { WM_PAINT, sent }, { WM_ERASEBKGND, sent|beginpaint }, @@ -10336,13 +10479,14 @@ { MSG msg; DWORD time; - BOOL ret, go = FALSE; + BOOL ret; time = GetTickCount(); - while (GetTickCount() - time < 200 && !go) { + while (GetTickCount() - time < 200) { ret = PeekMessageA(&msg, hwnd, WM_MOUSEMOVE, WM_MOUSEMOVE, PM_NOREMOVE); - go = ret && msg.pt.x > x && msg.pt.y > y; + if (ret && msg.pt.x > x && msg.pt.y > y) break; if (!ret) MsgWaitForMultipleObjects( 0, NULL, FALSE, GetTickCount() - time, QS_ALLINPUT ); + else Sleep( GetTickCount() - time ); } } @@ -10517,6 +10661,25 @@ ok(ret && msg.message == WM_TIMER, "msg.message = %u instead of WM_TIMER\n", msg.message); ret = GetMessageA(&msg, NULL, 0, 0); ok(ret && msg.message == WM_USER + 1, "msg.message = %u instead of WM_USER + 1\n", msg.message); + ret = PeekMessageA(&msg, NULL, 0, 0, 0); + ok(!ret, "expected PeekMessage to return FALSE, got %u\n", ret); + + /* Newer messages are still returned when specifying a message range. */ + + SetTimer(hwnd, 1, 0, NULL); + while (!PeekMessageA(&msg, NULL, WM_TIMER, WM_TIMER, PM_NOREMOVE)); + ok(msg.message == WM_TIMER, "msg.message = %u instead of WM_TIMER\n", msg.message); + PostMessageA(hwnd, WM_USER + 1, 0, 0); + PostMessageA(hwnd, WM_USER, 0, 0); + ret = PeekMessageA(&msg, NULL, WM_USER, WM_USER, PM_NOREMOVE); + todo_wine + ok(ret && msg.message == WM_USER, "msg.message = %u instead of WM_USER\n", msg.message); + ret = PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE); + ok(ret && msg.message == WM_TIMER, "msg.message = %u instead of WM_TIMER\n", msg.message); + ret = PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE); + ok(ret && msg.message == WM_USER + 1, "msg.message = %u instead of WM_USER + 1\n", msg.message); + ret = PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE); + ok(ret && msg.message == WM_USER, "msg.message = %u instead of WM_USER\n", msg.message); ret = PeekMessageA(&msg, NULL, 0, 0, 0); ok(!ret, "expected PeekMessage to return FALSE, got %u\n", ret); @@ -11955,6 +12118,18 @@ DestroyWindow(hwnd); } +static DWORD get_input_codepage( void ) +{ + DWORD cp; + int ret; + HKL hkl = GetKeyboardLayout( 0 ); + + ret = GetLocaleInfoW( LOWORD(hkl), LOCALE_IDEFAULTANSICODEPAGE | LOCALE_RETURN_NUMBER, + (WCHAR *)&cp, sizeof(cp) / sizeof(WCHAR) ); + if (!ret) cp = CP_ACP; + return cp; +} + static void test_dbcs_wm_char(void) { BYTE dbch[2]; @@ -11968,6 +12143,7 @@ UINT i, j, k; struct message wmCharSeq[2]; BOOL ret; + DWORD cp = get_input_codepage(); if (!pGetCPInfoExA) { @@ -11975,7 +12151,7 @@ return; } - pGetCPInfoExA( CP_ACP, 0, &cpinfo ); + pGetCPInfoExA( cp, 0, &cpinfo ); if (cpinfo.MaxCharSize != 2) { skip( "Skipping DBCS WM_CHAR test in SBCS codepage '%s'\n", cpinfo.CodePageName ); @@ -11993,8 +12169,8 @@ WCHAR wstr[2]; str[0] = j; str[1] = k; - if (MultiByteToWideChar( CP_ACP, 0, str, 2, wstr, 2 ) == 1 && - WideCharToMultiByte( CP_ACP, 0, wstr, 1, str, 2, NULL, NULL ) == 2 && + if (MultiByteToWideChar( cp, 0, str, 2, wstr, 2 ) == 1 && + WideCharToMultiByte( cp, 0, wstr, 1, str, 2, NULL, NULL ) == 2 && (BYTE)str[0] == j && (BYTE)str[1] == k && HIBYTE(wstr[0]) && HIBYTE(wstr[0]) != 0xff) { @@ -14853,7 +15029,11 @@ test_timers(); test_timers_no_wnd(); test_timers_exceptions(); - if (hCBT_hook) test_set_hook(); + if (hCBT_hook) + { + test_set_hook(); + test_recursive_hook(); + } test_DestroyWindow(); test_DispatchMessage(); test_SendMessageTimeout(); @@ -15107,7 +15287,11 @@ pUnhookWinEvent = 0; } hEvent_hook = 0; - if (hCBT_hook) test_set_hook(); + if (hCBT_hook) + { + test_set_hook(); + test_recursive_hook(); + } cleanup_tests(); } Modified: trunk/rostests/winetests/user32/sysparams.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/sysparam… ============================================================================== --- trunk/rostests/winetests/user32/sysparams.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/sysparams.c [iso-8859-1] Tue Dec 8 10:22:43 2015 @@ -2651,6 +2651,23 @@ ok( !( exp1 != act && exp2 != act && exp3 != act),"GetSystemMetrics(%s): expected %d or %d or %d actual %d\n", #i, exp1, exp2, exp3, act);\ } +static INT CALLBACK enum_all_fonts_proc(const LOGFONTA *elf, const TEXTMETRICA *ntm, DWORD type, LPARAM lparam) +{ + return lstrcmpiA(elf->lfFaceName, (const char *)lparam); +} + +static BOOL is_font_enumerated(const char *name) +{ + HDC hdc = CreateCompatibleDC(0); + BOOL ret = FALSE; + + if (!EnumFontFamiliesA(hdc, NULL, enum_all_fonts_proc, (LPARAM)name)) + ret = TRUE; + + DeleteDC(hdc); + return ret; +} + static void test_GetSystemMetrics( void) { TEXTMETRICA tmMenuFont; @@ -2692,6 +2709,13 @@ win_skip("SPI_GETNONCLIENTMETRICS is not available\n"); return; } + + ok(is_font_enumerated(ncm.lfCaptionFont.lfFaceName), "font %s should be enumerated\n", ncm.lfCaptionFont.lfFaceName); + ok(is_font_enumerated(ncm.lfSmCaptionFont.lfFaceName), "font %s should be enumerated\n", ncm.lfSmCaptionFont.lfFaceName); + ok(is_font_enumerated(ncm.lfMenuFont.lfFaceName), "font %s should be enumerated\n", ncm.lfMenuFont.lfFaceName); + ok(is_font_enumerated(ncm.lfStatusFont.lfFaceName), "font %s should be enumerated\n", ncm.lfStatusFont.lfFaceName); + ok(is_font_enumerated(ncm.lfMessageFont.lfFaceName), "font %s should be enumerated\n", ncm.lfMessageFont.lfFaceName); + /* CaptionWidth from the registry may have different value of iCaptionWidth * from the non client metrics (observed on WinXP) */ CaptionWidthfromreg = metricfromreg( Modified: trunk/rostests/winetests/user32/win.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/win.c?re… ============================================================================== --- trunk/rostests/winetests/user32/win.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/win.c [iso-8859-1] Tue Dec 8 10:22:43 2015 @@ -57,6 +57,7 @@ static BOOL (WINAPI *pGetGUIThreadInfo)(DWORD, GUITHREADINFO*); static BOOL (WINAPI *pGetProcessDefaultLayout)( DWORD *layout ); static BOOL (WINAPI *pSetProcessDefaultLayout)( DWORD layout ); +static BOOL (WINAPI *pFlashWindow)( HWND hwnd, BOOL bInvert ); static BOOL (WINAPI *pFlashWindowEx)( PFLASHWINFO pfwi ); static DWORD (WINAPI *pSetLayout)(HDC hdc, DWORD layout); static DWORD (WINAPI *pGetLayout)(HDC hdc); @@ -68,6 +69,7 @@ static HWND hwndMessage; static HWND hwndMain, hwndMain2; static HHOOK hhook; +static BOOL app_activated, app_deactivated; static const char* szAWRClass = "Winsize"; static HMENU hmenu; @@ -716,6 +718,13 @@ ok( !WaitForSingleObject( handle, 10000 ), "wait failed\n" ); CloseHandle( handle ); } + +static struct wm_gettext_override_data +{ + BOOL enabled; /* when 1 bypasses default procedure */ + char *buff; /* expected text buffer pointer */ + WCHAR *buffW; /* same, for W test */ +} g_wm_gettext_override; static LRESULT WINAPI main_window_procA(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { @@ -798,9 +807,39 @@ break; case WM_GETTEXT: num_gettext_msgs++; + if (g_wm_gettext_override.enabled) + { + char *text = (char*)lparam; + ok(g_wm_gettext_override.buff == text, "expected buffer %p, got %p\n", g_wm_gettext_override.buff, text); + ok(*text == 0, "expected empty string buffer %x\n", *text); + return 0; + } break; case WM_SETTEXT: num_settext_msgs++; + break; + case WM_ACTIVATEAPP: + if (wparam) app_activated = TRUE; + else app_deactivated = TRUE; + break; + } + + return DefWindowProcA(hwnd, msg, wparam, lparam); +} + +static LRESULT WINAPI main_window_procW(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + switch (msg) + { + case WM_GETTEXT: + num_gettext_msgs++; + if (g_wm_gettext_override.enabled) + { + WCHAR *text = (WCHAR*)lparam; + ok(g_wm_gettext_override.buffW == text, "expected buffer %p, got %p\n", g_wm_gettext_override.buffW, text); + ok(*text == 0, "expected empty string buffer %x\n", *text); + return 0; + } break; } @@ -832,8 +871,11 @@ return DefWindowProcA(hwnd, msg, wparam, lparam); } +static const WCHAR mainclassW[] = {'M','a','i','n','W','i','n','d','o','w','C','l','a','s','s','W',0}; + static BOOL RegisterWindowClasses(void) { + WNDCLASSW clsW; WNDCLASSA cls; cls.style = CS_DBLCLKS; @@ -848,6 +890,19 @@ cls.lpszClassName = "MainWindowClass"; if(!RegisterClassA(&cls)) return FALSE; + + clsW.style = CS_DBLCLKS; + clsW.lpfnWndProc = main_window_procW; + clsW.cbClsExtra = 0; + clsW.cbWndExtra = 0; + clsW.hInstance = GetModuleHandleA(0); + clsW.hIcon = 0; + clsW.hCursor = LoadCursorA(0, (LPCSTR)IDC_ARROW); + clsW.hbrBackground = GetStockObject(WHITE_BRUSH); + clsW.lpszMenuName = NULL; + clsW.lpszClassName = mainclassW; + + if(!RegisterClassW(&clsW)) return FALSE; cls.style = 0; cls.lpfnWndProc = tool_window_procA; @@ -1240,7 +1295,7 @@ static void test_MDI_create(HWND parent, HWND mdi_client, INT_PTR first_id) { MDICREATESTRUCTA mdi_cs; - HWND mdi_child; + HWND mdi_child, hwnd, exp_hwnd; INT_PTR id; static const WCHAR classW[] = {'M','D','I','_','c','h','i','l','d','_','C','l','a','s','s','_','1',0}; static const WCHAR titleW[] = {'M','D','I',' ','c','h','i','l','d',0}; @@ -1259,6 +1314,9 @@ ok(mdi_child != 0, "MDI child creation failed\n"); id = GetWindowLongPtrA(mdi_child, GWLP_ID); ok(id == first_id, "wrong child id %ld\n", id); + hwnd = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0); + exp_hwnd = (GetWindowLongW(mdi_child, GWL_STYLE) & WS_VISIBLE) ? mdi_child : 0; + ok(hwnd == exp_hwnd, "WM_MDIGETACTIVE should return %p, got %p\n", exp_hwnd, hwnd); SendMessageA(mdi_client, WM_MDIDESTROY, (WPARAM)mdi_child, 0); ok(!IsWindow(mdi_child), "WM_MDIDESTROY failed\n"); @@ -1267,6 +1325,9 @@ ok(mdi_child != 0, "MDI child creation failed\n"); id = GetWindowLongPtrA(mdi_child, GWLP_ID); ok(id == first_id, "wrong child id %ld\n", id); + hwnd = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0); +todo_wine + ok(!hwnd, "WM_MDIGETACTIVE should return 0, got %p\n", hwnd); SendMessageA(mdi_client, WM_MDIDESTROY, (WPARAM)mdi_child, 0); ok(!IsWindow(mdi_child), "WM_MDIDESTROY failed\n"); @@ -1281,6 +1342,9 @@ ok(mdi_child != 0, "MDI child creation failed\n"); id = GetWindowLongPtrA(mdi_child, GWLP_ID); ok(id == first_id, "wrong child id %ld\n", id); + hwnd = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0); +todo_wine + ok(!hwnd, "WM_MDIGETACTIVE should return 0, got %p\n", hwnd); SendMessageA(mdi_client, WM_MDIDESTROY, (WPARAM)mdi_child, 0); ok(!IsWindow(mdi_child), "WM_MDIDESTROY failed\n"); } @@ -1303,6 +1367,9 @@ { id = GetWindowLongPtrA(mdi_child, GWLP_ID); ok(id == first_id, "wrong child id %ld\n", id); + hwnd = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0); + exp_hwnd = (GetWindowLongW(mdi_child, GWL_STYLE) & WS_VISIBLE) ? mdi_child : 0; + ok(hwnd == exp_hwnd, "WM_MDIGETACTIVE should return %p, got %p\n", exp_hwnd, hwnd); SendMessageA(mdi_client, WM_MDIDESTROY, (WPARAM)mdi_child, 0); ok(!IsWindow(mdi_child), "WM_MDIDESTROY failed\n"); } @@ -1316,6 +1383,9 @@ ok(mdi_child != 0, "MDI child creation failed\n"); id = GetWindowLongPtrA(mdi_child, GWLP_ID); ok(id == first_id, "wrong child id %ld\n", id); + hwnd = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0); + exp_hwnd = (GetWindowLongW(mdi_child, GWL_STYLE) & WS_VISIBLE) ? mdi_child : 0; + ok(hwnd == exp_hwnd, "WM_MDIGETACTIVE should return %p, got %p\n", exp_hwnd, hwnd); SendMessageA(mdi_client, WM_MDIDESTROY, (WPARAM)mdi_child, 0); ok(!IsWindow(mdi_child), "WM_MDIDESTROY failed\n"); @@ -1328,6 +1398,9 @@ ok(mdi_child != 0, "MDI child creation failed\n"); id = GetWindowLongPtrA(mdi_child, GWLP_ID); ok(id == first_id, "wrong child id %ld\n", id); + hwnd = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0); +todo_wine + ok(!hwnd, "WM_MDIGETACTIVE should return 0, got %p\n", hwnd); SendMessageA(mdi_client, WM_MDIDESTROY, (WPARAM)mdi_child, 0); ok(!IsWindow(mdi_child), "WM_MDIDESTROY failed\n"); @@ -1346,6 +1419,9 @@ ok(mdi_child != 0, "MDI child creation failed\n"); id = GetWindowLongPtrA(mdi_child, GWLP_ID); ok(id == first_id, "wrong child id %ld\n", id); + hwnd = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0); +todo_wine + ok(!hwnd, "WM_MDIGETACTIVE should return 0, got %p\n", hwnd); SendMessageA(mdi_client, WM_MDIDESTROY, (WPARAM)mdi_child, 0); ok(!IsWindow(mdi_child), "WM_MDIDESTROY failed\n"); } @@ -1369,6 +1445,9 @@ { id = GetWindowLongPtrA(mdi_child, GWLP_ID); ok(id == first_id, "wrong child id %ld\n", id); + hwnd = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0); + exp_hwnd = (GetWindowLongW(mdi_child, GWL_STYLE) & WS_VISIBLE) ? mdi_child : 0; + ok(hwnd == exp_hwnd, "WM_MDIGETACTIVE should return %p, got %p\n", exp_hwnd, hwnd); SendMessageA(mdi_client, WM_MDIDESTROY, (WPARAM)mdi_child, 0); ok(!IsWindow(mdi_child), "WM_MDIDESTROY failed\n"); } @@ -1382,6 +1461,9 @@ ok(mdi_child != 0, "MDI child creation failed\n"); id = GetWindowLongPtrA(mdi_child, GWLP_ID); ok(id == first_id, "wrong child id %ld\n", id); + hwnd = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0); + exp_hwnd = (GetWindowLongW(mdi_child, GWL_STYLE) & WS_VISIBLE) ? mdi_child : 0; + ok(hwnd == exp_hwnd, "WM_MDIGETACTIVE should return %p, got %p\n", exp_hwnd, hwnd); SendMessageA(mdi_client, WM_MDIDESTROY, (WPARAM)mdi_child, 0); ok(!IsWindow(mdi_child), "WM_MDIDESTROY failed\n"); @@ -1394,6 +1476,9 @@ ok(mdi_child != 0, "MDI child creation failed\n"); id = GetWindowLongPtrA(mdi_child, GWLP_ID); ok(id == first_id, "wrong child id %ld\n", id); + hwnd = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0); +todo_wine + ok(!hwnd, "WM_MDIGETACTIVE should return 0, got %p\n", hwnd); SendMessageA(mdi_client, WM_MDIDESTROY, (WPARAM)mdi_child, 0); ok(!IsWindow(mdi_child), "WM_MDIDESTROY failed\n"); @@ -1412,6 +1497,9 @@ ok(mdi_child != 0, "MDI child creation failed\n"); id = GetWindowLongPtrA(mdi_child, GWLP_ID); ok(id == first_id, "wrong child id %ld\n", id); + hwnd = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0); +todo_wine + ok(!hwnd, "WM_MDIGETACTIVE should return 0, got %p\n", hwnd); SendMessageA(mdi_client, WM_MDIDESTROY, (WPARAM)mdi_child, 0); ok(!IsWindow(mdi_child), "WM_MDIDESTROY failed\n"); } @@ -1435,6 +1523,9 @@ { id = GetWindowLongPtrA(mdi_child, GWLP_ID); ok(id == first_id, "wrong child id %ld\n", id); + hwnd = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0); + exp_hwnd = (GetWindowLongW(mdi_child, GWL_STYLE) & WS_VISIBLE) ? mdi_child : 0; + ok(hwnd == exp_hwnd, "WM_MDIGETACTIVE should return %p, got %p\n", exp_hwnd, hwnd); SendMessageA(mdi_client, WM_MDIDESTROY, (WPARAM)mdi_child, 0); ok(!IsWindow(mdi_child), "WM_MDIDESTROY failed\n"); } @@ -1460,6 +1551,8 @@ ok(mdi_child != 0, "MDI child creation failed\n"); id = GetWindowLongPtrA(mdi_child, GWLP_ID); ok(id == 0, "wrong child id %ld\n", id); + hwnd = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0); + ok(!hwnd, "WM_MDIGETACTIVE should return 0, got %p\n", hwnd); DestroyWindow(mdi_child); mdi_child = CreateWindowExA(0, "MDI_child_Class_2", "MDI child", @@ -1471,6 +1564,8 @@ ok(mdi_child != 0, "MDI child creation failed\n"); id = GetWindowLongPtrA(mdi_child, GWLP_ID); ok(id == 0, "wrong child id %ld\n", id); + hwnd = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0); + ok(!hwnd, "WM_MDIGETACTIVE should return 0, got %p\n", hwnd); DestroyWindow(mdi_child); /* maximized child */ @@ -1483,6 +1578,8 @@ ok(mdi_child != 0, "MDI child creation failed\n"); id = GetWindowLongPtrA(mdi_child, GWLP_ID); ok(id == 0, "wrong child id %ld\n", id); + hwnd = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0); + ok(!hwnd, "WM_MDIGETACTIVE should return 0, got %p\n", hwnd); DestroyWindow(mdi_child); trace("Creating maximized child with a caption\n"); @@ -1495,6 +1592,8 @@ ok(mdi_child != 0, "MDI child creation failed\n"); id = GetWindowLongPtrA(mdi_child, GWLP_ID); ok(id == 0, "wrong child id %ld\n", id); + hwnd = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0); + ok(!hwnd, "WM_MDIGETACTIVE should return 0, got %p\n", hwnd); DestroyWindow(mdi_child); trace("Creating maximized child with a caption and a thick frame\n"); @@ -1507,6 +1606,8 @@ ok(mdi_child != 0, "MDI child creation failed\n"); id = GetWindowLongPtrA(mdi_child, GWLP_ID); ok(id == 0, "wrong child id %ld\n", id); + hwnd = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0); + ok(!hwnd, "WM_MDIGETACTIVE should return 0, got %p\n", hwnd); DestroyWindow(mdi_child); } @@ -1819,51 +1920,7 @@ switch (msg) { case WM_CREATE: - { - CLIENTCREATESTRUCT client_cs; - RECT rc; - - GetClientRect(hwnd, &rc); - - client_cs.hWindowMenu = 0; - client_cs.idFirstChild = 1; - - /* MDIClient without MDIS_ALLCHILDSTYLES */ - mdi_client = CreateWindowExA(0, "mdiclient", - NULL, - WS_CHILD /*| WS_VISIBLE*/, - /* tests depend on a not zero MDIClient size */ - 0, 0, rc.right, rc.bottom, - hwnd, 0, GetModuleHandleA(NULL), - &client_cs); - assert(mdi_client); - test_MDI_create(hwnd, mdi_client, client_cs.idFirstChild); - DestroyWindow(mdi_client); - - /* MDIClient with MDIS_ALLCHILDSTYLES */ - mdi_client = CreateWindowExA(0, "mdiclient", - NULL, - WS_CHILD | MDIS_ALLCHILDSTYLES /*| WS_VISIBLE*/, - /* tests depend on a not zero MDIClient size */ - 0, 0, rc.right, rc.bottom, - hwnd, 0, GetModuleHandleA(NULL), - &client_cs); - assert(mdi_client); - test_MDI_create(hwnd, mdi_client, client_cs.idFirstChild); - DestroyWindow(mdi_client); - - /* Test child window stack management */ - mdi_client = CreateWindowExA(0, "mdiclient", - NULL, - WS_CHILD, - 0, 0, rc.right, rc.bottom, - hwnd, 0, GetModuleHandleA(NULL), - &client_cs); - assert(mdi_client); - test_MDI_child_stack(mdi_client); - DestroyWindow(mdi_client); - break; - } + return 1; case WM_WINDOWPOSCHANGED: { @@ -1943,7 +2000,9 @@ static void test_mdi(void) { - HWND mdi_hwndMain; + HWND mdi_hwndMain, mdi_client; + CLIENTCREATESTRUCT client_cs; + RECT rc; /*MSG msg;*/ if (!mdi_RegisterWindowClasses()) assert(0); @@ -1955,6 +2014,46 @@ GetDesktopWindow(), 0, GetModuleHandleA(NULL), NULL); assert(mdi_hwndMain); + + GetClientRect(mdi_hwndMain, &rc); + + client_cs.hWindowMenu = 0; + client_cs.idFirstChild = 1; + + /* MDIClient without MDIS_ALLCHILDSTYLES */ + mdi_client = CreateWindowExA(0, "mdiclient", + NULL, + WS_CHILD /*| WS_VISIBLE*/, + /* tests depend on a not zero MDIClient size */ + 0, 0, rc.right, rc.bottom, + mdi_hwndMain, 0, GetModuleHandleA(NULL), + &client_cs); + assert(mdi_client); + test_MDI_create(mdi_hwndMain, mdi_client, client_cs.idFirstChild); + DestroyWindow(mdi_client); + + /* MDIClient with MDIS_ALLCHILDSTYLES */ + mdi_client = CreateWindowExA(0, "mdiclient", + NULL, + WS_CHILD | MDIS_ALLCHILDSTYLES /*| WS_VISIBLE*/, + /* tests depend on a not zero MDIClient size */ + 0, 0, rc.right, rc.bottom, + mdi_hwndMain, 0, GetModuleHandleA(NULL), + &client_cs); + assert(mdi_client); + test_MDI_create(mdi_hwndMain, mdi_client, client_cs.idFirstChild); + DestroyWindow(mdi_client); + + /* Test child window stack management */ + mdi_client = CreateWindowExA(0, "mdiclient", + NULL, + WS_CHILD, + 0, 0, rc.right, rc.bottom, + mdi_hwndMain, 0, GetModuleHandleA(NULL), + &client_cs); + assert(mdi_client); + test_MDI_child_stack(mdi_client); + DestroyWindow(mdi_client); /* while(GetMessage(&msg, 0, 0, 0)) { @@ -5726,11 +5825,12 @@ static void test_gettext(void) { DWORD tid, num_msgs; + WCHAR bufW[32]; HANDLE thread; BOOL success; char buf[32]; INT buf_len; - HWND hwnd; + HWND hwnd, hwnd2; LRESULT r; MSG msg; @@ -5744,6 +5844,68 @@ ok( buf_len != 0, "expected a nonempty window text\n" ); ok( !strcmp(buf, "caption"), "got wrong window text '%s'\n", buf ); ok( num_gettext_msgs == 1, "got %u WM_GETTEXT messages\n", num_gettext_msgs ); + + /* other process window */ + strcpy( buf, "a" ); + buf_len = GetWindowTextA( GetDesktopWindow(), buf, sizeof(buf) ); + ok( buf_len == 0, "expected a nonempty window text\n" ); + ok( *buf == 0, "got wrong window text '%s'\n", buf ); + + strcpy( buf, "blah" ); + buf_len = GetWindowTextA( GetDesktopWindow(), buf, 0 ); + ok( buf_len == 0, "expected a nonempty window text\n" ); + ok( !strcmp(buf, "blah"), "got wrong window text '%s'\n", buf ); + + bufW[0] = 0xcc; + buf_len = GetWindowTextW( GetDesktopWindow(), bufW, 0 ); + ok( buf_len == 0, "expected a nonempty window text\n" ); + ok( bufW[0] == 0xcc, "got %x\n", bufW[0] ); + + g_wm_gettext_override.enabled = TRUE; + + num_gettext_msgs = 0; + memset( buf, 0xcc, sizeof(buf) ); + g_wm_gettext_override.buff = buf; + buf_len = GetWindowTextA( hwnd, buf, sizeof(buf) ); + ok( buf_len == 0, "got %d\n", buf_len ); + ok( *buf == 0, "got %x\n", *buf ); + ok( num_gettext_msgs == 1, "got %u WM_GETTEXT messages\n", num_gettext_msgs ); + + num_gettext_msgs = 0; + strcpy( buf, "blah" ); + g_wm_gettext_override.buff = buf; + buf_len = GetWindowTextA( hwnd, buf, 0 ); + ok( buf_len == 0, "got %d\n", buf_len ); + ok( !strcmp(buf, "blah"), "got %s\n", buf ); + ok( num_gettext_msgs == 0, "got %u WM_GETTEXT messages\n", num_gettext_msgs ); + + g_wm_gettext_override.enabled = FALSE; + + /* same for W window */ + hwnd2 = CreateWindowExW( 0, mainclassW, NULL, WS_POPUP, 0, 0, 0, 0, 0, 0, 0, NULL ); + ok( hwnd2 != 0, "CreateWindowExA error %d\n", GetLastError() ); + + g_wm_gettext_override.enabled = TRUE; + + num_gettext_msgs = 0; + memset( bufW, 0xcc, sizeof(bufW) ); + g_wm_gettext_override.buffW = bufW; + buf_len = GetWindowTextW( hwnd2, bufW, sizeof(bufW)/sizeof(WCHAR) ); + ok( buf_len == 0, "got %d\n", buf_len ); + ok( *bufW == 0, "got %x\n", *bufW ); + ok( num_gettext_msgs == 1, "got %u WM_GETTEXT messages\n", num_gettext_msgs ); + + num_gettext_msgs = 0; + memset( bufW, 0xcc, sizeof(bufW) ); + g_wm_gettext_override.buffW = bufW; + buf_len = GetWindowTextW( hwnd2, bufW, 0 ); + ok( buf_len == 0, "got %d\n", buf_len ); + ok( *bufW == 0xcccc, "got %x\n", *bufW ); + ok( num_gettext_msgs == 0, "got %u WM_GETTEXT messages\n", num_gettext_msgs ); + + g_wm_gettext_override.enabled = FALSE; + + DestroyWindow( hwnd2 ); /* test WM_GETTEXT */ num_gettext_msgs = 0; @@ -6324,10 +6486,12 @@ ret = pUpdateLayeredWindowIndirect( hwnd, &info ); ok( ret, "UpdateLayeredWindowIndirect should succeed on layered window\n" ); sz.cx--; + SetLastError(0); ret = pUpdateLayeredWindowIndirect( hwnd, &info ); ok( !ret, "UpdateLayeredWindowIndirect should fail\n" ); - ok( GetLastError() == ERROR_INCORRECT_SIZE || broken(GetLastError() == ERROR_MR_MID_NOT_FOUND), - "wrong error %u\n", GetLastError() ); + /* particular error code differs from version to version, could be ERROR_INCORRECT_SIZE, + ERROR_MR_MID_NOT_FOUND or ERROR_GEN_FAILURE (Win8/Win10) */ + ok( GetLastError() != 0, "wrong error %u\n", GetLastError() ); info.dwFlags = ULW_OPAQUE; ret = pUpdateLayeredWindowIndirect( hwnd, &info ); ok( ret, "UpdateLayeredWindowIndirect should succeed on layered window\n" ); @@ -6954,6 +7118,33 @@ DestroyWindow( parent ); } +static void test_FlashWindow(void) +{ + HWND hwnd; + BOOL ret; + if (!pFlashWindow) + { + win_skip( "FlashWindow not supported\n" ); + return; + } + + hwnd = CreateWindowExA( 0, "MainWindowClass", "FlashWindow", WS_POPUP, + 0, 0, 0, 0, 0, 0, 0, NULL ); + ok( hwnd != 0, "CreateWindowExA error %d\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = pFlashWindow( NULL, TRUE ); + ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, + "FlashWindow returned with %d\n", GetLastError() ); + + DestroyWindow( hwnd ); + + SetLastError( 0xdeadbeef ); + ret = pFlashWindow( hwnd, TRUE ); + ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, + "FlashWindow returned with %d\n", GetLastError() ); +} + static void test_FlashWindowEx(void) { HWND hwnd; @@ -6977,13 +7168,13 @@ finfo.hwnd = NULL; SetLastError(0xdeadbeef); ret = pFlashWindowEx(&finfo); - todo_wine ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, - "FlashWindowEx returned with %d\n", GetLastError()); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, + "FlashWindowEx returned with %d\n", GetLastError()); finfo.hwnd = hwnd; SetLastError(0xdeadbeef); ret = pFlashWindowEx(NULL); - todo_wine ok(!ret && GetLastError() == ERROR_NOACCESS, + ok(!ret && GetLastError() == ERROR_NOACCESS, "FlashWindowEx returned with %d\n", GetLastError()); SetLastError(0xdeadbeef); @@ -6993,13 +7184,13 @@ finfo.cbSize = sizeof(FLASHWINFO) - 1; SetLastError(0xdeadbeef); ret = pFlashWindowEx(&finfo); - todo_wine ok(!ret && GetLastError()==ERROR_INVALID_PARAMETER, + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "FlashWindowEx succeeded\n"); finfo.cbSize = sizeof(FLASHWINFO) + 1; SetLastError(0xdeadbeef); ret = pFlashWindowEx(&finfo); - todo_wine ok(!ret && GetLastError()==ERROR_INVALID_PARAMETER, + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "FlashWindowEx succeeded\n"); finfo.cbSize = sizeof(FLASHWINFO); @@ -7007,7 +7198,7 @@ SetLastError(0xdeadbeef); ret = pFlashWindowEx(&finfo); - todo_wine ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "FlashWindowEx returned with %d\n", GetLastError()); ok(finfo.cbSize == sizeof(FLASHWINFO), "FlashWindowEx modified cdSize to %x\n", finfo.cbSize); @@ -7023,7 +7214,7 @@ SetLastError(0xdeadbeef); ret = pFlashWindowEx(NULL); - todo_wine ok(!ret && GetLastError() == ERROR_NOACCESS, + ok(!ret && GetLastError() == ERROR_NOACCESS, "FlashWindowEx returned with %d\n", GetLastError()); SetLastError(0xdeadbeef); @@ -7038,7 +7229,6 @@ finfo.dwFlags = FLASHW_STOP; SetLastError(0xdeadbeef); ret = pFlashWindowEx(&finfo); -todo_wine ok(prev != ret, "previous window state should be different\n"); DestroyWindow( hwnd ); @@ -8044,6 +8234,224 @@ DestroyWindow(button); } +#define SET_FOREGROUND_STEAL_1 0x01 +#define SET_FOREGROUND_SET_1 0x02 +#define SET_FOREGROUND_STEAL_2 0x04 +#define SET_FOREGROUND_SET_2 0x08 +#define SET_FOREGROUND_INJECT 0x10 + +struct set_foreground_thread_params +{ + UINT msg_quit, msg_command; + HWND window1, window2, thread_window; + HANDLE command_executed; +}; + +static DWORD WINAPI set_foreground_thread(void *params) +{ + struct set_foreground_thread_params *p = params; + MSG msg; + + p->thread_window = CreateWindowExA(0, "static", "thread window", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 10, 10, 0, 0, 0, NULL); + SetEvent(p->command_executed); + + while(GetMessageA(&msg, 0, 0, 0)) + { + if (msg.message == p->msg_quit) + break; + + if (msg.message == p->msg_command) + { + if (msg.wParam & SET_FOREGROUND_STEAL_1) + { + SetForegroundWindow(p->thread_window); + check_wnd_state(p->thread_window, p->thread_window, p->thread_window, 0); + } + if (msg.wParam & SET_FOREGROUND_INJECT) + { + SendNotifyMessageA(p->window1, WM_ACTIVATEAPP, 0, 0); + } + if (msg.wParam & SET_FOREGROUND_SET_1) + { + SetForegroundWindow(p->window1); + check_wnd_state(0, p->window1, 0, 0); + } + if (msg.wParam & SET_FOREGROUND_STEAL_2) + { + SetForegroundWindow(p->thread_window); + check_wnd_state(p->thread_window, p->thread_window, p->thread_window, 0); + } + if (msg.wParam & SET_FOREGROUND_SET_2) + { + SetForegroundWindow(p->window2); + check_wnd_state(0, p->window2, 0, 0); + } + + SetEvent(p->command_executed); + continue; + } + + TranslateMessage(&msg); + DispatchMessageA(&msg); + } + + DestroyWindow(p->thread_window); + return 0; +} + +static void test_activateapp(HWND window1) +{ + HWND window2, test_window; + HANDLE thread; + struct set_foreground_thread_params thread_params; + DWORD tid; + MSG msg; + + window2 = CreateWindowExA(0, "static", "window 2", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 300, 0, 10, 10, 0, 0, 0, NULL); + thread_params.msg_quit = WM_USER; + thread_params.msg_command = WM_USER + 1; + thread_params.window1 = window1; + thread_params.window2 = window2; + thread_params.command_executed = CreateEventW(NULL, FALSE, FALSE, NULL); + + thread = CreateThread(NULL, 0, set_foreground_thread, &thread_params, 0, &tid); + WaitForSingleObject(thread_params.command_executed, INFINITE); + + SetForegroundWindow(window1); + check_wnd_state(window1, window1, window1, 0); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + + /* Steal foreground: WM_ACTIVATEAPP(0) is delivered. */ + app_activated = app_deactivated = FALSE; + PostThreadMessageA(tid, thread_params.msg_command, SET_FOREGROUND_STEAL_1, 0); + WaitForSingleObject(thread_params.command_executed, INFINITE); + test_window = GetForegroundWindow(); + ok(test_window == thread_params.thread_window, "Expected foreground window %p, got %p\n", + thread_params.thread_window, test_window); + /* Active and Focus window are sometimes 0 on KDE. Ignore them. + * check_wnd_state(window1, thread_params.thread_window, window1, 0); */ + ok(!app_activated, "Received WM_ACTIVATEAPP(1), did not expect it.\n"); + ok(!app_deactivated, "Received WM_ACTIVATEAPP(0), did not expect it.\n"); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + check_wnd_state(0, thread_params.thread_window, 0, 0); + test_window = GetForegroundWindow(); + ok(test_window == thread_params.thread_window, "Expected foreground window %p, got %p\n", + thread_params.thread_window, test_window); + ok(!app_activated, "Received WM_ACTIVATEAPP(1), did not expect it.\n"); + /* This message is reliable on Windows and inside a virtual desktop. + * It is unreliable on KDE (50/50) and never arrives on FVWM. + * ok(app_deactivated, "Expected WM_ACTIVATEAPP(0), did not receive it.\n"); */ + + /* Set foreground: WM_ACTIVATEAPP (1) is delivered. */ + app_activated = app_deactivated = FALSE; + PostThreadMessageA(tid, thread_params.msg_command, SET_FOREGROUND_SET_1, 0); + WaitForSingleObject(thread_params.command_executed, INFINITE); + check_wnd_state(0, 0, 0, 0); + test_window = GetForegroundWindow(); + ok(!test_window, "Expected foreground window 0, got %p\n", test_window); + ok(!app_activated, "Received WM_ACTIVATEAPP(!= 0), did not expect it.\n"); + ok(!app_deactivated, "Received WM_ACTIVATEAPP(0), did not expect it.\n"); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + check_wnd_state(window1, window1, window1, 0); + test_window = GetForegroundWindow(); + ok(test_window == window1, "Expected foreground window %p, got %p\n", + window1, test_window); + ok(app_activated, "Expected WM_ACTIVATEAPP(1), did not receive it.\n"); + ok(!app_deactivated, "Received WM_ACTIVATEAPP(0), did not expect it.\n"); + + /* Steal foreground then set it back: No messages are delivered. */ + app_activated = app_deactivated = FALSE; + PostThreadMessageA(tid, thread_params.msg_command, SET_FOREGROUND_STEAL_1 | SET_FOREGROUND_SET_1, 0); + WaitForSingleObject(thread_params.command_executed, INFINITE); + test_window = GetForegroundWindow(); + ok(test_window == window1, "Expected foreground window %p, got %p\n", + window1, test_window); + check_wnd_state(window1, window1, window1, 0); + ok(!app_activated, "Received WM_ACTIVATEAPP(1), did not expect it.\n"); + ok(!app_deactivated, "Received WM_ACTIVATEAPP(0), did not expect it.\n"); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + test_window = GetForegroundWindow(); + ok(test_window == window1, "Expected foreground window %p, got %p\n", + window1, test_window); + check_wnd_state(window1, window1, window1, 0); + ok(!app_activated, "Received WM_ACTIVATEAPP(1), did not expect it.\n"); + ok(!app_deactivated, "Received WM_ACTIVATEAPP(0), did not expect it.\n"); + + /* This is not implemented with a plain WM_ACTIVATEAPP filter. */ + app_activated = app_deactivated = FALSE; + PostThreadMessageA(tid, thread_params.msg_command, SET_FOREGROUND_STEAL_1 + | SET_FOREGROUND_INJECT | SET_FOREGROUND_SET_1, 0); + WaitForSingleObject(thread_params.command_executed, INFINITE); + test_window = GetForegroundWindow(); + ok(test_window == window1, "Expected foreground window %p, got %p\n", + window1, test_window); + check_wnd_state(window1, window1, window1, 0); + ok(!app_activated, "Received WM_ACTIVATEAPP(1), did not expect it.\n"); + ok(!app_deactivated, "Received WM_ACTIVATEAPP(0), did not expect it.\n"); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + test_window = GetForegroundWindow(); + ok(test_window == window1, "Expected foreground window %p, got %p\n", + window1, test_window); + check_wnd_state(window1, window1, window1, 0); + ok(!app_activated, "Received WM_ACTIVATEAPP(1), did not expect it.\n"); + ok(app_deactivated, "Expected WM_ACTIVATEAPP(0), did not receive it.\n"); + + SetForegroundWindow(thread_params.thread_window); + + /* Set foreground then remove: Both messages are delivered. */ + app_activated = app_deactivated = FALSE; + PostThreadMessageA(tid, thread_params.msg_command, SET_FOREGROUND_SET_1 | SET_FOREGROUND_STEAL_2, 0); + WaitForSingleObject(thread_params.command_executed, INFINITE); + test_window = GetForegroundWindow(); + ok(test_window == thread_params.thread_window, "Expected foreground window %p, got %p\n", + thread_params.thread_window, test_window); + check_wnd_state(0, thread_params.thread_window, 0, 0); + ok(!app_activated, "Received WM_ACTIVATEAPP(1), did not expect it.\n"); + ok(!app_deactivated, "Received WM_ACTIVATEAPP(0), did not expect it.\n"); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + test_window = GetForegroundWindow(); + ok(test_window == thread_params.thread_window, "Expected foreground window %p, got %p\n", + thread_params.thread_window, test_window); + /* Active and focus are window1 on wine because the internal WM_WINE_SETACTIVEWINDOW(0) + * message is never generated. GetCapture() returns 0 though, so we'd get a test success + * in todo_wine in the line below. + * todo_wine check_wnd_state(0, thread_params.thread_window, 0, 0); */ + ok(app_activated, "Expected WM_ACTIVATEAPP(1), did not receive it.\n"); + todo_wine ok(app_deactivated, "Expected WM_ACTIVATEAPP(0), did not receive it.\n"); + + SetForegroundWindow(window1); + test_window = GetForegroundWindow(); + ok(test_window == window1, "Expected foreground window %p, got %p\n", + window1, test_window); + check_wnd_state(window1, window1, window1, 0); + + /* Switch to a different window from the same thread? No messages. */ + app_activated = app_deactivated = FALSE; + PostThreadMessageA(tid, thread_params.msg_command, SET_FOREGROUND_STEAL_1 | SET_FOREGROUND_SET_2, 0); + WaitForSingleObject(thread_params.command_executed, INFINITE); + test_window = GetForegroundWindow(); + ok(test_window == window1, "Expected foreground window %p, got %p\n", + window1, test_window); + check_wnd_state(window1, window1, window1, 0); + ok(!app_activated, "Received WM_ACTIVATEAPP(1), did not expect it.\n"); + ok(!app_deactivated, "Received WM_ACTIVATEAPP(0), did not expect it.\n"); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + test_window = GetForegroundWindow(); + ok(test_window == window2, "Expected foreground window %p, got %p\n", + window2, test_window); + check_wnd_state(window2, window2, window2, 0); + ok(!app_activated, "Received WM_ACTIVATEAPP(1), did not expect it.\n"); + ok(!app_deactivated, "Received WM_ACTIVATEAPP(0), did not expect it.\n"); + + PostThreadMessageA(tid, thread_params.msg_quit, 0, 0); + WaitForSingleObject(thread, INFINITE); + + CloseHandle(thread_params.command_executed); + DestroyWindow(window2); +} + START_TEST(win) { char **argv; @@ -8063,6 +8471,7 @@ pGetGUIThreadInfo = (void *)GetProcAddress( user32, "GetGUIThreadInfo" ); pGetProcessDefaultLayout = (void *)GetProcAddress( user32, "GetProcessDefaultLayout" ); pSetProcessDefaultLayout = (void *)GetProcAddress( user32, "SetProcessDefaultLayout" ); + pFlashWindow = (void *)GetProcAddress( user32, "FlashWindow" ); pFlashWindowEx = (void *)GetProcAddress( user32, "FlashWindowEx" ); pGetLayout = (void *)GetProcAddress( gdi32, "GetLayout" ); pSetLayout = (void *)GetProcAddress( gdi32, "SetLayout" ); @@ -8126,6 +8535,7 @@ test_capture_3(hwndMain, hwndMain2); test_capture_4(); test_rtl_layout(); + test_FlashWindow(); test_FlashWindowEx(); test_CreateWindow(); @@ -8177,6 +8587,11 @@ test_smresult(); test_GetMessagePos(); + if (!winetest_interactive) + skip("ROSTESTS-208: Skipping test_activateapp(hwndMain).\n"); + else + test_activateapp(hwndMain); + /* add the tests above this line */ if (hhook) UnhookWindowsHookEx(hhook);

9 years

[pschweitzer] 70292: [IPHLPAPI] Properly return unicast addresses in GetAdaptersAddresses() by properly return a struct sockaddr_in. This fixes a bunch of failing tests in iphlpapi_apitest, and it ...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Tue Dec 8 08:03:33 2015 New Revision: 70292 URL: http://svn.reactos.org/svn/reactos?rev=70292&view=rev Log: [IPHLPAPI] Properly return unicast addresses in GetAdaptersAddresses() by properly return a struct sockaddr_in. This fixes a bunch of failing tests in iphlpapi_apitest, and it should fix any application relying on this API to know interfaces addresses. Modified: trunk/reactos/dll/win32/iphlpapi/address.c Modified: trunk/reactos/dll/win32/iphlpapi/address.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/address… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/address.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/address.c [iso-8859-1] Tue Dec 8 08:03:33 2015 @@ -588,9 +588,10 @@ /* Set the address */ //FIXME: ipv4 only (again...) UnicastAddress->Address.lpSockaddr = (LPSOCKADDR)(UnicastAddress + 1); - UnicastAddress->Address.iSockaddrLength = sizeof(AddrEntries[j].iae_addr); + UnicastAddress->Address.iSockaddrLength = sizeof(SOCKADDR); UnicastAddress->Address.lpSockaddr->sa_family = AF_INET; - memcpy(UnicastAddress->Address.lpSockaddr->sa_data, &AddrEntries[j].iae_addr, sizeof(AddrEntries[j].iae_addr)); + ((LPSOCKADDR_IN)UnicastAddress->Address.lpSockaddr)->sin_port = 0; + memcpy(&((LPSOCKADDR_IN)UnicastAddress->Address.lpSockaddr)->sin_addr, &AddrEntries[j].iae_addr, sizeof(AddrEntries[j].iae_addr)); CurrentAA->FirstUnicastAddress = UnicastAddress; Ptr += Size;

9 years

[rnaumann] 70291: [SYSSETUP] Set an owner name by default. Patch by Ismael Ferreras Morezuelas CORE-10476

by rnaumann＠svn.reactos.org

Author: rnaumann Date: Mon Dec 7 23:21:49 2015 New Revision: 70291 URL: http://svn.reactos.org/svn/reactos?rev=70291&view=rev Log: [SYSSETUP] Set an owner name by default. Patch by Ismael Ferreras Morezuelas CORE-10476 Modified: trunk/reactos/dll/win32/syssetup/lang/bg-BG.rc trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc trunk/reactos/dll/win32/syssetup/lang/de-DE.rc trunk/reactos/dll/win32/syssetup/lang/el-GR.rc trunk/reactos/dll/win32/syssetup/lang/en-US.rc trunk/reactos/dll/win32/syssetup/lang/es-ES.rc trunk/reactos/dll/win32/syssetup/lang/et-EE.rc trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc trunk/reactos/dll/win32/syssetup/lang/he-IL.rc trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc trunk/reactos/dll/win32/syssetup/lang/id-ID.rc trunk/reactos/dll/win32/syssetup/lang/it-IT.rc trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc trunk/reactos/dll/win32/syssetup/lang/no-NO.rc trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc trunk/reactos/dll/win32/syssetup/lang/pt-BR.rc trunk/reactos/dll/win32/syssetup/lang/ro-RO.rc trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc trunk/reactos/dll/win32/syssetup/lang/sk-SK.rc trunk/reactos/dll/win32/syssetup/lang/sq-AL.rc trunk/reactos/dll/win32/syssetup/lang/tr-TR.rc trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc trunk/reactos/dll/win32/syssetup/resource.h trunk/reactos/dll/win32/syssetup/wizard.c Modified: trunk/reactos/dll/win32/syssetup/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/bg… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/bg-BG.rc [iso-8859-1] Mon Dec 7 23:21:49 2015 @@ -155,6 +155,7 @@ * Also check the IDD_COMPUTERPAGE dialog. */ IDS_ADMINISTRATOR_NAME "Administrator" + IDS_MACHINE_OWNER_NAME "Ð¡Ð¾Ð±ÑÑÐ²ÐµÐ½Ð¸Ðº" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/cs… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc [iso-8859-1] Mon Dec 7 23:21:49 2015 @@ -161,6 +161,7 @@ * Also check the IDD_COMPUTERPAGE dialog. */ IDS_ADMINISTRATOR_NAME "Administrator" + IDS_MACHINE_OWNER_NAME "VlastnÃk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/de… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/de-DE.rc [iso-8859-1] Mon Dec 7 23:21:49 2015 @@ -155,6 +155,7 @@ * Also check the IDD_COMPUTERPAGE dialog. */ IDS_ADMINISTRATOR_NAME "Administrator" + IDS_MACHINE_OWNER_NAME "Besitzer" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/el… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/el-GR.rc [iso-8859-1] Mon Dec 7 23:21:49 2015 @@ -155,6 +155,7 @@ * Also check the IDD_COMPUTERPAGE dialog. */ IDS_ADMINISTRATOR_NAME "Administrator" + IDS_MACHINE_OWNER_NAME "ÎÎ¬ÏÎ¿ÏÎ¿Ï" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/en… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/en-US.rc [iso-8859-1] Mon Dec 7 23:21:49 2015 @@ -174,6 +174,7 @@ * Also check the IDD_COMPUTERPAGE dialog. */ IDS_ADMINISTRATOR_NAME "Administrator" + IDS_MACHINE_OWNER_NAME "Owner" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/es… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/es-ES.rc [iso-8859-1] Mon Dec 7 23:21:49 2015 @@ -156,6 +156,7 @@ * Also check the IDD_COMPUTERPAGE dialog. */ IDS_ADMINISTRATOR_NAME "Administrator" + IDS_MACHINE_OWNER_NAME "Propietario" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/et-EE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/et… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/et-EE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/et-EE.rc [iso-8859-1] Mon Dec 7 23:21:49 2015 @@ -155,6 +155,7 @@ * Also check the IDD_COMPUTERPAGE dialog. */ IDS_ADMINISTRATOR_NAME "Administrator" + IDS_MACHINE_OWNER_NAME "Owner" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/fr… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc [iso-8859-1] Mon Dec 7 23:21:49 2015 @@ -155,6 +155,7 @@ * Also check the IDD_COMPUTERPAGE dialog. */ IDS_ADMINISTRATOR_NAME "Administrator" + IDS_MACHINE_OWNER_NAME "PropriÃ©taire" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/he… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/he-IL.rc [iso-8859-1] Mon Dec 7 23:21:49 2015 @@ -155,6 +155,7 @@ * Also check the IDD_COMPUTERPAGE dialog. */ IDS_ADMINISTRATOR_NAME "Administrator" + IDS_MACHINE_OWNER_NAME "××¢×××" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/hu… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc [iso-8859-1] Mon Dec 7 23:21:49 2015 @@ -155,6 +155,7 @@ * Also check the IDD_COMPUTERPAGE dialog. */ IDS_ADMINISTRATOR_NAME "Administrator" + IDS_MACHINE_OWNER_NAME "Tulajdonos" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/id… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/id-ID.rc [iso-8859-1] Mon Dec 7 23:21:49 2015 @@ -155,6 +155,7 @@ * Also check the IDD_COMPUTERPAGE dialog. */ IDS_ADMINISTRATOR_NAME "Administrator" + IDS_MACHINE_OWNER_NAME "Owner" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/it… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/it-IT.rc [iso-8859-1] Mon Dec 7 23:21:49 2015 @@ -155,6 +155,7 @@ * Also check the IDD_COMPUTERPAGE dialog. */ IDS_ADMINISTRATOR_NAME "Administrator" + IDS_MACHINE_OWNER_NAME "Proprietario" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ja… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc [iso-8859-1] Mon Dec 7 23:21:49 2015 @@ -155,6 +155,7 @@ * Also check the IDD_COMPUTERPAGE dialog. */ IDS_ADMINISTRATOR_NAME "Administrator" + IDS_MACHINE_OWNER_NAME "ææè" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/nl… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc [iso-8859-1] Mon Dec 7 23:21:49 2015 @@ -155,6 +155,7 @@ * Also check the IDD_COMPUTERPAGE dialog. */ IDS_ADMINISTRATOR_NAME "Administrator" + IDS_MACHINE_OWNER_NAME "Eigenaar" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/no… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/no-NO.rc [iso-8859-1] Mon Dec 7 23:21:49 2015 @@ -155,6 +155,7 @@ * Also check the IDD_COMPUTERPAGE dialog. */ IDS_ADMINISTRATOR_NAME "Administrator" + IDS_MACHINE_OWNER_NAME "Eier" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/pl… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc [iso-8859-1] Mon Dec 7 23:21:49 2015 @@ -155,6 +155,7 @@ * Also check the IDD_COMPUTERPAGE dialog. */ IDS_ADMINISTRATOR_NAME "Administrator" + IDS_MACHINE_OWNER_NAME "WÅaÅciciel" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/pt… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/pt-BR.rc [iso-8859-1] Mon Dec 7 23:21:49 2015 @@ -155,6 +155,7 @@ * Also check the IDD_COMPUTERPAGE dialog. */ IDS_ADMINISTRATOR_NAME "Administrator" + IDS_MACHINE_OWNER_NAME "Dono" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ro… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/ro-RO.rc [iso-8859-1] Mon Dec 7 23:21:49 2015 @@ -164,6 +164,7 @@ * Also check the IDD_COMPUTERPAGE dialog. */ IDS_ADMINISTRATOR_NAME "Administrator" + IDS_MACHINE_OWNER_NAME "Owner" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ru… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc [iso-8859-1] Mon Dec 7 23:21:49 2015 @@ -157,6 +157,7 @@ * Also check the IDD_COMPUTERPAGE dialog. */ IDS_ADMINISTRATOR_NAME "Administrator" + IDS_MACHINE_OWNER_NAME "ÐÐ»Ð°Ð´ÐµÐ»ÐµÑ" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/sk… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/sk-SK.rc [iso-8859-1] Mon Dec 7 23:21:49 2015 @@ -161,6 +161,7 @@ * Also check the IDD_COMPUTERPAGE dialog. */ IDS_ADMINISTRATOR_NAME "Administrator" + IDS_MACHINE_OWNER_NAME "VlastnÃk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/sq… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/sq-AL.rc [iso-8859-1] Mon Dec 7 23:21:49 2015 @@ -174,6 +174,7 @@ * Also check the IDD_COMPUTERPAGE dialog. */ IDS_ADMINISTRATOR_NAME "AdministratorÃ«r" + IDS_MACHINE_OWNER_NAME "ZotÃ«ruesi" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/tr… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/tr-TR.rc [iso-8859-1] Mon Dec 7 23:21:49 2015 @@ -155,6 +155,7 @@ * Also check the IDD_COMPUTERPAGE dialog. */ IDS_ADMINISTRATOR_NAME "YÃ¶netici" + IDS_MACHINE_OWNER_NAME "Sahip" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/uk… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc [iso-8859-1] Mon Dec 7 23:21:49 2015 @@ -163,6 +163,7 @@ * Also check the IDD_COMPUTERPAGE dialog. */ IDS_ADMINISTRATOR_NAME "Administrator" + IDS_MACHINE_OWNER_NAME "ÐÐ»Ð°ÑÐ½Ð¸Ðº" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/zh… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc [iso-8859-1] Mon Dec 7 23:21:49 2015 @@ -155,6 +155,7 @@ * Also check the IDD_COMPUTERPAGE dialog. */ IDS_ADMINISTRATOR_NAME "Administrator" + IDS_MACHINE_OWNER_NAME "ææè" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/resourc… ============================================================================== --- trunk/reactos/dll/win32/syssetup/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/resource.h [iso-8859-1] Mon Dec 7 23:21:49 2015 @@ -102,6 +102,7 @@ #define IDS_TIMEOUT 3307 #define IDS_REASON_UNKNOWN 3308 #define IDS_ADMINISTRATOR_NAME 3309 +#define IDS_MACHINE_OWNER_NAME 3310 #define IDS_WZD_NAME 3450 #define IDS_WZD_SETCOMPUTERNAME 3451 Modified: trunk/reactos/dll/win32/syssetup/wizard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/wizard.… ============================================================================== --- trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] Mon Dec 7 23:21:49 2015 @@ -5,6 +5,7 @@ * PURPOSE: GUI controls * PROGRAMMERS: Eric Kohl * Pierre Schweitzer <heis_spiter(a)hotmail.com> + * Ismael Ferreras Morezuelas <swyterzone+ros(a)gmail.com> */ /* INCLUDES *****************************************************************/ @@ -454,11 +455,20 @@ { case WM_INITDIALOG: { + /* set a localized ('Owner') placeholder string as default */ + if (LoadStringW(hDllInstance, IDS_MACHINE_OWNER_NAME, OwnerName, _countof(OwnerName))) + { + SendDlgItemMessage(hwndDlg, IDC_OWNERNAME, WM_SETTEXT, 0, (LPARAM)OwnerName); + } + SendDlgItemMessage(hwndDlg, IDC_OWNERNAME, EM_LIMITTEXT, 50, 0); SendDlgItemMessage(hwndDlg, IDC_OWNERORGANIZATION, EM_LIMITTEXT, 50, 0); /* Set focus to owner name */ SetFocus(GetDlgItem(hwndDlg, IDC_OWNERNAME)); + + /* Select the default text to quickly overwrite it by typing */ + SendDlgItemMessage(hwndDlg, IDC_OWNERNAME, EM_SETSEL, 0, -1); } break;

9 years

[pschweitzer] 70290: [IPHLPAPI_APITEST] Add another check that shows that data returned by GetAdaptersAddresses() are incomplete and thus broken... "This isn't the type you're looking for." would s...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Mon Dec 7 22:33:29 2015 New Revision: 70290 URL: http://svn.reactos.org/svn/reactos?rev=70290&view=rev Log: [IPHLPAPI_APITEST] Add another check that shows that data returned by GetAdaptersAddresses() are incomplete and thus broken... "This isn't the type you're looking for." would say an old man Modified: trunk/rostests/apitests/iphlpapi/SendARP.c Modified: trunk/rostests/apitests/iphlpapi/SendARP.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/iphlpapi/SendARP… ============================================================================== --- trunk/rostests/apitests/iphlpapi/SendARP.c [iso-8859-1] (original) +++ trunk/rostests/apitests/iphlpapi/SendARP.c [iso-8859-1] Mon Dec 7 22:33:29 2015 @@ -80,6 +80,7 @@ if (!Current->FirstUnicastAddress) continue; + ok(Current->FirstUnicastAddress->Address.iSockaddrLength == sizeof(SOCKADDR_IN), "Unexpected length: %u\n", Current->FirstUnicastAddress->Address.iSockaddrLength); SockAddr = (PSOCKADDR_IN)Current->FirstUnicastAddress->Address.lpSockaddr; IpAddr = SockAddr->sin_addr.S_un.S_addr;

9 years

[ekohl] 70289: [INTL][USRMGR][SHELL32] Minor corrections in GUI resources. Patch by Stefan Fulea. #CORE-10486 #resolve #comment Thanks a lot!

by ekohl＠svn.reactos.org

Author: ekohl Date: Mon Dec 7 20:35:33 2015 New Revision: 70289 URL: http://svn.reactos.org/svn/reactos?rev=70289&view=rev Log: [INTL][USRMGR][SHELL32] Minor corrections in GUI resources. Patch by Stefan Fulea. #CORE-10486 #resolve #comment Thanks a lot! Modified: trunk/reactos/dll/cpl/intl/lang/cs-CZ.rc trunk/reactos/dll/cpl/intl/lang/de-DE.rc trunk/reactos/dll/cpl/intl/lang/en-US.rc trunk/reactos/dll/cpl/intl/lang/es-ES.rc trunk/reactos/dll/cpl/intl/lang/fr-FR.rc trunk/reactos/dll/cpl/intl/lang/he-IL.rc trunk/reactos/dll/cpl/intl/lang/it-IT.rc trunk/reactos/dll/cpl/intl/lang/no-NO.rc trunk/reactos/dll/cpl/intl/lang/pl-PL.rc trunk/reactos/dll/cpl/intl/lang/ro-RO.rc trunk/reactos/dll/cpl/intl/lang/ru-RU.rc trunk/reactos/dll/cpl/intl/lang/sk-SK.rc trunk/reactos/dll/cpl/intl/lang/sq-AL.rc trunk/reactos/dll/cpl/intl/lang/tr-TR.rc trunk/reactos/dll/cpl/intl/lang/uk-UA.rc trunk/reactos/dll/cpl/intl/lang/zh-CN.rc trunk/reactos/dll/cpl/intl/lang/zh-TW.rc trunk/reactos/dll/cpl/usrmgr/lang/cs-CZ.rc trunk/reactos/dll/cpl/usrmgr/lang/de-DE.rc trunk/reactos/dll/cpl/usrmgr/lang/en-US.rc trunk/reactos/dll/cpl/usrmgr/lang/es-ES.rc trunk/reactos/dll/cpl/usrmgr/lang/fr-FR.rc trunk/reactos/dll/cpl/usrmgr/lang/he-IL.rc trunk/reactos/dll/cpl/usrmgr/lang/it-IT.rc trunk/reactos/dll/cpl/usrmgr/lang/pl-PL.rc trunk/reactos/dll/cpl/usrmgr/lang/ro-RO.rc trunk/reactos/dll/cpl/usrmgr/lang/ru-RU.rc trunk/reactos/dll/cpl/usrmgr/lang/tr-TR.rc trunk/reactos/dll/cpl/usrmgr/lang/uk-UA.rc trunk/reactos/dll/cpl/usrmgr/lang/zh-CN.rc trunk/reactos/dll/cpl/usrmgr/lang/zh-TW.rc trunk/reactos/dll/win32/shell32/lang/ca-ES.rc trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc trunk/reactos/dll/win32/shell32/lang/da-DK.rc trunk/reactos/dll/win32/shell32/lang/en-GB.rc trunk/reactos/dll/win32/shell32/lang/en-US.rc trunk/reactos/dll/win32/shell32/lang/es-ES.rc trunk/reactos/dll/win32/shell32/lang/fi-FI.rc trunk/reactos/dll/win32/shell32/lang/fr-FR.rc trunk/reactos/dll/win32/shell32/lang/he-IL.rc trunk/reactos/dll/win32/shell32/lang/hu-HU.rc trunk/reactos/dll/win32/shell32/lang/it-IT.rc trunk/reactos/dll/win32/shell32/lang/ja-JP.rc trunk/reactos/dll/win32/shell32/lang/ko-KR.rc trunk/reactos/dll/win32/shell32/lang/nl-NL.rc trunk/reactos/dll/win32/shell32/lang/no-NO.rc trunk/reactos/dll/win32/shell32/lang/pl-PL.rc trunk/reactos/dll/win32/shell32/lang/pt-BR.rc trunk/reactos/dll/win32/shell32/lang/pt-PT.rc trunk/reactos/dll/win32/shell32/lang/ro-RO.rc trunk/reactos/dll/win32/shell32/lang/sl-SI.rc trunk/reactos/dll/win32/shell32/lang/sq-AL.rc trunk/reactos/dll/win32/shell32/lang/sv-SE.rc trunk/reactos/dll/win32/shell32/lang/tr-TR.rc trunk/reactos/dll/win32/shell32/lang/uk-UA.rc trunk/reactos/dll/win32/shell32/lang/zh-CN.rc trunk/reactos/dll/win32/shell32/lang/zh-TW.rc Modified: trunk/reactos/dll/cpl/intl/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/cs-CZ.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/lang/cs-CZ.rc [iso-8859-1] Mon Dec 7 20:35:33 2015 @@ -56,8 +56,8 @@ LTEXT "Zvolte jazyk odpovÃdajÃcÃ jazykovÃ© verzi ne-Unicode programÅ¯, kterÃ© chcete pouÅ¾Ãvat:", -1, 14, 55, 223, 18 GROUPBOX "PÅevodnÃ tabulky znakovÃ½ch strÃ¡nek", -1, 5, 101, 234, 88 CONTROL "", IDC_CONV_TABLES, "SysListView32", LVS_REPORT | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP, 14, 114, 217, 70 - GROUPBOX "VÃ½chozÃ nastavenÃ uÅ¾ivatelskÃ©ho ÃºÄtu", -1, 5, 193, 234, 30 - CHECKBOX "PouÅ¾Ãt vÅ¡echna nastavenÃ na aktuÃ¡lnÃ uÅ¾ivatelskÃ½ ÃºÄet a nastavit jako vÃ½chozÃ", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 200, 220, 22, BS_MULTILINE + GROUPBOX "VÃ½chozÃ nastavenÃ uÅ¾ivatelskÃ©ho ÃºÄtu", -1, 5, 193, 234, 32 + CHECKBOX "PouÅ¾Ãt vÅ¡echna nastavenÃ na aktuÃ¡lnÃ uÅ¾ivatelskÃ½ ÃºÄet a nastavit jako vÃ½chozÃ", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 201, 220, 22, BS_MULTILINE END IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 234 Modified: trunk/reactos/dll/cpl/intl/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/de-DE.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/lang/de-DE.rc [iso-8859-1] Mon Dec 7 20:35:33 2015 @@ -51,8 +51,8 @@ LTEXT "WÃ¤hlen Sie eine Sprache aus, die der Sprachversion des Programmes entspricht, das Sie nutzen wollen:", -1, 14, 55, 223, 18 GROUPBOX "Codepage Konvertierungstabellen", -1, 5, 101, 234, 88 CONTROL "", IDC_CONV_TABLES, "SysListView32", LVS_REPORT | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP, 14, 114, 217, 70 - GROUPBOX "Standardeinstellungen fÃ¼r Benutzerkonten", -1, 5, 193, 234, 30 - AUTOCHECKBOX "Einstellungen &auf das aktive und das Standardkonto anwenden.", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 200, 220, 22, BS_MULTILINE + GROUPBOX "Standardeinstellungen fÃ¼r Benutzerkonten", -1, 5, 193, 234, 32 + AUTOCHECKBOX "Einstellungen &auf das aktive und das Standardkonto anwenden.", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 201, 220, 22, BS_MULTILINE END IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 234 Modified: trunk/reactos/dll/cpl/intl/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/en-US.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/lang/en-US.rc [iso-8859-1] Mon Dec 7 20:35:33 2015 @@ -51,8 +51,8 @@ LTEXT "Select a language to match the language version of the non-Unicode programs you want to use:", -1, 14, 55, 223, 18 GROUPBOX "Code page conversion tables", -1, 5, 101, 234, 88 CONTROL "", IDC_CONV_TABLES, "SysListView32", LVS_REPORT | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP, 14, 114, 217, 70 - GROUPBOX "Default user account settings", -1, 5, 193, 234, 30 - AUTOCHECKBOX "Apply all settings to the current user account and to the default", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 200, 220, 22, BS_MULTILINE + GROUPBOX "Default user account settings", -1, 5, 193, 234, 32 + AUTOCHECKBOX "Apply all settings to the current user account and to the default", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 201, 220, 22, BS_MULTILINE END IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 234 Modified: trunk/reactos/dll/cpl/intl/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/es-ES.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/lang/es-ES.rc [iso-8859-1] Mon Dec 7 20:35:33 2015 @@ -53,8 +53,8 @@ LTEXT "Seleccione un idioma que coincida con la versiÃ³n de idioma de los programas no Unicode que desea utilizar:", -1, 14, 55, 223, 18 GROUPBOX "Tablas de conversiÃ³n de pÃ¡ginas de cÃ³digo ", -1, 5, 101, 234, 88 CONTROL "", IDC_CONV_TABLES, "SysListView32", LVS_REPORT | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP, 14, 114, 217, 70 - GROUPBOX "ConfiguraciÃ³n de la cuenta de usuario predeterminada ", -1, 5, 193, 234, 30 - CHECKBOX "Aplicar toda la configuraciÃ³n a la cuenta de usuario actual y al perfil de usuario predeterminado", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 200, 220, 22, BS_MULTILINE + GROUPBOX "ConfiguraciÃ³n de la cuenta de usuario predeterminada ", -1, 5, 193, 234, 32 + CHECKBOX "Aplicar toda la configuraciÃ³n a la cuenta de usuario actual y al perfil de usuario predeterminado", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 201, 220, 22, BS_MULTILINE END IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 234 Modified: trunk/reactos/dll/cpl/intl/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/fr-FR.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/lang/fr-FR.rc [iso-8859-1] Mon Dec 7 20:35:33 2015 @@ -53,8 +53,8 @@ LTEXT "SÃ©lectionnez une langue qui corresponde Ã la version de la langue des programmes que vous voulez utiliser :", -1, 14, 55, 223, 18 GROUPBOX "Tables de conversion des pages de code", -1, 5, 101, 234, 88 CONTROL "", IDC_CONV_TABLES, "SysListView32", LVS_REPORT | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP, 14, 114, 217, 70 - GROUPBOX "ParamÃ¨tres du compte de l'utilisateur par dÃ©faut ", -1, 5, 193, 234, 30 - CHECKBOX "Appliquer tous ces paramÃ¨tres au compte utilisateur actuel et Ã celui par dÃ©faut", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 200, 220, 22, BS_MULTILINE + GROUPBOX "ParamÃ¨tres du compte de l'utilisateur par dÃ©faut ", -1, 5, 193, 234, 32 + CHECKBOX "Appliquer tous ces paramÃ¨tres au compte utilisateur actuel et Ã celui par dÃ©faut", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 201, 220, 22, BS_MULTILINE END IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 234 Modified: trunk/reactos/dll/cpl/intl/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/he-IL.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/lang/he-IL.rc [iso-8859-1] Mon Dec 7 20:35:33 2015 @@ -53,8 +53,8 @@ LTEXT "Select a language to match the language version of the non-Unicode programs you want to use:", -1, 14, 55, 223, 18 GROUPBOX "Code page conversion tables", -1, 5, 101, 234, 88 CONTROL "", IDC_CONV_TABLES, "SysListView32", LVS_REPORT | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP, 14, 114, 217, 70 - GROUPBOX "Default user account settings", -1, 5, 193, 234, 30 - CHECKBOX "Apply all settings to the current user account and to the default", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 200, 220, 22, BS_MULTILINE + GROUPBOX "Default user account settings", -1, 5, 193, 234, 32 + CHECKBOX "Apply all settings to the current user account and to the default", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 201, 220, 22, BS_MULTILINE END IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 234 Modified: trunk/reactos/dll/cpl/intl/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/it-IT.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/lang/it-IT.rc [iso-8859-1] Mon Dec 7 20:35:33 2015 @@ -54,8 +54,8 @@ LTEXT "Selezionare una lingua per i programmi non Unicode da utilizzare:", -1, 14, 55, 223, 18 GROUPBOX "Tabella di conversione di tabelle codici", -1, 5, 101, 234, 88 CONTROL "", IDC_CONV_TABLES, "SysListView32", LVS_REPORT | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP, 14, 114, 217, 70 - GROUPBOX "Impostazioni account utente predefinito", -1, 5, 193, 234, 30 - CHECKBOX "Appli&ca tutte le impostazioni all'account utente corrente e al profilo utente predefinito", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 200, 220, 22, BS_MULTILINE + GROUPBOX "Impostazioni account utente predefinito", -1, 5, 193, 234, 32 + CHECKBOX "Appli&ca tutte le impostazioni all'account utente corrente e al profilo utente predefinito", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 201, 220, 22, BS_MULTILINE END IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 234 Modified: trunk/reactos/dll/cpl/intl/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/no-NO.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/lang/no-NO.rc [iso-8859-1] Mon Dec 7 20:35:33 2015 @@ -51,8 +51,8 @@ LTEXT "Velg et sprÃ¥k som tilsvarer sprÃ¥kversjonen av programmet du vil bruke, som ikke er Unicode-programmer:", -1, 14, 55, 223, 18 GROUPBOX "Konverteringstabeller for tegntabell", -1, 5, 101, 234, 88 CONTROL "", IDC_CONV_TABLES, "SysListView32", LVS_REPORT | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP, 14, 114, 217, 70 - GROUPBOX "Standard brukerkonto innstilling", -1, 5, 193, 234, 30 - CHECKBOX "Bruk alle innstillinger pÃ¥ gjeldende brukerkonto og standard brukerprofil", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 200, 220, 22, BS_MULTILINE + GROUPBOX "Standard brukerkonto innstilling", -1, 5, 193, 234, 32 + CHECKBOX "Bruk alle innstillinger pÃ¥ gjeldende brukerkonto og standard brukerprofil", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 201, 220, 22, BS_MULTILINE END IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 234 Modified: trunk/reactos/dll/cpl/intl/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/pl-PL.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/lang/pl-PL.rc [iso-8859-1] Mon Dec 7 20:35:33 2015 @@ -59,8 +59,8 @@ LTEXT "Wybierz taki jÄzyk, ktÃ³ry ma byÄ uÅ¼ywany przez programy bez Unicode:", -1, 14, 55, 223, 18 GROUPBOX "Tabele konwersji stron kodowych", -1, 5, 101, 234, 88 CONTROL "", IDC_CONV_TABLES, "SysListView32", LVS_REPORT | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP, 14, 114, 217, 70 - GROUPBOX "DomyÅlne ustawienia konta uÅ¼ytkownika", -1, 5, 193, 234, 30 - CHECKBOX "Zastosuj wszystkie ustawienia do bieÅ¼Äcego konta uÅ¼ytkownika i do domyÅlnego profilu uÅ¼ytkownika.", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 200, 220, 22, BS_MULTILINE + GROUPBOX "DomyÅlne ustawienia konta uÅ¼ytkownika", -1, 5, 193, 234, 32 + CHECKBOX "Zastosuj wszystkie ustawienia do bieÅ¼Äcego konta uÅ¼ytkownika i do domyÅlnego profilu uÅ¼ytkownika.", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 201, 220, 22, BS_MULTILINE END IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 234 Modified: trunk/reactos/dll/cpl/intl/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/ro-RO.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/lang/ro-RO.rc [iso-8859-1] Mon Dec 7 20:35:33 2015 @@ -53,8 +53,8 @@ LTEXT "AlegeÈi limba ce corespunde cu limba aplicaÈiilor ne-Unicode pe care doriÈi sÄ le utilizaÈi:", -1, 14, 55, 223, 18 GROUPBOX "Tabele de conversie cod-paginÄ", -1, 5, 101, 234, 88 CONTROL "", IDC_CONV_TABLES, "SysListView32", LVS_REPORT | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP, 14, 114, 217, 70 - GROUPBOX "OpÈiuni implicite pentru conturi de utilizator", -1, 5, 193, 234, 30 - CHECKBOX "Apli&cÄ aceste opÈiuni atÃ¢t pentru contul de utilizator curent Èi pentru cel implicit", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 200, 220, 22, BS_MULTILINE + GROUPBOX "OpÈiuni implicite pentru conturi de utilizator", -1, 5, 193, 234, 32 + CHECKBOX "Apli&cÄ aceste opÈiuni atÃ¢t pentru contul de utilizator curent cÃ¢t Èi pentru cel implicit", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 201, 220, 22, BS_MULTILINE END IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 234 Modified: trunk/reactos/dll/cpl/intl/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/ru-RU.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/lang/ru-RU.rc [iso-8859-1] Mon Dec 7 20:35:33 2015 @@ -51,8 +51,8 @@ LTEXT "ÐÑÐ±ÐµÑÐ¸ÑÐµ ÑÐ·ÑÐº, ÑÐ¾Ð¾ÑÐ²ÐµÑÑÑÐ²ÑÑÑÐ¸Ð¹ ÑÐ·ÑÐºÑ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·ÑÐµÐ¼ÑÑ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼, ÐºÐ¾ÑÐ¾ÑÑÐµ Ð½Ðµ Ð¿Ð¾Ð´Ð´ÐµÑÐ¶Ð¸Ð²Ð°ÑÑ Ð®Ð½Ð¸ÐºÐ¾Ð´:", -1, 14, 55, 223, 18 GROUPBOX "ÐÐ¾Ð´Ð¾Ð²ÑÐµ ÑÑÑÐ°Ð½Ð¸ÑÑ ÑÐ°Ð±Ð»Ð¸Ñ Ð¿ÑÐµÐ¾Ð±ÑÐ°Ð·Ð¾Ð²Ð°Ð½Ð¸Ñ", -1, 5, 101, 234, 88 CONTROL "", IDC_CONV_TABLES, "SysListView32", LVS_REPORT | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP, 14, 114, 217, 70 - GROUPBOX "ÐÐ°ÑÐ°Ð¼ÐµÑÑÑ Ð´Ð»Ñ ÑÑÐ°Ð½Ð´Ð°ÑÑÐ½Ð¾Ð¹ ÑÑÐµÑÐ½Ð¾Ð¹ Ð·Ð°Ð¿Ð¸ÑÐ¸", -1, 5, 193, 234, 30 - CHECKBOX "ÐÑÐ¸Ð¼ÐµÐ½Ð¸ÑÑ ÑÑÐ¸ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÑ Ð´Ð»Ñ ÑÐµÐºÑÑÐµÐ¹ ÑÑÐµÑÐ½Ð¾Ð¹ Ð·Ð°Ð¿Ð¸ÑÐ¸ Ð¸ Ð´Ð»Ñ ÑÑÐ°Ð½Ð´Ð°ÑÑÐ½Ð¾Ð³Ð¾ Ð¿ÑÐ¾ÑÐ¸Ð»Ñ", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 200, 220, 22, BS_MULTILINE + GROUPBOX "ÐÐ°ÑÐ°Ð¼ÐµÑÑÑ Ð´Ð»Ñ ÑÑÐ°Ð½Ð´Ð°ÑÑÐ½Ð¾Ð¹ ÑÑÐµÑÐ½Ð¾Ð¹ Ð·Ð°Ð¿Ð¸ÑÐ¸", -1, 5, 193, 234, 32 + CHECKBOX "ÐÑÐ¸Ð¼ÐµÐ½Ð¸ÑÑ ÑÑÐ¸ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÑ Ð´Ð»Ñ ÑÐµÐºÑÑÐµÐ¹ ÑÑÐµÑÐ½Ð¾Ð¹ Ð·Ð°Ð¿Ð¸ÑÐ¸ Ð¸ Ð´Ð»Ñ ÑÑÐ°Ð½Ð´Ð°ÑÑÐ½Ð¾Ð³Ð¾ Ð¿ÑÐ¾ÑÐ¸Ð»Ñ", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 201, 220, 22, BS_MULTILINE END IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 234 Modified: trunk/reactos/dll/cpl/intl/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/sk-SK.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/lang/sk-SK.rc [iso-8859-1] Mon Dec 7 20:35:33 2015 @@ -56,8 +56,8 @@ LTEXT "Vyberte jazyk zodpovedajÃºci jazykovej verzii prÃsluÅ¡nÃ½ch programov bez podpory kÃ³dovania &Unicode:", -1, 14, 55, 223, 18 GROUPBOX "&TabuÄ¾ky na konverziu kÃ³dovÃ½ch strÃ¡nok", -1, 5, 101, 234, 88 CONTROL "", IDC_CONV_TABLES, "SysListView32", LVS_REPORT | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP, 14, 114, 217, 70 - GROUPBOX "PredvolenÃ© nastavenie pouÅ¾ÃvateÄ¾skÃ©ho konta", -1, 5, 193, 234, 30 - CHECKBOX "&VÅ¡etky nastavenia pouÅ¾iÅ¥ na aktuÃ¡lne pouÅ¾ÃvateÄ¾skÃ© konto a na predvolenÃ½ profil pouÅ¾ÃvateÄ¾a", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 203, 220, 19, BS_MULTILINE + GROUPBOX "PredvolenÃ© nastavenie pouÅ¾ÃvateÄ¾skÃ©ho konta", -1, 5, 193, 234, 32 + CHECKBOX "&VÅ¡etky nastavenia pouÅ¾iÅ¥ na aktuÃ¡lne pouÅ¾ÃvateÄ¾skÃ© konto a na predvolenÃ½ profil pouÅ¾ÃvateÄ¾a", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 201, 220, 22, BS_MULTILINE END IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 234 Modified: trunk/reactos/dll/cpl/intl/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/sq-AL.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/lang/sq-AL.rc [iso-8859-1] Mon Dec 7 20:35:33 2015 @@ -55,8 +55,8 @@ LTEXT "Zgjidhni njÃ« gjuhÃ« qÃ« tÃ« pÃ«rputhet me Versionin e gjuhÃ«s sÃ« programeve jo-Unicode qÃ« ju doni tÃ« pÃ«rdorni pÃ«rdorni:", -1, 14, 55, 223, 18 GROUPBOX "Tabela konvertimit dhe kodet e faqeve ", -1, 5, 101, 234, 88 CONTROL "", IDC_CONV_TABLES, "SysListView32", LVS_REPORT | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP, 14, 114, 217, 70 - GROUPBOX "Konfigurimi llogarise pÃ«rdoruesit parazgjedhur", -1, 5, 193, 234, 30 - CHECKBOX "Apply all settings to the current user account and to the default", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 200, 220, 22, BS_MULTILINE + GROUPBOX "Konfigurimi llogarise pÃ«rdoruesit parazgjedhur", -1, 5, 193, 234, 32 + CHECKBOX "Apply all settings to the current user account and to the default", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 201, 220, 22, BS_MULTILINE END IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 234 Modified: trunk/reactos/dll/cpl/intl/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/tr-TR.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/lang/tr-TR.rc [iso-8859-1] Mon Dec 7 20:35:33 2015 @@ -53,8 +53,8 @@ LTEXT "&Kullanmak istediÄiniz Evrenlik Kodlu olmayan izlencelerin dil sÃ¼rÃ¼mÃ¼nÃ¼ karÅÄ±laÅtÄ±rmak iÃ§in bir dil seÃ§iniz:", -1, 14, 55, 223, 18 GROUPBOX "Kod SayfasÄ± DÃ¶nÃ¼ÅtÃ¼rme Ãizelgesi", -1, 5, 101, 234, 88 CONTROL "", IDC_CONV_TABLES, "SysListView32", LVS_REPORT | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP, 14, 114, 217, 70 - GROUPBOX "Ãn TanÄ±mlÄ± KullanÄ±cÄ± HesÃ¢bÄ± AyarlarÄ±", -1, 5, 193, 234, 30 - CHECKBOX "&TÃ¼m AyarlarÄ± Åimdiki KullanÄ±cÄ± HesÃ¢bÄ±na Ãn TanÄ±mlÄ±lara Uygula", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 200, 220, 22, BS_MULTILINE + GROUPBOX "Ãn TanÄ±mlÄ± KullanÄ±cÄ± HesÃ¢bÄ± AyarlarÄ±", -1, 5, 193, 234, 32 + CHECKBOX "&TÃ¼m AyarlarÄ± Åimdiki KullanÄ±cÄ± HesÃ¢bÄ±na Ãn TanÄ±mlÄ±lara Uygula", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 201, 220, 22, BS_MULTILINE END IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 234 Modified: trunk/reactos/dll/cpl/intl/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/uk-UA.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/lang/uk-UA.rc [iso-8859-1] Mon Dec 7 20:35:33 2015 @@ -59,8 +59,8 @@ LTEXT "ÐÐ¸Ð±ÐµÑÑÑÑ Ð¼Ð¾Ð²Ñ, ÑÐºÐ° Ð²ÑÐ´Ð¿Ð¾Ð²ÑÐ´Ð°Ñ Ð¼Ð¾Ð²Ð½ÑÐ¹ Ð²ÐµÑÑÑÑ Ð±Ð°Ð¶Ð°Ð½Ð¸Ñ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼ Ð±ÐµÐ· Ð¿ÑÐ´ÑÑÐ¸Ð¼ÐºÐ¸ Ð®Ð½ÑÐºÐ¾Ð´Ñ.", -1, 14, 55, 223, 18 GROUPBOX "Ð¢Ð°Ð±Ð»Ð¸ÑÑ Ð¿ÐµÑÐµÑÐ²Ð¾ÑÐµÐ½Ð½Ñ ÐºÐ¾Ð´Ð¾Ð²Ð¸Ñ ÑÑÐ¾ÑÑÐ½Ð¾Ðº", -1, 5, 101, 234, 88 CONTROL "", IDC_CONV_TABLES, "SysListView32", LVS_REPORT | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP, 14, 114, 217, 70 - GROUPBOX "ÐÐ°ÑÐ°Ð¼ÐµÑÑÐ¸ ÑÑÐ°Ð½Ð´Ð°ÑÑÐ½Ð¾Ð³Ð¾ Ð¾Ð±Ð»ÑÐºÐ¾Ð²Ð¾Ð³Ð¾ Ð·Ð°Ð¿Ð¸ÑÑ", -1, 5, 193, 234, 30 - CHECKBOX "ÐÐ°ÑÑÐ¾ÑÑÐ²Ð°ÑÐ¸ Ð²ÑÑ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ¸ Ð´Ð¾ Ð¿Ð¾ÑÐ¾ÑÐ½Ð¾Ð³Ð¾ Ð¾Ð±Ð»ÑÐºÐ¾Ð²Ð¾Ð³Ð¾ Ð·Ð°Ð¿Ð¸ÑÑ ÑÐ° Ð´Ð¾ ÑÑÐ°Ð½Ð´Ð°ÑÑÐ½Ð¾Ð³Ð¾ Ð¿ÑÐ¾ÑÑÐ»Ñ ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°ÑÐ°", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 200, 220, 22, BS_MULTILINE + GROUPBOX "ÐÐ°ÑÐ°Ð¼ÐµÑÑÐ¸ ÑÑÐ°Ð½Ð´Ð°ÑÑÐ½Ð¾Ð³Ð¾ Ð¾Ð±Ð»ÑÐºÐ¾Ð²Ð¾Ð³Ð¾ Ð·Ð°Ð¿Ð¸ÑÑ", -1, 5, 193, 234, 32 + CHECKBOX "ÐÐ°ÑÑÐ¾ÑÑÐ²Ð°ÑÐ¸ Ð²ÑÑ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ¸ Ð´Ð¾ Ð¿Ð¾ÑÐ¾ÑÐ½Ð¾Ð³Ð¾ Ð¾Ð±Ð»ÑÐºÐ¾Ð²Ð¾Ð³Ð¾ Ð·Ð°Ð¿Ð¸ÑÑ ÑÐ° Ð´Ð¾ ÑÑÐ°Ð½Ð´Ð°ÑÑÐ½Ð¾Ð³Ð¾ Ð¿ÑÐ¾ÑÑÐ»Ñ ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°ÑÐ°", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 201, 220, 22, BS_MULTILINE END IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 234 Modified: trunk/reactos/dll/cpl/intl/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/zh-CN.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/lang/zh-CN.rc [iso-8859-1] Mon Dec 7 20:35:33 2015 @@ -53,8 +53,8 @@ LTEXT "éæ©ä¸ç§è¯è¨ï¼ä½¿ä¹ä¸æ¨æ³ä½¿ç¨çé Unicode ç¨åºçè¯è¨çæ¬ç¸å¹é(&S):", -1, 14, 55, 223, 18 GROUPBOX "ä»£ç é¡µè½¬æ¢è¡¨(&C)", -1, 5, 101, 234, 88 CONTROL "", IDC_CONV_TABLES, "SysListView32", LVS_REPORT | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP, 14, 114, 217, 70 - GROUPBOX "é»è®¤ç¨æ·å¸æ·è®¾ç½®", -1, 5, 193, 234, 30 - CHECKBOX "å°ææè®¾ç½®åºç¨äºå½åç¨æ·å¸æ·åé»è®¤ç¨æ·éç½®æä»¶(&D)", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 200, 220, 22, BS_MULTILINE + GROUPBOX "é»è®¤ç¨æ·å¸æ·è®¾ç½®", -1, 5, 193, 234, 32 + CHECKBOX "å°ææè®¾ç½®åºç¨äºå½åç¨æ·å¸æ·åé»è®¤ç¨æ·éç½®æä»¶(&D)", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 201, 220, 22, BS_MULTILINE END IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 234 Modified: trunk/reactos/dll/cpl/intl/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/zh-TW.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/lang/zh-TW.rc [iso-8859-1] Mon Dec 7 20:35:33 2015 @@ -53,7 +53,7 @@ LTEXT "é¸æä¸ç¨®èªè¨ï¼ä½¿ä¹èæ¨æ³ä½¿ç¨çé Unicode ç¨å¼çèªè¨çæ¬ç¸å¹é(&S):", -1, 14, 55, 223, 18 GROUPBOX "å§ç¢¼è¡¨è½æè¡¨(&C)", -1, 5, 101, 234, 88 CONTROL "", IDC_CONV_TABLES, "SysListView32", LVS_REPORT | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP, 14, 114, 217, 70 - GROUPBOX "é»èªä½¿ç¨èå¸³æ¶è¨å®", -1, 5, 193, 234, 30 + GROUPBOX "é»èªä½¿ç¨èå¸³æ¶è¨å®", -1, 5, 193, 234, 32 CHECKBOX "å°ææè¨å®æç¨æ¼ç¶åä½¿ç¨èå¸³æ¶åé»èªä½¿ç¨èéç½®æªæ¡(&D)", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 200, 220, 22, BS_MULTILINE END Modified: trunk/reactos/dll/cpl/usrmgr/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/lang/cs-CZ.… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/lang/cs-CZ.rc [iso-8859-1] Mon Dec 7 20:35:33 2015 @@ -63,7 +63,7 @@ CAPTION "ÄlenstvÃ" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Älen:", -1, 7, 7, 56, 8 + LTEXT "Älen:", -1, 7, 7, 170, 8 CONTROL "", IDC_USER_MEMBERSHIP_LIST, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 7, 18, 238, 173, WS_EX_CLIENTEDGE PUSHBUTTON "PÅidat...", IDC_USER_MEMBERSHIP_ADD, 7, 197, 50, 14 Modified: trunk/reactos/dll/cpl/usrmgr/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/lang/de-DE.… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/lang/de-DE.rc [iso-8859-1] Mon Dec 7 20:35:33 2015 @@ -58,7 +58,7 @@ CAPTION "Mitgliedschaft" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Mitglied von:", -1, 7, 7, 56, 8 + LTEXT "Mitglied von:", -1, 7, 7, 170, 8 CONTROL "", IDC_USER_MEMBERSHIP_LIST, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 7, 18, 238, 173, WS_EX_CLIENTEDGE PUSHBUTTON "&HinzufÃ¼gen...", IDC_USER_MEMBERSHIP_ADD, 7, 197, 50, 14 Modified: trunk/reactos/dll/cpl/usrmgr/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/lang/en-US.… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/lang/en-US.rc [iso-8859-1] Mon Dec 7 20:35:33 2015 @@ -58,7 +58,7 @@ CAPTION "Membership" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Member of:", -1, 7, 7, 56, 8 + LTEXT "Member of:", -1, 7, 7, 170, 8 CONTROL "", IDC_USER_MEMBERSHIP_LIST, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 7, 18, 238, 173, WS_EX_CLIENTEDGE PUSHBUTTON "Add...", IDC_USER_MEMBERSHIP_ADD, 7, 197, 50, 14 Modified: trunk/reactos/dll/cpl/usrmgr/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/lang/es-ES.… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/lang/es-ES.rc [iso-8859-1] Mon Dec 7 20:35:33 2015 @@ -60,7 +60,7 @@ CAPTION "Miembro de" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Miembro de:", -1, 7, 7, 56, 8 + LTEXT "Miembro de:", -1, 7, 7, 170, 8 CONTROL "", IDC_USER_MEMBERSHIP_LIST, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 7, 18, 238, 173, WS_EX_CLIENTEDGE PUSHBUTTON "Agregar...", IDC_USER_MEMBERSHIP_ADD, 7, 197, 50, 14 Modified: trunk/reactos/dll/cpl/usrmgr/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/lang/fr-FR.… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/lang/fr-FR.rc [iso-8859-1] Mon Dec 7 20:35:33 2015 @@ -58,7 +58,7 @@ CAPTION "Appartenance" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Menbre de :", -1, 7, 7, 56, 8 + LTEXT "Menbre de :", -1, 7, 7, 170, 8 CONTROL "", IDC_USER_MEMBERSHIP_LIST, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 7, 18, 238, 173, WS_EX_CLIENTEDGE PUSHBUTTON "Ajouter...", IDC_USER_MEMBERSHIP_ADD, 7, 197, 50, 14 Modified: trunk/reactos/dll/cpl/usrmgr/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/lang/he-IL.… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/lang/he-IL.rc [iso-8859-1] Mon Dec 7 20:35:33 2015 @@ -58,7 +58,7 @@ CAPTION "Membership" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Member of:", -1, 7, 7, 56, 8 + LTEXT "Member of:", -1, 7, 7, 170, 8 CONTROL "", IDC_USER_MEMBERSHIP_LIST, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 7, 18, 238, 173, WS_EX_CLIENTEDGE PUSHBUTTON "Add...", IDC_USER_MEMBERSHIP_ADD, 7, 197, 50, 14 Modified: trunk/reactos/dll/cpl/usrmgr/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/lang/it-IT.… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/lang/it-IT.rc [iso-8859-1] Mon Dec 7 20:35:33 2015 @@ -58,7 +58,7 @@ CAPTION "Membri" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Membri di:", -1, 7, 7, 56, 8 + LTEXT "Membri di:", -1, 7, 7, 170, 8 CONTROL "", IDC_USER_MEMBERSHIP_LIST, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 7, 18, 238, 173, WS_EX_CLIENTEDGE PUSHBUTTON "Nuovo...", IDC_USER_MEMBERSHIP_ADD, 7, 197, 50, 14 Modified: trunk/reactos/dll/cpl/usrmgr/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/lang/pl-PL.… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/lang/pl-PL.rc [iso-8859-1] Mon Dec 7 20:35:33 2015 @@ -68,7 +68,7 @@ CAPTION "CzÅonkostwo" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "NaleÅ¼y do:", -1, 7, 7, 56, 8 + LTEXT "NaleÅ¼y do:", -1, 7, 7, 170, 8 CONTROL "", IDC_USER_MEMBERSHIP_LIST, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 7, 18, 238, 173, WS_EX_CLIENTEDGE PUSHBUTTON "Dodaj...", IDC_USER_MEMBERSHIP_ADD, 7, 197, 50, 14 Modified: trunk/reactos/dll/cpl/usrmgr/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/lang/ro-RO.… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/lang/ro-RO.rc [iso-8859-1] Mon Dec 7 20:35:33 2015 @@ -60,7 +60,7 @@ CAPTION "ApartenenÈÄ" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Membru al grupurilor:", -1, 7, 7, 56, 8 + LTEXT "Membru al grupurilor:", -1, 7, 7, 170, 8 CONTROL "", IDC_USER_MEMBERSHIP_LIST, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 7, 18, 238, 173, WS_EX_CLIENTEDGE PUSHBUTTON "A&dÄugareâ¦", IDC_USER_MEMBERSHIP_ADD, 7, 197, 50, 14 Modified: trunk/reactos/dll/cpl/usrmgr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/lang/ru-RU.… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/lang/ru-RU.rc [iso-8859-1] Mon Dec 7 20:35:33 2015 @@ -58,7 +58,7 @@ CAPTION "Ð§Ð»ÐµÐ½ÑÑÐ²Ð¾ Ð² Ð³ÑÑÐ¿Ð¿Ð°Ñ" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Ð§Ð»ÐµÐ½ Ð³ÑÑÐ¿Ð¿:", -1, 7, 7, 56, 8 + LTEXT "Ð§Ð»ÐµÐ½ Ð³ÑÑÐ¿Ð¿:", -1, 7, 7, 170, 8 CONTROL "", IDC_USER_MEMBERSHIP_LIST, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 7, 18, 238, 173, WS_EX_CLIENTEDGE PUSHBUTTON "ÐÐ¾Ð±Ð°Ð²Ð¸ÑÑ...", IDC_USER_MEMBERSHIP_ADD, 7, 197, 50, 14 Modified: trunk/reactos/dll/cpl/usrmgr/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/lang/tr-TR.… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/lang/tr-TR.rc [iso-8859-1] Mon Dec 7 20:35:33 2015 @@ -60,7 +60,7 @@ CAPTION "Ãyelik" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Ãyesi Olunanlar:", -1, 7, 7, 56, 8 + LTEXT "Ãyesi Olunanlar:", -1, 7, 7, 170, 8 CONTROL "", IDC_USER_MEMBERSHIP_LIST, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 7, 18, 238, 173, WS_EX_CLIENTEDGE PUSHBUTTON "&Ekle...", IDC_USER_MEMBERSHIP_ADD, 7, 197, 50, 14 Modified: trunk/reactos/dll/cpl/usrmgr/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/lang/uk-UA.… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/lang/uk-UA.rc [iso-8859-1] Mon Dec 7 20:35:33 2015 @@ -58,7 +58,7 @@ CAPTION "Ð§Ð»ÐµÐ½ÑÑÐ²Ð¾" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Ð§Ð»ÐµÐ½ ÐÑÑÐ¿Ð¸:", -1, 7, 7, 56, 8 + LTEXT "Ð§Ð»ÐµÐ½ ÐÑÑÐ¿Ð¸:", -1, 7, 7, 170, 8 CONTROL "", IDC_USER_MEMBERSHIP_LIST, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 7, 18, 238, 173, WS_EX_CLIENTEDGE PUSHBUTTON "ÐÐ¾Ð´Ð°ÑÐ¸...", IDC_USER_MEMBERSHIP_ADD, 7, 197, 50, 14 Modified: trunk/reactos/dll/cpl/usrmgr/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/lang/zh-CN.… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/lang/zh-CN.rc [iso-8859-1] Mon Dec 7 20:35:33 2015 @@ -60,7 +60,7 @@ CAPTION "ä¼å" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "æå:", -1, 7, 7, 56, 8 + LTEXT "æå:", -1, 7, 7, 170, 8 CONTROL "", IDC_USER_MEMBERSHIP_LIST, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 7, 18, 238, 173, WS_EX_CLIENTEDGE PUSHBUTTON "æ·»å ...", IDC_USER_MEMBERSHIP_ADD, 7, 197, 50, 14 Modified: trunk/reactos/dll/cpl/usrmgr/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/lang/zh-TW.… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/lang/zh-TW.rc [iso-8859-1] Mon Dec 7 20:35:33 2015 @@ -60,7 +60,7 @@ CAPTION "æå¡" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "æå¡:", -1, 7, 7, 56, 8 + LTEXT "æå¡:", -1, 7, 7, 170, 8 CONTROL "", IDC_USER_MEMBERSHIP_LIST, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 7, 18, 238, 173, WS_EX_CLIENTEDGE PUSHBUTTON "æ·»å ...", IDC_USER_MEMBERSHIP_ADD, 7, 197, 50, 14 Modified: trunk/reactos/dll/win32/shell32/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ca-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] Mon Dec 7 20:35:33 2015 @@ -202,7 +202,7 @@ LTEXT "Choose the advanced properties you want for this shortcut.", -1, 5, 30, 210, 10 CHECKBOX "Run with different credentials", 14000, 25, 50, 150, 10 LTEXT "This option can allow you to run the this shortcut as another user, or continue as yourself while protecting your computer and data from unauthorized program activity.", -1, 50, 60, 175, 40 - CHECKBOX "Run in seperate memory space", 14001, 25, 100, 90, 10, WS_DISABLED + CHECKBOX "Run in seperate memory space", 14001, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Abort", 2, 120, 124, 50, 15, WS_VISIBLE END Modified: trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/cs-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] Mon Dec 7 20:35:33 2015 @@ -208,7 +208,7 @@ LTEXT "Zvolte rozÅ¡ÃÅenÃ© vlastnosti, kterÃ© poÅ¾adujtete pro tohoto zÃ¡stupce.", -1, 5, 30, 210, 10 CHECKBOX "Spustit s jinÃ½mi povÄÅenÃmi", 14000, 25, 50, 150, 10 LTEXT "Tato moÅ¾nost umoÅ¾nÃ spustit tohoto zÃ¡stupce jako jinÃ½ uÅ¾ivatel nebo pÅi spuÅ¡tÄnÃ se souÄasnÃ½m uÅ¾ivatelem chrÃ¡nit poÄÃtaÄ pÅed nepovolenou aktivitou programu.", -1, 50, 60, 175, 40 - CHECKBOX "Spustit v oddÄlenÃ©m pamÄÅ¥ovÃ©m prostoru", 14001, 25, 100, 90, 10, WS_DISABLED + CHECKBOX "Spustit v oddÄlenÃ©m pamÄÅ¥ovÃ©m prostoru", 14001, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Storno", 2, 120, 124, 50, 15, WS_VISIBLE END Modified: trunk/reactos/dll/win32/shell32/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/da-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] Mon Dec 7 20:35:33 2015 @@ -208,7 +208,7 @@ LTEXT "Choose the advanced properties you want for this shortcut.", -1, 5, 30, 210, 10 CHECKBOX "Run with different credentials", 14000, 25, 50, 150, 10 LTEXT "This option can allow you to run the this shortcut as another user, or continue as yourself while protecting your computer and data from unauthorized program activity.", -1, 50, 60, 175, 40 - CHECKBOX "Run in seperate memory space", 14001, 25, 100, 90, 10, WS_DISABLED + CHECKBOX "Run in seperate memory space", 14001, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Abort", 2, 120, 124, 50, 15, WS_VISIBLE END Modified: trunk/reactos/dll/win32/shell32/lang/en-GB.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] Mon Dec 7 20:35:33 2015 @@ -202,7 +202,7 @@ LTEXT "Choose the advanced properties you want for this shortcut.", -1, 5, 30, 210, 10 CHECKBOX "Run with different credentials", 14000, 25, 50, 150, 10 LTEXT "This option can allow you to run the this shortcut as another user, or continue as yourself while protecting your computer and data from unauthorized program activity.", -1, 50, 60, 175, 40 - CHECKBOX "Run in seperate memory space", 14001, 25, 100, 90, 10, WS_DISABLED + CHECKBOX "Run in seperate memory space", 14001, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Abort", 2, 120, 124, 50, 15, WS_VISIBLE END Modified: trunk/reactos/dll/win32/shell32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] Mon Dec 7 20:35:33 2015 @@ -202,7 +202,7 @@ LTEXT "Choose the advanced properties you want for this shortcut.", -1, 5, 30, 210, 10 CHECKBOX "Run with different credentials", 14000, 25, 50, 150, 10 LTEXT "This option can allow you to run the this shortcut as another user, or continue as yourself while protecting your computer and data from unauthorized program activity.", -1, 50, 60, 175, 40 - CHECKBOX "Run in seperate memory space", 14001, 25, 100, 90, 10, WS_DISABLED + CHECKBOX "Run in seperate memory space", 14001, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Cancel", 2, 120, 124, 50, 15, WS_VISIBLE END Modified: trunk/reactos/dll/win32/shell32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/es-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] Mon Dec 7 20:35:33 2015 @@ -204,7 +204,7 @@ LTEXT "Elija las propiedades avanzadas que desee para este acceso directo.", -1, 5, 25, 210, 14 CHECKBOX "Ejecutar con credenciales diferentes", 14000, 25, 50, 150, 10 LTEXT "Esta opciÃ³n puede permitirle ejecutar este acceso directo como otro usuario, o continuar como usted mismo mientras protege su equipo y datos de una actividad de programa no autorizada.", -1, 50, 60, 175, 40 - CHECKBOX "Ejecutar en otro espacio de memoria", 14001, 25, 100, 90, 10, WS_DISABLED + CHECKBOX "Ejecutar en otro espacio de memoria", 14001, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "Aceptar", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Cancelar", 2, 120, 124, 50, 15, WS_VISIBLE END Modified: trunk/reactos/dll/win32/shell32/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fi-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] Mon Dec 7 20:35:33 2015 @@ -202,7 +202,7 @@ LTEXT "Choose the advanced properties you want for this shortcut.", -1, 5, 30, 210, 10 CHECKBOX "Run with different credentials", 14000, 25, 50, 150, 10 LTEXT "This option can allow you to run the this shortcut as another user, or continue as yourself while protecting your computer and data from unauthorized program activity.", -1, 50, 60, 175, 40 - CHECKBOX "Run in seperate memory space", 14001, 25, 100, 90, 10, WS_DISABLED + CHECKBOX "Run in seperate memory space", 14001, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Abort", 2, 120, 124, 50, 15, WS_VISIBLE END Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] Mon Dec 7 20:35:33 2015 @@ -202,7 +202,7 @@ LTEXT "Choisissez la propriÃ©tÃ© Ã©tendue que vous voulez pour ce raccourci.", -1, 5, 30, 210, 10 CHECKBOX "ExÃ©cuter avec des droits diffÃ©rents", 14000, 25, 50, 150, 10 LTEXT "Cette option peut vous permettre d'utiliser ce raccourci en tant qu'autre utilisateur ou de continuer vous-mÃªme en protÃ©geant votre ordinateur et vos donnÃ©es des activÃ©s de programme non autorisÃ©es.", -1, 50, 60, 175, 40 - CHECKBOX "Lancer dans un espace mÃ©moire sÃ©parÃ©", 14001, 25, 100, 90, 10, WS_DISABLED + CHECKBOX "Lancer dans un espace mÃ©moire sÃ©parÃ©", 14001, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Annuler", 2, 120, 124, 50, 15, WS_VISIBLE END Modified: trunk/reactos/dll/win32/shell32/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/he-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/he-IL.rc [iso-8859-1] Mon Dec 7 20:35:33 2015 @@ -202,7 +202,7 @@ LTEXT "Choose the advanced properties you want for this shortcut.", -1, 5, 30, 210, 10 CHECKBOX "Run with different credentials", 14000, 25, 50, 150, 10 LTEXT "This option can allow you to run the this shortcut as another user, or continue as yourself while protecting your computer and data from unauthorized program activity.", -1, 50, 60, 175, 40 - CHECKBOX "××¨×¥ ××××× ××××¨×× ×××¤×¨×", 14001, 25, 100, 90, 10, WS_DISABLED + CHECKBOX "××¨×¥ ××××× ××××¨×× ×××¤×¨×", 14001, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "×××©××¨", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "×××××", 2, 120, 124, 50, 15, WS_VISIBLE END Modified: trunk/reactos/dll/win32/shell32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/hu-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] Mon Dec 7 20:35:33 2015 @@ -202,7 +202,7 @@ LTEXT "Choose the advanced properties you want for this shortcut.", -1, 5, 30, 210, 10 CHECKBOX "Run with different credentials", 14000, 25, 50, 150, 10 LTEXT "This option can allow you to run the this shortcut as another user, or continue as yourself while protecting your computer and data from unauthorized program activity.", -1, 50, 60, 175, 40 - CHECKBOX "Run in seperate memory space", 14001, 25, 100, 90, 10, WS_DISABLED + CHECKBOX "Run in seperate memory space", 14001, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Abort", 2, 120, 124, 50, 15, WS_VISIBLE END Modified: trunk/reactos/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/it-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] Mon Dec 7 20:35:33 2015 @@ -202,7 +202,7 @@ LTEXT "Scegliere le impostazioni avanzate per questo collegamento.", -1, 5, 30, 210, 10 CHECKBOX "Eseguire con credenziali diverse", 14000, 25, 50, 150, 10 LTEXT "Questa opzione permette l'esecuzione del collegamento come se si fosse un altro utente o di proteggere il computer e i dati da attivitÃ non autorizzate del programma.", -1, 50, 60, 175, 40 - CHECKBOX "Eseguire in uno spazio di memoria separato", 14001, 25, 100, 90, 10, WS_DISABLED + CHECKBOX "Eseguire in uno spazio di memoria separato", 14001, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Annulla", 2, 120, 124, 50, 15, WS_VISIBLE END Modified: trunk/reactos/dll/win32/shell32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ja-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] Mon Dec 7 20:35:33 2015 @@ -202,7 +202,7 @@ LTEXT "ãã®ã·ã§ã¼ãã«ããã«ä½¿ç¨ããæ¡å¼µããããã£ãé¸æãã¦ãã ããã", -1, 5, 30, 210, 10 CHECKBOX "ç°ãªãäººç©è¨¼ææå ±ã§å®è¡ãã", 14000, 25, 50, 150, 10 LTEXT "ãã®ãªãã·ã§ã³ãä½¿ç¨ããã¨ãã®ã·ã§ã¼ãã«ãããå¥ã®ã¦ã¼ã¶ã¼ã¨ãã¦å®è¡ã§ãã¾ããã¾ããèªåèªèº«ã§å®è¡ããå ´åãè¨±å¯ããã¦ããªãããã°ã©ã ã®æ´»åããã³ã³ãã¥ã¼ã¿ã¨ãã¼ã¿ãä¿è·ã§ãã¾ãã", -1, 50, 60, 175, 40 - CHECKBOX "å¥ã®ã¡ã¢ãªé åã§å®è¡ãã", 14001, 25, 100, 90, 10, WS_DISABLED + CHECKBOX "å¥ã®ã¡ã¢ãªé åã§å®è¡ãã", 14001, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "ä¸æ¢", 2, 120, 124, 50, 15, WS_VISIBLE END Modified: trunk/reactos/dll/win32/shell32/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ko-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] Mon Dec 7 20:35:33 2015 @@ -202,7 +202,7 @@ LTEXT "Choose the advanced properties you want for this shortcut.", -1, 5, 30, 210, 10 CHECKBOX "Run with different credentials", 14000, 25, 50, 150, 10 LTEXT "This option can allow you to run the this shortcut as another user, or continue as yourself while protecting your computer and data from unauthorized program activity.", -1, 50, 60, 175, 40 - CHECKBOX "Run in seperate memory space", 14001, 25, 100, 90, 10, WS_DISABLED + CHECKBOX "Run in seperate memory space", 14001, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Abort", 2, 120, 124, 50, 15, WS_VISIBLE END Modified: trunk/reactos/dll/win32/shell32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/nl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] Mon Dec 7 20:35:33 2015 @@ -202,7 +202,7 @@ LTEXT "Choose the advanced properties you want for this shortcut.", -1, 5, 30, 210, 10 CHECKBOX "Run with different credentials", 14000, 25, 50, 150, 10 LTEXT "This option can allow you to run the this shortcut as another user, or continue as yourself while protecting your computer and data from unauthorized program activity.", -1, 50, 60, 175, 40 - CHECKBOX "Run in seperate memory space", 14001, 25, 100, 90, 10, WS_DISABLED + CHECKBOX "Run in seperate memory space", 14001, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Abort", 2, 120, 124, 50, 15, WS_VISIBLE END Modified: trunk/reactos/dll/win32/shell32/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/no-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/no-NO.rc [iso-8859-1] Mon Dec 7 20:35:33 2015 @@ -202,7 +202,7 @@ LTEXT "Velg avansert egenskaper som du vil for denne snarveien.", -1, 5, 30, 210, 10 CHECKBOX "KjÃ¸r som administrator", 14000, 25, 50, 150, 10 LTEXT "Med dette valget kan du kjÃ¸re denne snarveien med som en administrator, mens du beskytter din datamaskin og data fra uautorisert program aktivitet.", -1, 50, 60, 175, 40 - CHECKBOX "KjÃ¸r i seperat minneplass", 14001, 25, 100, 90, 10, WS_DISABLED + CHECKBOX "KjÃ¸r i seperat minneplass", 14001, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "OK", IDOK, 25, 120, 50, 15, WS_VISIBLE PUSHBUTTON "Avbryt", IDCANCEL, 120, 120, 50, 15, WS_VISIBLE END Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] Mon Dec 7 20:35:33 2015 @@ -206,7 +206,7 @@ LTEXT "Wybierz wÅaÅciwoÅci zaawansowane dla tego skrÃ³tu.", -1, 5, 30, 210, 10 CHECKBOX "Uruchom z innym UÅ¼ytkownikiem", 14000, 25, 50, 150, 10 LTEXT "Ta opcja pozwoli ci na uruchomienie skrÃ³tu jako inny uÅ¼ytkownik, do ochrony twoich danych przed niepowoÅanym dostÄpem.", -1, 50, 60, 175, 40 - CHECKBOX "Uruchom w osobnym przedziale pamiÄci", 14001, 25, 100, 90, 10, WS_DISABLED + CHECKBOX "Uruchom w osobnym przedziale pamiÄci", 14001, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Przerwij", 2, 120, 124, 50, 15, WS_VISIBLE END Modified: trunk/reactos/dll/win32/shell32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] Mon Dec 7 20:35:33 2015 @@ -202,7 +202,7 @@ LTEXT "Escolha as propriedades avanÃ§adas para este atalho.", -1, 5, 30, 210, 10 CHECKBOX "Executar com credenciais diferentes", 14000, 25, 50, 150, 10 LTEXT "Esta opÃ§Ã£o permite vocÃª executar este atalho como outro usuÃ¡rio, ou continuar como si prÃ³prio enquanto protege seu computador e dados de atividades de programas nÃ£o autorizados.", -1, 50, 60, 175, 40 - CHECKBOX "Executar em espaÃ§o de memÃ³ria separado", 14001, 25, 100, 90, 10, WS_DISABLED + CHECKBOX "Executar em espaÃ§o de memÃ³ria separado", 14001, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Abortar", 2, 120, 124, 50, 15, WS_VISIBLE END Modified: trunk/reactos/dll/win32/shell32/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] Mon Dec 7 20:35:33 2015 @@ -202,7 +202,7 @@ LTEXT "Escolha as propriedades avanÃ§adas que quer para este atalho.", -1, 5, 30, 210, 10 CHECKBOX "Executar com diferentes credenciais", 14000, 25, 50, 150, 10 LTEXT "Esta opÃ§Ã£o permite executar este atalho como outro utilizador, ou continue com a sua conta enquanto protege o seu computador e dados contra actividade de programas nÃ£o autorizados.", -1, 50, 60, 175, 40 - CHECKBOX "Executar num espaÃ§o de memÃ³ria separada", 14001, 25, 100, 90, 10, WS_DISABLED + CHECKBOX "Executar num espaÃ§o de memÃ³ria separada", 14001, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Abortar", 2, 120, 124, 50, 15, WS_VISIBLE END Modified: trunk/reactos/dll/win32/shell32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ro-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ro-RO.rc [iso-8859-1] Mon Dec 7 20:35:33 2015 @@ -202,9 +202,9 @@ BEGIN ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "SpecificaÈi proprietÄÈi avansate pentru aceastÄ scurtÄturÄ.", -1, 5, 30, 210, 10 - CHECKBOX "ExecutÄ sub o identitate explicitÄ", 14000, 25, 50, 150, 10 + CHECKBOX "ExecutÄ sub o i&dentitate explicitÄ", 14000, 25, 50, 150, 10 LTEXT "AceastÄ opÈiune vÄ permite execuÈia scurtÄturii sub autoritatea unui alt utilizator sau continuarea folosirii scurtÄturii Ã®n mod securizat, protejÃ¢nd astfel calculatorul de activitÄÈi neautorizate.", -1, 50, 60, 175, 40 - CHECKBOX "ExecutÄ Ã®n spaÈiu de memorie separat", 14001, 25, 100, 90, 10, WS_DISABLED + CHECKBOX "ExecutÄ Ã®n sp&aÈiu de memorie separat", 14001, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "Con&firmÄ", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "A&nuleazÄ", 2, 120, 124, 50, 15, WS_VISIBLE END Modified: trunk/reactos/dll/win32/shell32/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] Mon Dec 7 20:35:33 2015 @@ -202,7 +202,7 @@ LTEXT "Choose the advanced properties you want for this shortcut.", -1, 5, 30, 210, 10 CHECKBOX "Run with different credentials", 14000, 25, 50, 150, 10 LTEXT "This option can allow you to run the this shortcut as another user, or continue as yourself while protecting your computer and data from unauthorized program activity.", -1, 50, 60, 175, 40 - CHECKBOX "Run in seperate memory space", 14001, 25, 100, 90, 10, WS_DISABLED + CHECKBOX "Run in seperate memory space", 14001, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Abort", 2, 120, 124, 50, 15, WS_VISIBLE END Modified: trunk/reactos/dll/win32/shell32/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sq-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sq-AL.rc [iso-8859-1] Mon Dec 7 20:35:33 2015 @@ -206,7 +206,7 @@ LTEXT "Zgjidhni karakteristikat e avancuara qÃ« ju dÃ«shironi pÃ«r kÃ«tÃ« ikonÃ«.", -1, 5, 30, 210, 10 CHECKBOX "Ekzekuto me kredenciale tÃ« ndryshme", 14000, 25, 50, 150, 10 LTEXT "Ky opsion mund tÃ« lejojÃ« pÃ«r tÃ« drejtuar kÃ«tÃ« ikonÃ« si njÃ« pÃ«rdorues tjetÃ«r, ose tÃ« vazhdojÃ« si veten tÃ«nde, duke mbrojtur kompjuterin tuaj dhe tÃ« dhÃ«nat nga aktiviteti i paautorizuar i programit.", -1, 50, 60, 175, 40 - CHECKBOX "Ekzekuto nÃ« hapÃ«sirÃ« ââtÃ« veÃ§antÃ« qÃ« e kujtesÃ«s", 14001, 25, 100, 90, 10, WS_DISABLED + CHECKBOX "Ekzekuto nÃ« hapÃ«sirÃ« ââtÃ« veÃ§antÃ« qÃ« e kujtesÃ«s", 14001, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "NdÃ«rprej", 2, 120, 124, 50, 15, WS_VISIBLE END Modified: trunk/reactos/dll/win32/shell32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sv-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] Mon Dec 7 20:35:33 2015 @@ -202,7 +202,7 @@ LTEXT "Choose the advanced properties you want for this shortcut.", -1, 5, 30, 210, 10 CHECKBOX "Run with different credentials", 14000, 25, 50, 150, 10 LTEXT "This option can allow you to run the this shortcut as another user, or continue as yourself while protecting your computer and data from unauthorized program activity.", -1, 50, 60, 175, 40 - CHECKBOX "Run in seperate memory space", 14001, 25, 100, 90, 10, WS_DISABLED + CHECKBOX "Run in seperate memory space", 14001, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Abort", 2, 120, 124, 50, 15, WS_VISIBLE END Modified: trunk/reactos/dll/win32/shell32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/tr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/tr-TR.rc [iso-8859-1] Mon Dec 7 20:35:33 2015 @@ -202,7 +202,7 @@ LTEXT "Bu kÄ±sayolda istediÄiniz geliÅmiÅ Ã¶zellikleri seÃ§in.", -1, 5, 30, 210, 10 CHECKBOX "&FarklÄ± kimlik bilgisiyle Ã§alÄ±ÅtÄ±r", 14000, 25, 50, 150, 10 LTEXT "Bu seÃ§enek bu kÄ±sayolu baÅka bir kullanÄ±cÄ± olarak Ã§alÄ±ÅtÄ±rmanÄ±zÄ± ya da bilgisayar ve verilerinizi yetkisiz program iÅlemlerinden korumak iÃ§in kendiniz olarak devam etmenizi saÄlar.", -1, 50, 60, 175, 40 - CHECKBOX "AyrÄ± &bir bellek alanÄ±nda Ã§alÄ±ÅtÄ±r", 14001, 25, 100, 90, 10, WS_DISABLED + CHECKBOX "AyrÄ± &bir bellek alanÄ±nda Ã§alÄ±ÅtÄ±r", 14001, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "Tamam", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Ä°ptal", 2, 120, 124, 50, 15, WS_VISIBLE END Modified: trunk/reactos/dll/win32/shell32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/uk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] Mon Dec 7 20:35:33 2015 @@ -202,7 +202,7 @@ LTEXT "ÐÐ¸Ð±ÐµÑÑÑÑ Ð¿Ð¾ÑÑÑÐ±Ð½Ñ Ð²Ð»Ð°ÑÑÐ¸Ð²Ð¾ÑÑÑ Ð´Ð»Ñ ÑÑÐ¾Ð³Ð¾ ÑÑÐ»Ð¸ÐºÐ°.", -1, 5, 30, 210, 10 CHECKBOX "ÐÐ°Ð¿ÑÑÐºÐ°ÑÐ¸ Ð· ÑÐ½ÑÐ¸Ð¼Ð¸ Ð¾Ð±Ð»ÑÐºÐ¾Ð²Ð¸Ð¼Ð¸ Ð´Ð°Ð½Ð¸Ð¼Ð¸", 14000, 25, 50, 150, 10 LTEXT "Ð¦ÐµÐ¹ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ Ð´Ð¾Ð·Ð²Ð¾Ð»ÑÑ Ð²Ð¸ÐºÐ¾ÑÐ¸ÑÑÐ¾Ð²ÑÐ²Ð°ÑÐ¸ ÑÐµÐ¹ ÑÑÐ»Ð¸Ðº Ð²ÑÐ´ ÑÐ¼ÐµÐ½Ñ ÑÐ½ÑÐ¾Ð³Ð¾ ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°ÑÐ° Ð°Ð±Ð¾ Ð¿ÑÐ¾Ð´Ð¾Ð²Ð¶ÑÐ²Ð°ÑÐ¸ ÑÐ¾Ð±Ð¾ÑÑ Ð²ÑÐ´ ÑÐ²Ð¾Ð³Ð¾ ÑÐ¼ÐµÐ½Ñ, ÑÐ¾ Ð·Ð°ÑÐ¸ÑÐ°Ñ ÐºÐ¾Ð¼Ð¿'ÑÑÐµÑ Ð¹ Ð´Ð°Ð½Ñ Ð²ÑÐ´ Ð½ÐµÑÐ°Ð½ÐºÑÑÐ¾Ð½Ð¾Ð²Ð°Ð½Ð¸Ñ Ð´ÑÐ¹ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¸.", -1, 50, 60, 175, 40 - CHECKBOX "ÐÐ°Ð¿ÑÑÐºÐ°ÑÐ¸ Ð² Ð¾ÐºÑÐµÐ¼ÑÐ¹ Ð¾Ð±Ð»Ð°ÑÑÑ Ð¿Ð°Ð¼'ÑÑÑ", 14001, 25, 100, 90, 10, WS_DISABLED + CHECKBOX "ÐÐ°Ð¿ÑÑÐºÐ°ÑÐ¸ Ð² Ð¾ÐºÑÐµÐ¼ÑÐ¹ Ð¾Ð±Ð»Ð°ÑÑÑ Ð¿Ð°Ð¼'ÑÑÑ", 14001, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Ð¡ÐºÐ°ÑÑÐ²Ð°ÑÐ¸", 2, 120, 124, 50, 15, WS_VISIBLE END Modified: trunk/reactos/dll/win32/shell32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-CN.rc [iso-8859-1] Mon Dec 7 20:35:33 2015 @@ -211,7 +211,7 @@ LTEXT "éæ©ä½ æ³è¦ä¸ºè¿ä¸ªå¿«æ·æ¹å¼çé«çº§çå±æ§ã", -1, 5, 30, 210, 10 CHECKBOX "ä»¥ä¸åç¨æ·èº«ä»½è¿è¡", 14000, 25, 50, 150, 10 LTEXT "æ¤éé¡¹å¯ä»¥åè®¸æ¨è¿è¡æ¤å¿«æ·æ¹å¼ä½ä¸ºå¦ä¸ä¸ªç¨æ·ï¼æç»§ç»ä½ä¸ºèªå·±åæ¶ä¿æ¤æ¨çè®¡ç®æºåæ°æ®ååæªç»ææçç¨åºæ´»å¨ã", -1, 50, 60, 175, 40 - CHECKBOX "å¨åç¬çååç©ºé´ä¸è¿è¡", 14001, 25, 100, 90, 10, WS_DISABLED + CHECKBOX "å¨åç¬çååç©ºé´ä¸è¿è¡", 14001, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "ç¡®å®", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "ä¸æ¢", 2, 120, 124, 50, 15, WS_VISIBLE END Modified: trunk/reactos/dll/win32/shell32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] Mon Dec 7 20:35:33 2015 @@ -210,7 +210,7 @@ LTEXT "Choose the advanced properties you want for this shortcut.", -1, 5, 30, 210, 10 CHECKBOX "Run with different credentials", 14000, 25, 50, 150, 10 LTEXT "This option can allow you to run the this shortcut as another user, or continue as yourself while protecting your computer and data from unauthorized program activity.", -1, 50, 60, 175, 40 - CHECKBOX "Run in seperate memory space", 14001, 25, 100, 90, 10, WS_DISABLED + CHECKBOX "Run in seperate memory space", 14001, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Abort", 2, 120, 124, 50, 15, WS_VISIBLE END

9 years

[ekohl] 70288: [SERVMAN] Arrange large and small icons after changing the view. Patch by Carlo Bramini. #CORE-10350 #resolve #comment Thanks a lot!

by ekohl＠svn.reactos.org

Author: ekohl Date: Mon Dec 7 18:19:05 2015 New Revision: 70288 URL: http://svn.reactos.org/svn/reactos?rev=70288&view=rev Log: [SERVMAN] Arrange large and small icons after changing the view. Patch by Carlo Bramini. #CORE-10350 #resolve #comment Thanks a lot! Modified: trunk/reactos/base/applications/mscutils/servman/mainwnd.c Modified: trunk/reactos/base/applications/mscutils/servman/mainwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/mainwnd.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/mainwnd.c [iso-8859-1] Mon Dec 7 18:19:05 2015 @@ -558,8 +558,9 @@ break; case ID_VIEW_LARGE: - SetListViewStyle(Info->hListView, - LVS_ICON); + SetListViewStyle(Info->hListView, LVS_ICON); + ListView_Arrange(Info->hListView, LVA_DEFAULT); + CheckMenuRadioItem(GetMenu(Info->hMainWnd), ID_VIEW_LARGE, ID_VIEW_DETAILS, @@ -568,8 +569,9 @@ break; case ID_VIEW_SMALL: - SetListViewStyle(Info->hListView, - LVS_SMALLICON); + SetListViewStyle(Info->hListView, LVS_SMALLICON); + ListView_Arrange(Info->hListView, LVA_DEFAULT); + CheckMenuRadioItem(GetMenu(Info->hMainWnd), ID_VIEW_LARGE, ID_VIEW_DETAILS,

9 years

← Newer
1
...
16
17
18
19
20
21
22
...
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2015