wine-commits February 2012

wine-commits@winehq.org

2 participants
442 discussions

Piotr Caban : msvcrt: Handle negative file->_cnt value in _flsbuf function.
by Alexandre Julliard 07 Feb '12

07 Feb '12

Module: wine Branch: master Commit: c39793087d11a562655e636489042c2bc2baf63c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c39793087d11a562655e63648… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 7 10:14:03 2012 +0100 msvcrt: Handle negative file->_cnt value in _flsbuf function. --- dlls/msvcrt/file.c | 2 +- dlls/msvcrt/tests/file.c | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index b27a40f..c15e33f 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3088,7 +3088,7 @@ int CDECL MSVCRT__flsbuf(int c, MSVCRT_FILE* file) if(file->_bufsiz) { int res = 0; - if(file->_cnt == 0) + if(file->_cnt <= 0) res = msvcrt_flush_buffer(file); if(!res) { *file->_ptr++ = c; diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index e7b7353..b9b904d 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -544,10 +544,21 @@ static void test_flsbuf( void ) bufmodes[bufmode], 0, ret); ret = _flsbuf(0xff,tempfh); ok(0xff == ret, "_flsbuf(0xff,tempfh) with bufmode %x expected %x got %x\n", - bufmodes[bufmode], 0, ret); + bufmodes[bufmode], 0xff, ret); ret = _flsbuf(0xffffffff,tempfh); ok(0xff == ret, "_flsbuf(0xffffffff,tempfh) with bufmode %x expected %x got %x\n", - bufmodes[bufmode], 0, ret); + bufmodes[bufmode], 0xff, ret); + if(tempfh->_base) { + fputc('x', tempfh); + tempfh->_cnt = -1; + tempfh->_base[1] = 'a'; + ret = _flsbuf(0xab,tempfh); + ok(ret == 0xab, "_flsbuf(0xab,tempfh) with bufmode %x expected 0xab got %x\n", + bufmodes[bufmode], ret); + ok(tempfh->_base[1] == 'a', "tempfh->_base[1] should not be changed (%d)\n", + tempfh->_base[1]); + } + fclose(tempfh); }

1 0

Dmitry Timoshkov : user32: Make FlashWindowEx tests pass under Windows.
by Alexandre Julliard 07 Feb '12

07 Feb '12

Module: wine Branch: master Commit: 9d538e43bee43a73f0cc392916c6a5af772dc4e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d538e43bee43a73f0cc39291… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Feb 7 23:55:08 2012 +0800 user32: Make FlashWindowEx tests pass under Windows. --- dlls/user32/tests/win.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 34f13ce..4f343da 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -6710,7 +6710,7 @@ static void test_FlashWindowEx(void) SetLastError(0xdeadbeef); ret = pFlashWindowEx(&finfo); - todo_wine ok(!ret, "FlashWindowEx succeeded\n"); + todo_wine ok(!ret, "previous window state should not be active\n"); finfo.cbSize = sizeof(FLASHWINFO) - 1; SetLastError(0xdeadbeef); @@ -6750,7 +6750,7 @@ static void test_FlashWindowEx(void) SetLastError(0xdeadbeef); ret = pFlashWindowEx(&finfo); - todo_wine ok(!ret, "FlashWindowEx succeeded\n"); + ok(ret, "previous window state should be active\n"); ok(finfo.cbSize == sizeof(FLASHWINFO), "FlashWindowEx modified cdSize to %x\n", finfo.cbSize); ok(finfo.hwnd == hwnd, "FlashWindowEx modified hwnd to %p\n", finfo.hwnd); @@ -6761,7 +6761,8 @@ static void test_FlashWindowEx(void) finfo.dwFlags = FLASHW_STOP; SetLastError(0xdeadbeef); ret = pFlashWindowEx(&finfo); - ok(ret, "FlashWindowEx failed with %d\n", GetLastError()); +todo_wine + ok(!ret, "previous window state should not be active\n"); DestroyWindow( hwnd ); }

1 0

Dmitry Timoshkov : user32: Fix a couple of typos.
by Alexandre Julliard 07 Feb '12

07 Feb '12

Module: wine Branch: master Commit: 39a4b5fa94269441552ad724d789e432767646cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=39a4b5fa94269441552ad724d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Feb 7 11:18:15 2012 +0800 user32: Fix a couple of typos. --- dlls/user32/tests/win.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 7d753f7..34f13ce 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -6957,10 +6957,10 @@ static int window_to_index(HWND hwnd, HWND *window, int size) static void test_child_window_from_point(void) { - static int real_child_pos[] = { 14,15,16,17,18,19,20,21,24,25,26,27,42,43, - 44,45,46,47,48,49,52,53,54,55,51,50,23,22,-1 }; - static int real_child_pos_nt4[] = { 14,15,16,17,20,21,24,25,26,27,42,43,44,45, - 48,49,52,53,54,55,51,50,47,46,23,22,19,18,-1 }; + static const int real_child_pos[] = { 14,15,16,17,18,19,20,21,24,25,26,27,42,43, + 44,45,46,47,48,49,52,53,54,55,51,50,23,22,-1 }; + static const int real_child_pos_nt4[] = { 14,15,16,17,20,21,24,25,26,27,42,43,44,45, + 48,49,52,53,54,55,51,50,47,46,23,22,19,18,-1 }; WNDCLASSA cls; HWND hwnd, parent, window[100]; POINT pt; @@ -7042,9 +7042,9 @@ static void test_child_window_from_point(void) ok(found_disabled, "found %d disabled windows\n", found_disabled); todo_wine ok(found_groupbox == 4, "found %d groupbox windows\n", found_groupbox); - ok(found_httransparent, "found %d found_httransparent windows\n", found_httransparent); + ok(found_httransparent, "found %d httransparent windows\n", found_httransparent); todo_wine - ok(found_extransparent, "found %d found_extransparent windows\n", found_extransparent); + ok(found_extransparent, "found %d extransparent windows\n", found_extransparent); ret = UnregisterClass("my_button", cls.hInstance); ok(ret, "UnregisterClass(my_button) failed\n");

1 0

Dmitry Timoshkov : psapi: Make sure that NtQueryVirtualMemory( MemorySectionName) succeeds under Windows 2000 too.
by Alexandre Julliard 07 Feb '12

07 Feb '12

Module: wine Branch: master Commit: 48a2a467cd7b59c9bfbdd28740e5b621e926b6a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48a2a467cd7b59c9bfbdd2874… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Feb 7 11:17:56 2012 +0800 psapi: Make sure that NtQueryVirtualMemory(MemorySectionName) succeeds under Windows 2000 too. --- dlls/psapi/tests/psapi_main.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index 09a56f7..2087881 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -198,7 +198,7 @@ static BOOL nt_get_mapped_file_name(HANDLE process, LPVOID addr, LPWSTR name, DW { MEMORY_SECTION_NAME *section_name; WCHAR *buf; - SIZE_T buf_len; + SIZE_T buf_len, ret_len; NTSTATUS status; if (!pNtQueryVirtualMemory) return FALSE; @@ -206,12 +206,16 @@ static BOOL nt_get_mapped_file_name(HANDLE process, LPVOID addr, LPWSTR name, DW buf_len = len * sizeof(WCHAR) + sizeof(MEMORY_SECTION_NAME); buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, buf_len); - status = pNtQueryVirtualMemory(process, addr, MemorySectionName, buf, buf_len, NULL); + ret_len = 0xdeadbeef; + status = pNtQueryVirtualMemory(process, addr, MemorySectionName, buf, buf_len, &ret_len); todo_wine - ok(!status || broken(status == STATUS_ACCESS_VIOLATION) /* win2k */, "NtQueryVirtualMemory error %x\n", status); + ok(!status, "NtQueryVirtualMemory error %x\n", status); + /* FIXME: remove once Wine is fixed */ if (status) return FALSE; section_name = (MEMORY_SECTION_NAME *)buf; + ok(ret_len == section_name->SectionFileName.MaximumLength + sizeof(*section_name), "got %lu, %u\n", + ret_len, section_name->SectionFileName.MaximumLength); ok((char *)section_name->SectionFileName.Buffer == (char *)section_name + sizeof(*section_name), "got %p, %p\n", section_name, section_name->SectionFileName.Buffer); ok(section_name->SectionFileName.MaximumLength == section_name->SectionFileName.Length + sizeof(WCHAR), "got %u, %u\n",

1 0

Aric Stewart : quartz: AMFilterData_ParseFilterData returns a pointer to a pointer to filter data .
by Alexandre Julliard 07 Feb '12

07 Feb '12

Module: wine Branch: master Commit: c3e2407664de1455554c6c151919ed75e61c725b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3e2407664de1455554c6c151… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Feb 6 11:02:43 2012 -0600 quartz: AMFilterData_ParseFilterData returns a pointer to a pointer to filter data. --- .gitignore | 1 + dlls/dxdiagn/provider.c | 4 ++- dlls/quartz/filtermapper.c | 4 +- dlls/quartz/tests/Makefile.in | 2 + dlls/quartz/tests/fil_data.idl | 50 ++++++++++++++++++++++++++++ dlls/quartz/tests/filtermapper.c | 68 ++++++++++++++++++++++++++++++++++++++ 6 files changed, 126 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b97d5b5..f0fcf66 100644 --- a/.gitignore +++ b/.gitignore @@ -114,6 +114,7 @@ dlls/qmgrprxy/qmgrprxy_p.c dlls/quartz/fil_data.h dlls/quartz/quartz_strmif.h dlls/quartz/quartz_strmif_p.c +dlls/quartz/tests/fil_data.h dlls/rpcrt4/epm.h dlls/rpcrt4/epm_c.c dlls/rpcrt4/tests/server.h diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index bb4ce08..db407b0 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -1323,6 +1323,7 @@ static HRESULT fill_filter_data_information(IDxDiagContainerImpl_Container *subc HRESULT hr; IFilterMapper2 *pFileMapper = NULL; IAMFilterData *pFilterData = NULL; + BYTE *ppRF = NULL; REGFILTER2 *pRF = NULL; WCHAR bufferW[10]; ULONG j; @@ -1338,9 +1339,10 @@ static HRESULT fill_filter_data_information(IDxDiagContainerImpl_Container *subc if (FAILED(hr)) goto cleanup; - hr = IAMFilterData_ParseFilterData(pFilterData, pData, cb, (BYTE **)&pRF); + hr = IAMFilterData_ParseFilterData(pFilterData, pData, cb, (BYTE **)&ppRF); if (FAILED(hr)) goto cleanup; + pRF = ((REGFILTER2**)ppRF)[0]; snprintfW(bufferW, sizeof(bufferW)/sizeof(bufferW[0]), szVersionFormat, pRF->dwVersion); hr = add_bstr_property(subcont, szVersionW, bufferW); diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index 7d7599f..8950caa 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -1732,14 +1732,14 @@ static HRESULT WINAPI AMFilterData_ParseFilterData(IAMFilterData* iface, { FilterMapper3Impl *This = impl_from_IAMFilterData(iface); HRESULT hr = S_OK; - REGFILTER2 *prf2; + static REGFILTER2 *prf2; TRACE("(%p/%p)->(%p, %d, %p)\n", This, iface, pData, cb, ppRegFilter2); prf2 = CoTaskMemAlloc(sizeof(*prf2)); if (!prf2) return E_OUTOFMEMORY; - *ppRegFilter2 = (BYTE *)prf2; + *ppRegFilter2 = (BYTE *)&prf2; hr = FM2_ReadFilterData(pData, prf2); if (FAILED(hr)) diff --git a/dlls/quartz/tests/Makefile.in b/dlls/quartz/tests/Makefile.in index 55528ab..ae5fbac 100644 --- a/dlls/quartz/tests/Makefile.in +++ b/dlls/quartz/tests/Makefile.in @@ -11,4 +11,6 @@ C_SRCS = \ referenceclock.c \ videorenderer.c +IDL_H_SRCS = fil_data.idl + @MAKE_TEST_RULES@ diff --git a/dlls/quartz/tests/fil_data.idl b/dlls/quartz/tests/fil_data.idl new file mode 100644 index 0000000..93cdf1e --- /dev/null +++ b/dlls/quartz/tests/fil_data.idl @@ -0,0 +1,50 @@ +/* + * Copyright (C) 2009 Vitaliy Margolen + * + * 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 + */ + +import "objidl.idl"; +import "strmif.idl"; +import "unknwn.idl"; + + +/***************************************************************************** + * IAMFilterData interface + * + * Notes: + * - This interface is deprecated and IFilterMapper2 should be used instead. + * - There is no full replacement for IAMFilterData::ParseFilterData short of manually + * parsing out the REGFILTER2 struct from the binary blob. + */ +[ + object, + uuid(97f7c4d4-547b-4a5f-8332-536430ad2e4d), + pointer_default(unique) +] +interface IAMFilterData : IUnknown +{ + typedef [unique] IAMFilterData *LPIAMFILTERDATA; + + HRESULT ParseFilterData( + [in] BYTE * rgbFilterData, + [in] ULONG cb, + [out] BYTE ** prgbRegFilter2); + + HRESULT CreateFilterData( + [in] REGFILTER2 * prf2, + [out] BYTE ** prgbFilterData, + [out] ULONG * pcb); +} diff --git a/dlls/quartz/tests/filtermapper.c b/dlls/quartz/tests/filtermapper.c index cd3ea17..2209af4 100644 --- a/dlls/quartz/tests/filtermapper.c +++ b/dlls/quartz/tests/filtermapper.c @@ -24,6 +24,9 @@ #include "winbase.h" #include "initguid.h" #include "dshow.h" +#include "winternl.h" + +#include "fil_data.h" DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); @@ -467,6 +470,70 @@ static void test_register_filter_with_null_clsMinorType(void) if (pMapper) IFilterMapper2_Release(pMapper); } +static void test_parse_filter_data(void) +{ + static const BYTE data_block[] = { + 0x02,0x00,0x00,0x00,0xff,0xff,0x5f,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x70,0x69,0x33, + 0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x30,0x74,0x79,0x33,0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x31,0x70,0x69,0x33, + 0x08,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x30,0x74,0x79,0x33,0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x76,0x69,0x64,0x73, + 0x00,0x00,0x10,0x00,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}; + + BYTE *prgbRegFilter2 = NULL; + REGFILTER2 *pRegFilter = NULL; + IFilterMapper2 *pMapper = NULL; + SAFEARRAYBOUND saBound; + SAFEARRAY *psa = NULL; + LPBYTE pbSAData = NULL; + HRESULT hr; + + IAMFilterData *pData = NULL; + + hr = CoCreateInstance(&CLSID_FilterMapper2, NULL, CLSCTX_INPROC_SERVER, + &IID_IFilterMapper2, (LPVOID*)&pMapper); + ok((hr == S_OK || broken(hr != S_OK)), "CoCreateInstance failed with %x\n", hr); + if (FAILED(hr)) goto out; + + hr = IFilterMapper2_QueryInterface(pMapper, &IID_IAMFilterData, (LPVOID*)&pData); + ok((hr == S_OK || broken(hr != S_OK)), "Unable to find IID_IAMFilterData interface\n"); + if (FAILED(hr)) goto out; + + saBound.lLbound = 0; + saBound.cElements = sizeof(data_block); + psa = SafeArrayCreate(VT_UI1, 1, &saBound); + ok(psa != NULL, "Unable to crate safe array\n"); + if (!psa) goto out; + hr = SafeArrayAccessData(psa, (LPVOID *)&pbSAData); + ok(hr == S_OK, "Unable to access array data\n"); + if (FAILED(hr)) goto out; + memcpy(pbSAData, data_block, sizeof(data_block)); + + hr = IAMFilterData_ParseFilterData(pData, pbSAData, sizeof(data_block), &prgbRegFilter2); + /* We cannot do anything here. prgbRegFilter2 is very unstable */ + /* Pre Vista, this is a stack pointer so anything that changes the stack invalidats it */ + /* Post Vista, it is a static pointer in the data section of the module */ + pRegFilter =((REGFILTER2**)prgbRegFilter2)[0]; + ok (hr==S_OK,"Failed to Parse filter Data\n"); + + ok(IsBadReadPtr(prgbRegFilter2,sizeof(REGFILTER2**))==0,"Bad read pointer returned\n"); + ok(IsBadReadPtr(pRegFilter,sizeof(REGFILTER2*))==0,"Bad read pointer for FilterData\n"); + ok(pRegFilter->dwMerit == 0x5fffff,"Incorrect merit returned\n"); + +out: + if (pRegFilter) + CoTaskMemFree(pRegFilter); + if (psa) + { + SafeArrayUnaccessData(psa); + SafeArrayDestroy(psa); + } + if (pData) + IAMFilterData_Release(pData); + if (pMapper) + IFilterMapper2_Release(pMapper); +} START_TEST(filtermapper) { @@ -476,6 +543,7 @@ START_TEST(filtermapper) test_legacy_filter_registration(); test_ifiltermapper_from_filtergraph(); test_register_filter_with_null_clsMinorType(); + test_parse_filter_data(); CoUninitialize(); }

1 0

Francois Gouget : shell32: Fix the name of the 'Application Data' folders.
by Alexandre Julliard 07 Feb '12

07 Feb '12

Module: wine Branch: master Commit: c0338afebbf7b8a3a1a30615696fa86fbba24a2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0338afebbf7b8a3a1a306156… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Feb 7 01:04:07 2012 +0100 shell32: Fix the name of the 'Application Data' folders. --- dlls/shell32/shellpath.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 31110ac..8d1c70b 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -1023,7 +1023,7 @@ static const CSIDL_DATA CSIDL_Data[] = &FOLDERID_RoamingAppData, CSIDL_Type_User, AppDataW, - AppDataW + Application_DataW }, { /* 0x1b - CSIDL_PRINTHOOD */ &FOLDERID_PrintHood, @@ -1035,7 +1035,7 @@ static const CSIDL_DATA CSIDL_Data[] = &FOLDERID_LocalAppData, CSIDL_Type_User, Local_AppDataW, - Local_AppDataW + Local_Settings_Application_DataW }, { /* 0x1d - CSIDL_ALTSTARTUP */ &GUID_NULL, @@ -1077,7 +1077,7 @@ static const CSIDL_DATA CSIDL_Data[] = &FOLDERID_ProgramData, CSIDL_Type_AllUsers, Common_AppDataW, - AppDataW + Application_DataW }, { /* 0x24 - CSIDL_WINDOWS */ &FOLDERID_Windows,

1 0

Alexandre Julliard : mshtml: Use the current AppData folder instead of the default one as profile directory .
by Alexandre Julliard 07 Feb '12

07 Feb '12

Module: wine Branch: master Commit: 0aeb38bb4c3ed8cc9b9da374c42072bebe292939 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0aeb38bb4c3ed8cc9b9da374c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 6 17:39:57 2012 -0600 mshtml: Use the current AppData folder instead of the default one as profile directory. --- dlls/mshtml/nsembed.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index fdc6286..d96bcaf 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -118,7 +118,7 @@ static nsresult create_profile_directory(void) nsresult nsres; HRESULT hres; - hres = SHGetFolderPathW(NULL, CSIDL_APPDATA, NULL, SHGFP_TYPE_DEFAULT, path); + hres = SHGetFolderPathW(NULL, CSIDL_APPDATA, NULL, SHGFP_TYPE_CURRENT, path); if(FAILED(hres)) { ERR("SHGetFolderPath failed: %08x\n", hres); return NS_ERROR_FAILURE;

1 0

André Hentschel : comctl32/tests: Add some more thumb length tests.
by Alexandre Julliard 06 Feb '12

06 Feb '12

Module: wine Branch: master Commit: 91a63ad08ceaff3179a23fa813fa811bc20366b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91a63ad08ceaff3179a23fa81… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Feb 5 16:43:34 2012 +0100 comctl32/tests: Add some more thumb length tests. --- dlls/comctl32/tests/trackbar.c | 21 ++++++++++++++++++++- 1 files changed, 20 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c index 725490f..eb320d5 100644 --- a/dlls/comctl32/tests/trackbar.c +++ b/dlls/comctl32/tests/trackbar.c @@ -298,6 +298,12 @@ static const struct message thumb_length_test_seq[] = { { WM_PAINT, sent|defwinproc}, { TBM_GETTHUMBLENGTH, sent}, { TBM_GETTHUMBLENGTH, sent}, + { WM_SIZE, sent}, + { WM_PAINT, sent|defwinproc}, + { TBM_GETTHUMBLENGTH, sent}, + { WM_SIZE, sent}, + { WM_PAINT, sent|defwinproc}, + { TBM_GETTHUMBLENGTH, sent}, {0} }; @@ -306,6 +312,10 @@ static const struct message parent_thumb_length_test_seq[] = { { WM_NOTIFY, sent}, { WM_CTLCOLORSTATIC, sent}, { WM_NOTIFY, sent}, + { WM_CTLCOLORSTATIC, sent}, + { WM_NOTIFY, sent}, + { WM_CTLCOLORSTATIC, sent}, + { WM_NOTIFY, sent}, {0} }; @@ -742,8 +752,17 @@ static void test_thumb_length(HWND hWndTrackbar){ r = SendMessage(hWndTrackbar, TBM_GETTHUMBLENGTH, 0,0); expect(20, r); + r = SendMessage(hWndTrackbar, WM_SIZE, 0,0); + expect(0, r); + r = SendMessage(hWndTrackbar, TBM_GETTHUMBLENGTH, 0,0); + expect(20, r); + r = SendMessage(hWndTrackbar, WM_SIZE, 0, MAKELPARAM(50, 50) ); + expect(0, r); + r = SendMessage(hWndTrackbar, TBM_GETTHUMBLENGTH, 0,0); + expect(20, r); + ok_sequence(sequences, TRACKBAR_SEQ_INDEX, thumb_length_test_seq, "thumb length test sequence", TRUE); - ok_sequence(sequences, PARENT_SEQ_INDEX, parent_thumb_length_test_seq, "parent thumb lenth test sequence", TRUE); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_thumb_length_test_seq, "parent thumb length test sequence", TRUE); } static void test_tic_settings(HWND hWndTrackbar){

1 0

Francois Gouget : po: Remove or fuzzy invalid Turkish shell folder translations.
by Alexandre Julliard 06 Feb '12

06 Feb '12

Module: wine Branch: master Commit: 0cd8c8f24a191cdd2d0ee9c086242df5c9f0d45d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cd8c8f24a191cdd2d0ee9c08… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Feb 6 14:56:21 2012 +0100 po: Remove or fuzzy invalid Turkish shell folder translations. --- po/tr.po | 33 +++++++++++++++++++-------------- 1 files changed, 19 insertions(+), 14 deletions(-) diff --git a/po/tr.po b/po/tr.po index 1880f39..e7f464b 100644 --- a/po/tr.po +++ b/po/tr.po @@ -8152,15 +8152,17 @@ msgstr "" #: shell32.rc:204 msgid "Start Menu" -msgstr "Start Menu" +msgstr "" #: shell32.rc:205 +#, fuzzy msgid "My Music" -msgstr "Belgelerim\\Müziğim" +msgstr "Müziğim" #: shell32.rc:206 +#, fuzzy msgid "My Videos" -msgstr "Belgelerim\\Vidyolarım" +msgstr "Vidyolarım" #: shell32.rc:207 #, fuzzy @@ -8170,15 +8172,15 @@ msgstr "Masaüstü" #: shell32.rc:208 msgid "NetHood" -msgstr "NetHood" +msgstr "" #: shell32.rc:209 msgid "Templates" -msgstr "Templates" +msgstr "" #: shell32.rc:210 msgid "PrintHood" -msgstr "PrintHood" +msgstr "" #: shell32.rc:211 winhlp32.rc:45 msgid "History" @@ -8186,11 +8188,12 @@ msgstr "" #: shell32.rc:212 msgid "Program Files" -msgstr "Program Files" +msgstr "" #: shell32.rc:214 +#, fuzzy msgid "My Pictures" -msgstr "Belgelerim\\Resimlerim" +msgstr "Resimlerim" #: shell32.rc:215 #, fuzzy @@ -8204,24 +8207,26 @@ msgstr "Belgeler" #: shell32.rc:217 #, fuzzy msgid "Administrative Tools" -msgstr "Start Menu\\Programlar\\Yönetimsel Araçlar" +msgstr "Yönetimsel Araçlar" #: shell32.rc:218 +#, fuzzy msgid "Music" -msgstr "Belgeler\\Müziğim" +msgstr "Müziğim" #: shell32.rc:219 +#, fuzzy msgid "Pictures" -msgstr "Belgeler\\Resimlerim" +msgstr "Resimlerim" #: shell32.rc:220 +#, fuzzy msgid "Videos" -msgstr "Belgeler\\Videolarım" +msgstr "Videolarım" #: shell32.rc:213 -#, fuzzy msgid "Program Files (x86)" -msgstr "Program Files" +msgstr "" #: shell32.rc:221 #, fuzzy

1 0

Francois Gouget : po: Fix some typography issues in the Serbian (Cyrillic) translation.
by Alexandre Julliard 06 Feb '12

06 Feb '12

Module: wine Branch: master Commit: 764ee39c080be2cee0861c75933a08e36d218a6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=764ee39c080be2cee0861c759… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Feb 6 14:52:04 2012 +0100 po: Fix some typography issues in the Serbian (Cyrillic) translation. Also mark a few incomplete translations as fuzzy. --- po/sr_RS(a)cyrillic.po | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/po/sr_RS(a)cyrillic.po b/po/sr_RS(a)cyrillic.po index 352850a..27b1c4d 100644 --- a/po/sr_RS(a)cyrillic.po +++ b/po/sr_RS(a)cyrillic.po @@ -3064,6 +3064,7 @@ msgid "Transferring" msgstr "Пренос" #: gphoto2.rc:43 +#, fuzzy msgid "Transferring... Please Wait" msgstr "Преношење..." @@ -3072,6 +3073,7 @@ msgid "Connecting to camera" msgstr "Повезивање са камером" #: gphoto2.rc:52 +#, fuzzy msgid "Connecting to camera... Please Wait" msgstr "Повезивање са камером..." @@ -7007,7 +7009,7 @@ msgstr "&Подеси..." #: msvfw32.rc:40 msgid "&About" -msgstr "&О програму..." +msgstr "&О програму" #: msvfw32.rc:44 msgid "Compression &Quality:" @@ -7483,6 +7485,7 @@ msgid "Scanning" msgstr "Претрага" #: sane.rc:44 +#, fuzzy msgid "SCANNING... Please Wait" msgstr "Претраживање..."

1 0

← Newer
1
...
34
35
36
37
38
39
40
...
45
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2012