February 2011 - Wine-Commits

Austin English : ole32/tests: Make sure to use a return value (LLVM/Clang).
by Alexandre Julliard Feb. 14, 2011

Feb. 14, 2011

Module: wine Branch: master Commit: 5206db805554de877ec685db5dd6e9a7aea59b97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5206db805554de877ec685db5… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 10 15:50:30 2011 -0800 ole32/tests: Make sure to use a return value (LLVM/Clang). --- dlls/ole32/tests/ole2.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 6de8cd1..8961186 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -1657,6 +1657,7 @@ static void test_default_handler(void) sizel.cx = sizel.cy = 0; hr = IOleObject_SetExtent(pObject, DVASPECT_CONTENT, &sizel); + ok(hr == OLE_E_NOTRUNNING, "IOleObject_SetExtent should have returned OLE_E_NOTRUNNING instead of 0x%08x\n", hr); hr = IOleObject_SetHostNames(pObject, wszHostName, NULL); ok_ole_success(hr, "IOleObject_SetHostNames");

1 0

Austin English : ole32/tests: Make sure to use return values (LLVM/Clang).
by Alexandre Julliard Feb. 14, 2011

Feb. 14, 2011

Module: wine Branch: master Commit: fe975fb0b6d794df430e8fa78bf1e8af88f26072 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe975fb0b6d794df430e8fa78… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 10 15:16:06 2011 -0800 ole32/tests: Make sure to use return values (LLVM/Clang). --- dlls/ole32/tests/storage32.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index bf3402d..83d5d2f 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -1008,6 +1008,7 @@ static void test_streamenum(void) CoTaskMemFree(stat.pwcsName); r = IEnumSTATSTG_Release(ee); + ok(r==S_OK, "EnumSTATSTG_Release failed with error 0x%08x\n", r); /* second enum... destroy the stream before reading */ r = IStorage_EnumElements(stg, 0, NULL, 0, &ee); @@ -1038,6 +1039,7 @@ static void test_streamenum(void) ok(r==S_OK, "IStorage->CreateStream failed\n"); r = IStream_Release(stm); + ok(r==S_OK, "Stream_Release failed with error 0x%08x\n", r); count = 0xf00; r = IEnumSTATSTG_Next(ee, 1, &stat, &count); @@ -1054,6 +1056,7 @@ static void test_streamenum(void) ok(r==S_OK, "IStorage->CreateStream failed\n"); r = IStream_Release(stm); + ok(r==S_OK, "Stream_Release failed with error 0x%08x\n", r); count = 0xf00; r = IEnumSTATSTG_Next(ee, 1, &stat, &count); @@ -1071,6 +1074,7 @@ static void test_streamenum(void) ok(r==S_OK, "IStorage->CreateStream failed\n"); r = IStream_Release(stm); + ok(r==S_OK, "Stream_Release failed with error 0x%08x\n", r); r = IEnumSTATSTG_Reset(ee); ok(r==S_OK, "IEnumSTATSTG->Reset failed\n"); @@ -1416,6 +1420,7 @@ static void test_revert(void) ok(r==S_OK, "IStorage->CreateStorage failed, hr=%08x\n", r); r = IStorage_Revert(stg); + ok(r==S_OK, "Storage_Revert failed with error 0x%08x\n", r); /* all open objects become invalid */ r = IStream_Write(stm, "this shouldn't work\n", 20, NULL); @@ -2732,6 +2737,7 @@ static void test_toplevel_stat(void) ok(r==S_OK, "StgCreateDocfile failed\n"); r = IStorage_Stat( stg, &stat, STATFLAG_DEFAULT ); + ok(r==S_OK, "Storage_Stat failed with error 0x%08x\n", r); ok(!strcmp_ww(stat.pwcsName, filename), "expected %s, got %s\n", wine_dbgstr_w(filename), wine_dbgstr_w(stat.pwcsName)); CoTaskMemFree(stat.pwcsName); @@ -2742,6 +2748,7 @@ static void test_toplevel_stat(void) ok(r==S_OK, "StgOpenStorage failed with error 0x%08x\n", r); r = IStorage_Stat( stg, &stat, STATFLAG_DEFAULT ); + ok(r==S_OK, "Storage_Stat failed with error 0x%08x\n", r); ok(!strcmp_ww(stat.pwcsName, filename), "expected %s, got %s\n", wine_dbgstr_w(filename), wine_dbgstr_w(stat.pwcsName)); CoTaskMemFree(stat.pwcsName); @@ -2765,6 +2772,7 @@ static void test_toplevel_stat(void) ok(r==S_OK, "StgCreateDocfile failed\n"); r = IStorage_Stat( stg, &stat, STATFLAG_DEFAULT ); + ok(r==S_OK, "Storage_Stat failed with error 0x%08x\n", r); ok(!strcmp_ww(stat.pwcsName, filename), "expected %s, got %s\n", wine_dbgstr_w(filename), wine_dbgstr_w(stat.pwcsName)); CoTaskMemFree(stat.pwcsName); @@ -2775,6 +2783,7 @@ static void test_toplevel_stat(void) ok(r==S_OK, "StgOpenStorage failed with error 0x%08x\n", r); r = IStorage_Stat( stg, &stat, STATFLAG_DEFAULT ); + ok(r==S_OK, "Storage_Stat failed with error 0x%08x\n", r); ok(!strcmp_ww(stat.pwcsName, filename), "expected %s, got %s\n", wine_dbgstr_w(filename), wine_dbgstr_w(stat.pwcsName)); CoTaskMemFree(stat.pwcsName);

1 0

Maarten Lankhorst : dsound: Forcibly lock buffers to be mixed.
by Alexandre Julliard Feb. 14, 2011

Feb. 14, 2011

Module: wine Branch: master Commit: af5423ef5761545b4177f45be5bbcbbcab6afba1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af5423ef5761545b4177f45be… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Feb 11 01:21:05 2011 +0100 dsound: Forcibly lock buffers to be mixed. --- dlls/dsound/mixer.c | 18 +++--------------- 1 files changed, 3 insertions(+), 15 deletions(-) diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index e08cbca..6647e4a 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -664,7 +664,6 @@ static DWORD DSOUND_MixOne(IDirectSoundBufferImpl *dsb, DWORD writepos, DWORD mi * writepos = the current safe-to-write position in the primary buffer * mixlen = the maximum amount to mix into the primary buffer * (beyond the current writepos) - * mustlock = Do we have to fight for lock because we otherwise risk an underrun? * recover = true if the sound device may have been reset and the write * position in the device buffer changed * all_stopped = reports back if all buffers have stopped @@ -672,12 +671,11 @@ static DWORD DSOUND_MixOne(IDirectSoundBufferImpl *dsb, DWORD writepos, DWORD mi * Returns: the length beyond the writepos that was mixed to. */ -static DWORD DSOUND_MixToPrimary(const DirectSoundDevice *device, DWORD writepos, DWORD mixlen, BOOL mustlock, BOOL recover, BOOL *all_stopped) +static DWORD DSOUND_MixToPrimary(const DirectSoundDevice *device, DWORD writepos, DWORD mixlen, BOOL recover, BOOL *all_stopped) { INT i, len; DWORD minlen = 0; IDirectSoundBufferImpl *dsb; - BOOL gotall = TRUE; /* unless we find a running buffer, all have stopped */ *all_stopped = TRUE; @@ -690,11 +688,7 @@ static DWORD DSOUND_MixToPrimary(const DirectSoundDevice *device, DWORD writepos if (dsb->buflen && dsb->state && !dsb->hwbuf) { TRACE("Checking %p, mixlen=%d\n", dsb, mixlen); - if (!RtlAcquireResourceShared(&dsb->lock, mustlock)) - { - gotall = FALSE; - continue; - } + RtlAcquireResourceShared(&dsb->lock, TRUE); /* if buffer is stopping it is stopped now */ if (dsb->state == STATE_STOPPING) { dsb->state = STATE_STOPPED; @@ -726,7 +720,6 @@ static DWORD DSOUND_MixToPrimary(const DirectSoundDevice *device, DWORD writepos } TRACE("Mixed at least %d from all buffers\n", minlen); - if (!gotall) return 0; return minlen; } @@ -814,7 +807,6 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) DWORD playpos, writepos, writelead, maxq, frag, prebuff_max, prebuff_left, size1, size2, mixplaypos, mixplaypos2; LPVOID buf1, buf2; BOOL lock = (device->hwbuf && !(device->drvdesc.dwFlags & DSDDESC_DONTNEEDPRIMARYLOCK)); - BOOL mustlock = FALSE; int nfiller; /* the sound of silence */ @@ -897,15 +889,11 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) TRACE("prebuff_left = %d, prebuff_max = %dx%d=%d, writelead=%d\n", prebuff_left, device->prebuf, device->fraglen, prebuff_max, writelead); - /* Do we risk an 'underrun' if we don't advance pointer? */ - if (writelead/device->fraglen <= ds_snd_queue_min || recover) - mustlock = TRUE; - if (lock) IDsDriverBuffer_Lock(device->hwbuf, &buf1, &size1, &buf2, &size2, writepos, maxq, 0); /* do the mixing */ - frag = DSOUND_MixToPrimary(device, writepos, maxq, mustlock, recover, &all_stopped); + frag = DSOUND_MixToPrimary(device, writepos, maxq, recover, &all_stopped); if (frag + writepos > device->buflen) {

1 0

Austin English : ntdll/tests: Don't check return values inside of if(0) ( LLVM/Clang).
by Alexandre Julliard Feb. 14, 2011

Feb. 14, 2011

Module: wine Branch: master Commit: c57c9ce3d1eb2c69dfbbcd23417273a551c66bf0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c57c9ce3d1eb2c69dfbbcd234… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 10 15:15:39 2011 -0800 ntdll/tests: Don't check return values inside of if(0) (LLVM/Clang). --- dlls/ntdll/tests/rtl.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 5059714..63bc813 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -1030,8 +1030,8 @@ static void test_RtlAllocateAndInitializeSid(void) /* these tests crash on XP */ if (0) { - ret = pRtlAllocateAndInitializeSid(NULL, 0, 1, 2, 3, 4, 5, 6, 7, 8, &psid); - ret = pRtlAllocateAndInitializeSid(&sia, 0, 1, 2, 3, 4, 5, 6, 7, 8, NULL); + pRtlAllocateAndInitializeSid(NULL, 0, 1, 2, 3, 4, 5, 6, 7, 8, &psid); + pRtlAllocateAndInitializeSid(&sia, 0, 1, 2, 3, 4, 5, 6, 7, 8, NULL); } ret = pRtlAllocateAndInitializeSid(&sia, 9, 1, 2, 3, 4, 5, 6, 7, 8, &psid);

1 0

Austin English : ole32/tests: Make sure to use return values (LLVM/Clang).
by Alexandre Julliard Feb. 14, 2011

Feb. 14, 2011

Module: wine Branch: master Commit: efb3c48d8a1a8a69c1f35ccd9ab2c3d0fd86cac7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efb3c48d8a1a8a69c1f35ccd9… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 10 15:15:59 2011 -0800 ole32/tests: Make sure to use return values (LLVM/Clang). --- dlls/ole32/tests/moniker.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index eb7973e..54a5f8c 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -1012,7 +1012,6 @@ static void test_MkParseDisplayName(void) hr = IEnumMoniker_QueryInterface(spEM1, &IID_IUnknown, (void*) &lpEM1); /* Register a couple of Monikers and check is ok */ ok(hr==0, "IEnumMoniker_QueryInterface hr %08x %p\n", hr, lpEM1); - hr = MK_E_NOOBJECT; matchCnt = count_moniker_matches(pbc, spEM1); trace("Number of matches is %i\n", matchCnt); @@ -1276,6 +1275,7 @@ static void test_moniker( IROTData_Release(rotdata); hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok_ole_success(hr, CreateStreamOnHGlobal); /* Saving */ @@ -1456,6 +1456,7 @@ static void test_file_moniker(WCHAR* path) ok_ole_success(hr, CreateFileMoniker); hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok_ole_success(hr, CreateStreamOnHGlobal); /* Marshal */ hr = CoMarshalInterface(stream, &IID_IMoniker, (IUnknown *)moniker1, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL);

1 0

Austin English : ntdll/tests: Make sure return values are used (LLVM/Clang) .
by Alexandre Julliard Feb. 14, 2011

Feb. 14, 2011

Module: wine Branch: master Commit: fe9544abd20b1bf5f297473760ccea612cb4ac04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe9544abd20b1bf5f29747376… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 10 15:15:44 2011 -0800 ntdll/tests: Make sure return values are used (LLVM/Clang). --- dlls/ntdll/tests/rtlbitmap.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/rtlbitmap.c b/dlls/ntdll/tests/rtlbitmap.c index d24f0af..4c1559b 100644 --- a/dlls/ntdll/tests/rtlbitmap.c +++ b/dlls/ntdll/tests/rtlbitmap.c @@ -497,6 +497,7 @@ static void test_RtlFindSetRuns(void) /* Get first 2 */ ulCount = pRtlFindSetRuns(&bm, runs, 2, FALSE); + ok(ulCount == 2, "RtlFindClearRuns returned %d, expected 2\n", ulCount); ok (runs[0].StartingIndex == 7 || runs[0].StartingIndex == 101,"bad find\n"); ok (runs[1].StartingIndex == 7 || runs[1].StartingIndex == 101,"bad find\n"); ok (runs[0].NumberOfBits + runs[1].NumberOfBits == 19 + 3,"bad size\n"); @@ -506,6 +507,7 @@ static void test_RtlFindSetRuns(void) /* Get longest 3 */ memset(runs, 0, sizeof(runs)); ulCount = pRtlFindSetRuns(&bm, runs, 2, TRUE); + ok(ulCount == 2, "RtlFindClearRuns returned %d, expected 2\n", ulCount); ok (runs[0].StartingIndex == 7 || runs[0].StartingIndex == 1877,"bad find\n"); ok (runs[1].StartingIndex == 7 || runs[1].StartingIndex == 1877,"bad find\n"); ok (runs[0].NumberOfBits + runs[1].NumberOfBits == 33 + 19,"bad size\n"); @@ -515,6 +517,7 @@ static void test_RtlFindSetRuns(void) /* Get all 3 */ memset(runs, 0, sizeof(runs)); ulCount = pRtlFindSetRuns(&bm, runs, 3, TRUE); + ok(ulCount == 3, "RtlFindClearRuns returned %d, expected 3\n", ulCount); ok (runs[0].StartingIndex == 7 || runs[0].StartingIndex == 101 || runs[0].StartingIndex == 1877,"bad find\n"); ok (runs[1].StartingIndex == 7 || runs[1].StartingIndex == 101 || @@ -571,6 +574,7 @@ static void test_RtlFindClearRuns(void) /* Get first 2 */ ulCount = pRtlFindClearRuns(&bm, runs, 2, FALSE); + ok(ulCount == 2, "RtlFindClearRuns returned %d, expected 2\n", ulCount); ok (runs[0].StartingIndex == 7 || runs[0].StartingIndex == 101,"bad find\n"); ok (runs[1].StartingIndex == 7 || runs[1].StartingIndex == 101,"bad find\n"); ok (runs[0].NumberOfBits + runs[1].NumberOfBits == 19 + 3,"bad size\n"); @@ -580,6 +584,7 @@ static void test_RtlFindClearRuns(void) /* Get longest 3 */ memset(runs, 0, sizeof(runs)); ulCount = pRtlFindClearRuns(&bm, runs, 2, TRUE); + ok(ulCount == 2, "RtlFindClearRuns returned %d, expected 2\n", ulCount); ok (runs[0].StartingIndex == 7 || runs[0].StartingIndex == 1877,"bad find\n"); ok (runs[1].StartingIndex == 7 || runs[1].StartingIndex == 1877,"bad find\n"); ok (runs[0].NumberOfBits + runs[1].NumberOfBits == 33 + 19,"bad size\n"); @@ -589,6 +594,7 @@ static void test_RtlFindClearRuns(void) /* Get all 3 */ memset(runs, 0, sizeof(runs)); ulCount = pRtlFindClearRuns(&bm, runs, 3, TRUE); + ok(ulCount == 3, "RtlFindClearRuns returned %d, expected 3\n", ulCount); ok (runs[0].StartingIndex == 7 || runs[0].StartingIndex == 101 || runs[0].StartingIndex == 1877,"bad find\n"); ok (runs[1].StartingIndex == 7 || runs[1].StartingIndex == 101 ||

1 0

Alexander Lakhin : regedit: Update Russian translation.
by Alexandre Julliard Feb. 14, 2011

Feb. 14, 2011

Module: wine Branch: master Commit: 43790cf374dac025a8ae27b7c62c7925148c8376 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43790cf374dac025a8ae27b7c… Author: Alexander Lakhin <exclusion(a)gmail.com> Date: Fri Feb 11 21:30:16 2011 +0300 regedit: Update Russian translation. --- programs/regedit/Ru.rc | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/programs/regedit/Ru.rc b/programs/regedit/Ru.rc index 38fe0ea..f02e4b1 100644 --- a/programs/regedit/Ru.rc +++ b/programs/regedit/Ru.rc @@ -48,9 +48,9 @@ BEGIN LTEXT "Найти:",IDC_STATIC,5,7,119,8 EDITTEXT IDC_VALUE_NAME,40,5,120,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL LTEXT "Искать в:",IDC_STATIC,5, 22, 119, 8 - CHECKBOX "Ключах", IDC_FIND_KEYS, 5, 34, 90, 10, WS_TABSTOP | WS_GROUP | BS_AUTOCHECKBOX - CHECKBOX "Названиях значений", IDC_FIND_VALUES, 5, 46, 90, 10, WS_TABSTOP | BS_AUTOCHECKBOX - CHECKBOX "Содержимом", IDC_FIND_CONTENT, 5, 58, 90, 10, WS_TABSTOP | BS_AUTOCHECKBOX + CHECKBOX "Именах разделов", IDC_FIND_KEYS, 5, 34, 90, 10, WS_TABSTOP | WS_GROUP | BS_AUTOCHECKBOX + CHECKBOX "Именах параметров", IDC_FIND_VALUES, 5, 46, 90, 10, WS_TABSTOP | BS_AUTOCHECKBOX + CHECKBOX "Значениях параметров", IDC_FIND_CONTENT, 5, 58, 90, 10, WS_TABSTOP | BS_AUTOCHECKBOX CHECKBOX "Всю строку целиком", IDC_FIND_WHOLE, 5, 70, 90, 10, WS_TABSTOP | BS_AUTOCHECKBOX DEFPUSHBUTTON "Искать",IDOK,170,5,35,11,WS_GROUP PUSHBUTTON "Закрыть",IDCANCEL,170,22,35,11, WS_GROUP @@ -58,7 +58,7 @@ END IDD_ADDFAVORITE DIALOG 22, 17, 210, 55 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Добавить избранное" +CAPTION "Добавление в избранное" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Имя:",IDC_STATIC,5,5,119,8 @@ -69,7 +69,7 @@ END IDD_DELFAVORITE DIALOG 22, 17, 210, 90 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Удалить избранное" +CAPTION "Удаление из избранного" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Имя:",IDC_STATIC,5,5,119,8 @@ -80,12 +80,12 @@ END IDD_EDIT_STRING DIALOG 22, 17, 210, 75 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Изменить строку" +CAPTION "Изменение строкового параметра" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Название значения:",IDC_STATIC,5,5,119,8 + LTEXT "Имя параметра:",IDC_STATIC,5,5,119,8 EDITTEXT IDC_VALUE_NAME,5,15,200,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL| WS_DISABLED - LTEXT "Данные:",IDC_STATIC,5,30,119,8 + LTEXT "Значение:",IDC_STATIC,5,30,119,8 EDITTEXT IDC_VALUE_DATA,5,40,200,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL DEFPUSHBUTTON "OK",IDOK,130,60,30,11,WS_GROUP PUSHBUTTON "Отменить",IDCANCEL,165,60,40,11,WS_GROUP @@ -93,15 +93,15 @@ END IDD_EDIT_DWORD DIALOG 22, 17, 210, 100 STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU -CAPTION "Изменить DWORD" +CAPTION "Изменение параметра DWORD" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Название значения:",IDC_STATIC,5,5,119,8 + LTEXT "Имя параметра:",IDC_STATIC,5,5,119,8 EDITTEXT IDC_VALUE_NAME,5,15,200,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL| WS_DISABLED - LTEXT "Данные:",IDC_STATIC,5,30,90,8 + LTEXT "Значение:",IDC_STATIC,5,30,90,8 EDITTEXT IDC_VALUE_DATA,5,40,90,12, WS_BORDER | WS_TABSTOP - GROUPBOX "Исчисление", IDC_DWORD_BASE, 120, 30, 85, 37, BS_GROUPBOX - AUTORADIOBUTTON "16-ти ричное", IDC_DWORD_HEX, 130, 40, 60, 10, WS_TABSTOP + GROUPBOX "Представление", IDC_DWORD_BASE, 120, 30, 85, 37, BS_GROUPBOX + AUTORADIOBUTTON "16-ричное", IDC_DWORD_HEX, 130, 40, 60, 10, WS_TABSTOP AUTORADIOBUTTON "Десятичное", IDC_DWORD_DEC, 130, 52, 60, 10, WS_TABSTOP DEFPUSHBUTTON "OK",IDOK,130,80,30,11,WS_GROUP PUSHBUTTON "Отменить",IDCANCEL,165,80,40,11,WS_GROUP @@ -109,12 +109,12 @@ END IDD_EDIT_BINARY DIALOG 22, 17, 210, 100 STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU -CAPTION "Изменить бинарные данные" +CAPTION "Изменение двоичного параметра" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Название значения:",IDC_STATIC,5,5,119,8 + LTEXT "Имя параметра:",IDC_STATIC,5,5,119,8 EDITTEXT IDC_VALUE_NAME,5,15,200,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL| WS_DISABLED - LTEXT "Данные:",IDC_STATIC,5,30,90,8 + LTEXT "Значение:",IDC_STATIC,5,30,90,8 CONTROL "",IDC_VALUE_DATA,"HexEdit",WS_TABSTOP,4,40,160,40 DEFPUSHBUTTON "OK",IDOK,130,80,30,11,WS_GROUP PUSHBUTTON "Отменить",IDCANCEL,165,80,40,11,WS_GROUP @@ -125,9 +125,9 @@ STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Изменить многостроковые данные" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Название значения:",IDC_STATIC,5,5,119,8 + LTEXT "Имя параметра:",IDC_STATIC,5,5,119,8 EDITTEXT IDC_VALUE_NAME,5,15,200,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL| WS_DISABLED - LTEXT "Данные:",IDC_STATIC,5,30,119,8 + LTEXT "Значение:",IDC_STATIC,5,30,119,8 EDITTEXT IDC_VALUE_DATA,5,40,200,112, WS_BORDER | WS_TABSTOP | WS_HSCROLL | WS_VSCROLL | ES_MULTILINE | ES_WANTRETURN DEFPUSHBUTTON "OK",IDOK,130,160,30,11,WS_GROUP PUSHBUTTON "Отменить",IDCANCEL,165,160,40,11,WS_GROUP

1 0

Alexander Lakhin : shdocvw: Add Russian translation resources.
by Alexandre Julliard Feb. 14, 2011

Feb. 14, 2011

Module: wine Branch: master Commit: 6459f2c53f11a919ab07ce0f6ebbae44bf196012 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6459f2c53f11a919ab07ce0f6… Author: Alexander Lakhin <exclusion(a)gmail.com> Date: Fri Feb 11 21:27:28 2011 +0300 shdocvw: Add Russian translation resources. --- dlls/shdocvw/Makefile.in | 1 + dlls/shdocvw/Ru.rc | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/Makefile.in b/dlls/shdocvw/Makefile.in index e154a1c..61e6391 100644 --- a/dlls/shdocvw/Makefile.in +++ b/dlls/shdocvw/Makefile.in @@ -37,6 +37,7 @@ RC_SRCS = \ Pl.rc \ Pt.rc \ Ro.rc \ + Ru.rc \ Si.rc \ Sr.rc \ Sv.rc \ diff --git a/dlls/shdocvw/Ru.rc b/dlls/shdocvw/Ru.rc new file mode 100644 index 0000000..e06cb57 --- /dev/null +++ b/dlls/shdocvw/Ru.rc @@ -0,0 +1,36 @@ +/* + * Copyright 2011 Alexander Lakhin + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "resource.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +IDD_BROWSE_OPEN DIALOG 10, 10, 200, 70 +STYLE DS_MODALFRAME | WS_CAPTION +CAPTION "Ввод адреса" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Укажите адрес ресурса для загрузки в Internet Explorer",-1,25, 5, 150,15 + LTEXT "Открыть:", -1, 2, 32, 30, 15 + EDITTEXT IDC_BROWSE_OPEN_URL, 35, 30, 150, 13 + DEFPUSHBUTTON "&OK", IDOK, 45, 50, 50, 15 + PUSHBUTTON "&Отмена", IDCANCEL, 105, 50, 50, 15 +}

1 0

Alexander Lakhin : inetcpl.cpl: Add Russian translation resources.
by Alexandre Julliard Feb. 14, 2011

Feb. 14, 2011

Module: wine Branch: master Commit: 663ae47e00b886c1f75fd027d2fa31a9999b85e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=663ae47e00b886c1f75fd027d… Author: Alexander Lakhin <exclusion(a)gmail.com> Date: Fri Feb 11 21:21:42 2011 +0300 inetcpl.cpl: Add Russian translation resources. --- dlls/inetcpl.cpl/Makefile.in | 1 + dlls/inetcpl.cpl/cpl_Ru.rc | 59 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 0 deletions(-) diff --git a/dlls/inetcpl.cpl/Makefile.in b/dlls/inetcpl.cpl/Makefile.in index ac6171b..0ff888d 100644 --- a/dlls/inetcpl.cpl/Makefile.in +++ b/dlls/inetcpl.cpl/Makefile.in @@ -19,6 +19,7 @@ RC_SRCS = \ cpl_Nl.rc \ cpl_Pl.rc \ cpl_Pt.rc \ + cpl_Ru.rc \ cpl_Sr.rc \ cpl_Sv.rc \ cpl_Uk.rc \ diff --git a/dlls/inetcpl.cpl/cpl_Ru.rc b/dlls/inetcpl.cpl/cpl_Ru.rc new file mode 100644 index 0000000..db99526 --- /dev/null +++ b/dlls/inetcpl.cpl/cpl_Ru.rc @@ -0,0 +1,59 @@ +/* + * Russian resources for the Internet control panel applet + * + * Copyright 2011 Alexander Lakhin + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include "inetcpl.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +/* "General" propsheet */ +IDD_GENERAL DIALOG 0, 0, 320, 220 +STYLE WS_CAPTION | WS_CHILD | WS_DISABLED +FONT 8, "MS Shell Dlg" +CAPTION "Общие" +BEGIN + + GROUPBOX " Домашняя страница ", IDC_STATIC, 4, 4, 312, 52 + LTEXT "Укажите адрес для вашей домашней страницы:", + IDC_STATIC, 58, 14, 252, 8 + EDITTEXT IDC_HOME_EDIT, 58, 22, 252, 12, WS_VISIBLE | ES_AUTOHSCROLL + PUSHBUTTON "&Текущая страница", IDC_HOME_CURRENT, 58, 36, 80, 14 + PUSHBUTTON "&По умолчанию", IDC_HOME_DEFAULT, 144, 36, 80, 14 + PUSHBUTTON "Пу&стая страница", IDC_HOME_BLANK, 230, 36, 80, 14 + +END + +/* "Content" propsheet */ +IDD_CONTENT DIALOG 0, 0, 320, 220 +STYLE WS_CAPTION | WS_CHILD | WS_DISABLED +FONT 8, "MS Shell Dlg" +CAPTION "Содержание" +BEGIN + + GROUPBOX " Сертификаты ", IDC_STATIC, 4, 4, 312, 50 + LTEXT "Сертификаты используются для идентификации личности, а также для проверки подлинности центров сертификации и издателей.", + IDC_STATIC, 58, 14, 252, 18 + PUSHBUTTON "Сертификаты...", IDC_CERT, 146, 34, 80, 14 + PUSHBUTTON "Издатели...", IDC_CERT_PUBLISHER, 230, 34, 80, 14 + +END

1 0

Austin English : urlmon/tests: Make sure to use a return value (LLVM/Clang) .
by Alexandre Julliard Feb. 14, 2011

Feb. 14, 2011

Module: wine Branch: master Commit: da3feee9056c3d852a93da3cb070b164c6090818 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da3feee9056c3d852a93da3cb… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 10 15:15:54 2011 -0800 urlmon/tests: Make sure to use a return value (LLVM/Clang). --- dlls/urlmon/tests/uri.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index c88c8e4..68345f1 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -9182,6 +9182,7 @@ static void test_IUriBuilder_RemoveProperties(void) { BSTR received = NULL; hr = IUri_GetAbsoluteUri(result, &received); + ok(hr == S_OK, "Error: Expected S_OK, but got 0x%08x instead.\n", hr); ok(!strcmp_aw(test.expected_uri, received), "Error: Expected %s but got %s instead on test %d.\n", test.expected_uri, wine_dbgstr_w(received), i);

1 0