June 2014 - Wine-commits - list.winehq.org

Nikolay Sivov : comctl32/tests: Avoid testing uninitialized value ( Valgrind).
by Alexandre Julliard 16 Jun '14

16 Jun '14

Module: wine Branch: master Commit: 055129485d022976caeacbdf4e98f982c88e9d07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=055129485d022976caeacbdf4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 13 18:31:28 2014 +0400 comctl32/tests: Avoid testing uninitialized value (Valgrind). --- dlls/comctl32/tests/button.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/button.c b/dlls/comctl32/tests/button.c index 96fb766..ecb438e 100644 --- a/dlls/comctl32/tests/button.c +++ b/dlls/comctl32/tests/button.c @@ -743,10 +743,10 @@ todo_wine ok(lstrcmpW(nameW, WC_BUTTONW), "got %s\n", wine_dbgstr_w(nameW)); ret = GetClassInfoExW(NULL, nameW, &ex2W); -todo_wine { +todo_wine ok(ret, "got %d\n", ret); +if (ret) /* TODO: remove once Wine is fixed */ ok(ex2W.lpfnWndProc == exW.lpfnWndProc, "got %p, %p\n", exW.lpfnWndProc, ex2W.lpfnWndProc); -} /* Check reported class name */ hwnd = create_button(BS_CHECKBOX, NULL);

1 0

Jacek Caban : vbscript: Reset error number on error mode change.
by Alexandre Julliard 16 Jun '14

16 Jun '14

Module: wine Branch: master Commit: be583662d45b84693b71d44d2ecf6ef39fdf29b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be583662d45b84693b71d44d2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 13 17:27:44 2014 +0200 vbscript: Reset error number on error mode change. --- dlls/vbscript/interp.c | 1 + dlls/vbscript/tests/error.vbs | 14 ++++++++++++++ 2 files changed, 15 insertions(+) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 3b5f78c..10641db 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -1276,6 +1276,7 @@ static HRESULT interp_errmode(exec_ctx_t *ctx) TRACE("%d\n", err_mode); ctx->resume_next = err_mode; + ctx->script->err_number = S_OK; return S_OK; } diff --git a/dlls/vbscript/tests/error.vbs b/dlls/vbscript/tests/error.vbs index afe9da2..830344c 100644 --- a/dlls/vbscript/tests/error.vbs +++ b/dlls/vbscript/tests/error.vbs @@ -284,6 +284,20 @@ x = 0 call callTestOnError(false) call ok(x = 1, "x = " & x) +sub testOnErrorClear() + on error resume next + call ok(Err.Number = 0, "Err.Number = " & Err.Number) + throwInt(E_TESTERROR) + call ok(Err.Number = E_TESTERROR, "Err.Number = " & Err.Number) + + on error goto 0 + call ok(Err.Number = 0, "Err.Number = " & Err.Number) + x = "ok" +end sub + +call testOnErrorClear() +call ok(x = "ok", "testOnErrorClear failed") + sub testForEachError() on error resume next

1 0

Andrew Eikum : ole32: Implement CoTreatAsClass for classes without AutoTreatAs.
by Alexandre Julliard 16 Jun '14

16 Jun '14

Module: wine Branch: master Commit: 42f51185709e86f804c2babf259d0b1816b33d30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42f51185709e86f804c2babf2… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Jun 13 13:00:46 2014 -0500 ole32: Implement CoTreatAsClass for classes without AutoTreatAs. --- dlls/ole32/compobj.c | 26 ++++++++++++++++++++------ dlls/ole32/tests/compobj.c | 41 +++++++++++++++++++++++++++++++++++++++-- 2 files changed, 59 insertions(+), 8 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index d117c02..98f6439 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -3731,7 +3731,8 @@ HRESULT WINAPI CoTreatAsClass(REFCLSID clsidOld, REFCLSID clsidNew) res = COM_OpenKeyForCLSID(clsidOld, NULL, KEY_READ | KEY_WRITE, &hkey); if (FAILED(res)) goto done; - if (!memcmp( clsidOld, clsidNew, sizeof(*clsidOld) )) + + if (IsEqualGUID( clsidOld, clsidNew )) { if (!RegQueryValueW(hkey, wszAutoTreatAs, auto_treat_as, &auto_treat_as_size) && CLSIDFromString(auto_treat_as, &id) == S_OK) @@ -3744,15 +3745,28 @@ HRESULT WINAPI CoTreatAsClass(REFCLSID clsidOld, REFCLSID clsidNew) } else { - RegDeleteKeyW(hkey, wszTreatAs); + if(RegDeleteKeyW(hkey, wszTreatAs)) + res = REGDB_E_WRITEREGDB; goto done; } } - else if (!StringFromGUID2(clsidNew, szClsidNew, ARRAYSIZE(szClsidNew)) && - !RegSetValueW(hkey, wszTreatAs, REG_SZ, szClsidNew, sizeof(szClsidNew))) + else { - res = REGDB_E_WRITEREGDB; - goto done; + if(IsEqualGUID(clsidNew, &CLSID_NULL)){ + RegDeleteKeyW(hkey, wszTreatAs); + }else{ + if(!StringFromGUID2(clsidNew, szClsidNew, ARRAYSIZE(szClsidNew))){ + WARN("StringFromGUID2 failed\n"); + res = E_FAIL; + goto done; + } + + if(RegSetValueW(hkey, wszTreatAs, REG_SZ, szClsidNew, sizeof(szClsidNew)) != ERROR_SUCCESS){ + WARN("RegSetValue failed\n"); + res = REGDB_E_WRITEREGDB; + goto done; + } + } } done: diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 16ae501..219d2f9 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -41,6 +41,7 @@ static HRESULT (WINAPI * pCoInitializeEx)(LPVOID lpReserved, DWORD dwCoInit); static HRESULT (WINAPI * pCoGetObjectContext)(REFIID riid, LPVOID *ppv); static HRESULT (WINAPI * pCoSwitchCallContext)(IUnknown *pObject, IUnknown **ppOldObject); static HRESULT (WINAPI * pCoGetTreatAsClass)(REFCLSID clsidOld, LPCLSID pClsidNew); +static HRESULT (WINAPI * pCoTreatAsClass)(REFCLSID clsidOld, REFCLSID pClsidNew); static HRESULT (WINAPI * pCoGetContextToken)(ULONG_PTR *token); static LONG (WINAPI * pRegOverridePredefKey)(HKEY key, HKEY override); @@ -1896,11 +1897,14 @@ static void test_CoGetContextToken(void) CoUninitialize(); } -static void test_CoGetTreatAsClass(void) +static void test_TreatAsClass(void) { HRESULT hr; CLSID out; static GUID deadbeef = {0xdeadbeef,0xdead,0xbeef,{0xde,0xad,0xbe,0xef,0xde,0xad,0xbe,0xef}}; + static const char deadbeefA[] = "{DEADBEEF-DEAD-BEEF-DEAD-BEEFDEADBEEF}"; + HKEY clsidkey, deadbeefkey; + LONG lr; if (!pCoGetTreatAsClass) { @@ -1910,6 +1914,38 @@ static void test_CoGetTreatAsClass(void) hr = pCoGetTreatAsClass(&deadbeef,&out); ok (hr == S_FALSE, "expected S_FALSE got %x\n",hr); ok (IsEqualGUID(&out,&deadbeef), "expected to get same clsid back\n"); + + lr = RegOpenKeyExA(HKEY_CLASSES_ROOT, "CLSID", 0, KEY_READ, &clsidkey); + ok(lr == ERROR_SUCCESS, "Couldn't open CLSID key\n"); + + lr = RegCreateKeyExA(clsidkey, deadbeefA, 0, NULL, 0, KEY_WRITE, NULL, &deadbeefkey, NULL); + ok(lr == ERROR_SUCCESS, "Couldn't create class key\n"); + + hr = pCoTreatAsClass(&deadbeef, &deadbeef); + ok(hr == REGDB_E_WRITEREGDB, "CoTreatAsClass gave wrong error: %08x\n", hr); + + hr = pCoTreatAsClass(&deadbeef, &CLSID_FileProtocol); + if(hr == REGDB_E_WRITEREGDB){ + win_skip("Insufficient privileges to use CoTreatAsClass\n"); + goto exit; + } + ok(hr == S_OK, "CoTreatAsClass failed: %08x\n", hr); + + hr = pCoGetTreatAsClass(&deadbeef, &out); + ok(hr == S_OK, "CoGetTreatAsClass failed: %08x\n",hr); + ok(IsEqualGUID(&out, &CLSID_FileProtocol), "expected to get substituted clsid\n"); + + hr = pCoTreatAsClass(&deadbeef, &CLSID_NULL); + ok(hr == S_OK, "CoTreatAsClass failed: %08x\n", hr); + + hr = pCoGetTreatAsClass(&deadbeef, &out); + ok(hr == S_FALSE, "expected S_FALSE got %08x\n", hr); + ok(IsEqualGUID(&out, &deadbeef), "expected to get same clsid back\n"); + +exit: + RegCloseKey(deadbeefkey); + RegDeleteKeyA(clsidkey, deadbeefA); + RegCloseKey(clsidkey); } static void test_CoInitializeEx(void) @@ -1994,6 +2030,7 @@ static void init_funcs(void) pCoGetObjectContext = (void*)GetProcAddress(hOle32, "CoGetObjectContext"); pCoSwitchCallContext = (void*)GetProcAddress(hOle32, "CoSwitchCallContext"); pCoGetTreatAsClass = (void*)GetProcAddress(hOle32,"CoGetTreatAsClass"); + pCoTreatAsClass = (void*)GetProcAddress(hOle32,"CoTreatAsClass"); pCoGetContextToken = (void*)GetProcAddress(hOle32, "CoGetContextToken"); pRegOverridePredefKey = (void*)GetProcAddress(hAdvapi32, "RegOverridePredefKey"); pCoInitializeEx = (void*)GetProcAddress(hOle32, "CoInitializeEx"); @@ -2038,7 +2075,7 @@ START_TEST(compobj) test_CoGetObjectContext(); test_CoGetCallContext(); test_CoGetContextToken(); - test_CoGetTreatAsClass(); + test_TreatAsClass(); test_CoInitializeEx(); test_OleRegGetMiscStatus(); test_CoCreateGuid();

1 0

Andrew Eikum : ole32: Respect TreatAs in CoCreateInstance.
by Alexandre Julliard 16 Jun '14

16 Jun '14

Module: wine Branch: master Commit: c2089cbd0d488e7d26858caf0a55b8e0c62a267c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2089cbd0d488e7d26858caf0… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Jun 13 13:01:13 2014 -0500 ole32: Respect TreatAs in CoCreateInstance. --- dlls/ole32/compobj.c | 15 ++++++++++----- dlls/ole32/tests/compobj.c | 26 ++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 98f6439..7af3bb7 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -3160,6 +3160,7 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoCreateInstance( HRESULT hres; LPCLASSFACTORY lpclf = 0; APARTMENT *apt; + CLSID clsid; TRACE("(rclsid=%s, pUnkOuter=%p, dwClsContext=%08x, riid=%s, ppv=%p)\n", debugstr_guid(rclsid), pUnkOuter, dwClsContext, debugstr_guid(iid), ppv); @@ -3167,6 +3168,10 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoCreateInstance( if (ppv==0) return E_POINTER; + hres = CoGetTreatAsClass(rclsid, &clsid); + if(FAILED(hres)) + clsid = *rclsid; + *ppv = 0; if (!(apt = COM_CurrentApt())) @@ -3182,7 +3187,7 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoCreateInstance( /* * The Standard Global Interface Table (GIT) object is a process-wide singleton. */ - if (IsEqualIID(rclsid, &CLSID_StdGlobalInterfaceTable)) + if (IsEqualIID(&clsid, &CLSID_StdGlobalInterfaceTable)) { IGlobalInterfaceTable *git = get_std_git(); hres = IGlobalInterfaceTable_QueryInterface(git, iid, ppv); @@ -3192,13 +3197,13 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoCreateInstance( return S_OK; } - if (IsEqualCLSID(rclsid, &CLSID_ManualResetEvent)) + if (IsEqualCLSID(&clsid, &CLSID_ManualResetEvent)) return ManualResetEvent_Construct(pUnkOuter, iid, ppv); /* * Get a class factory to construct the object we want. */ - hres = CoGetClassObject(rclsid, + hres = CoGetClassObject(&clsid, dwClsContext, NULL, &IID_IClassFactory, @@ -3215,11 +3220,11 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoCreateInstance( if (FAILED(hres)) { if (hres == CLASS_E_NOAGGREGATION && pUnkOuter) - FIXME("Class %s does not support aggregation\n", debugstr_guid(rclsid)); + FIXME("Class %s does not support aggregation\n", debugstr_guid(&clsid)); else FIXME("no instance created for interface %s of class %s, hres is 0x%08x\n", debugstr_guid(iid), - debugstr_guid(rclsid),hres); + debugstr_guid(&clsid),hres); } return hres; diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 219d2f9..6d5e811 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -1903,6 +1903,7 @@ static void test_TreatAsClass(void) CLSID out; static GUID deadbeef = {0xdeadbeef,0xdead,0xbeef,{0xde,0xad,0xbe,0xef,0xde,0xad,0xbe,0xef}}; static const char deadbeefA[] = "{DEADBEEF-DEAD-BEEF-DEAD-BEEFDEADBEEF}"; + IInternetProtocol *pIP = NULL; HKEY clsidkey, deadbeefkey; LONG lr; @@ -1935,6 +1936,21 @@ static void test_TreatAsClass(void) ok(hr == S_OK, "CoGetTreatAsClass failed: %08x\n",hr); ok(IsEqualGUID(&out, &CLSID_FileProtocol), "expected to get substituted clsid\n"); + OleInitialize(NULL); + + hr = CoCreateInstance(&deadbeef, NULL, CLSCTX_INPROC_SERVER, &IID_IInternetProtocol, (void **)&pIP); + if(hr == REGDB_E_CLASSNOTREG) + { + win_skip("IE not installed so can't test CoCreateInstance\n"); + goto exit; + } + + ok(hr == S_OK, "CoCreateInstance failed: %08x\n", hr); + if(pIP){ + IInternetProtocol_Release(pIP); + pIP = NULL; + } + hr = pCoTreatAsClass(&deadbeef, &CLSID_NULL); ok(hr == S_OK, "CoTreatAsClass failed: %08x\n", hr); @@ -1942,7 +1958,17 @@ static void test_TreatAsClass(void) ok(hr == S_FALSE, "expected S_FALSE got %08x\n", hr); ok(IsEqualGUID(&out, &deadbeef), "expected to get same clsid back\n"); + /* bizarrely, native's CoTreatAsClass takes some time to take effect in CoCreateInstance */ + Sleep(200); + + hr = CoCreateInstance(&deadbeef, NULL, CLSCTX_INPROC_SERVER, &IID_IInternetProtocol, (void **)&pIP); + ok(hr == REGDB_E_CLASSNOTREG, "CoCreateInstance gave wrong error: %08x\n", hr); + + if(pIP) + IInternetProtocol_Release(pIP); + exit: + OleUninitialize(); RegCloseKey(deadbeefkey); RegDeleteKeyA(clsidkey, deadbeefA); RegCloseKey(clsidkey);

1 0

Vincent Povirk : ole32: Add tests for STGC_OVERWRITE.
by Alexandre Julliard 16 Jun '14

16 Jun '14

Module: wine Branch: master Commit: a270ed90adaff0f58bb05780297dbd6173f26626 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a270ed90adaff0f58bb057802… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Jun 3 12:59:44 2014 -0500 ole32: Add tests for STGC_OVERWRITE. --- dlls/ole32/tests/storage32.c | 114 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 114 insertions(+) diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 74b6def..e25f976 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -3529,6 +3529,119 @@ static void test_transacted_shared(void) DeleteFileA(filenameA); } +static void test_overwrite(void) +{ + IStorage *stg = NULL; + HRESULT r; + IStream *stm = NULL; + static const WCHAR stmname[] = { 'C','O','N','T','E','N','T','S',0 }; + static const WCHAR stmname2[] = { 'C','O','N','T','E','N','T','2',0 }; + LARGE_INTEGER pos; + ULARGE_INTEGER upos; + char buffer[4096]; + DWORD orig_size, new_size; + ULONG bytesread; + HANDLE hfile; + int i; + + DeleteFileA(filenameA); + + r = StgCreateDocfile(filename, STGM_CREATE | STGM_READWRITE | STGM_TRANSACTED, 0, &stg); + ok(r==S_OK, "StgCreateDocfile failed %x\n", r); + + r = WriteClassStg(stg, &test_stg_cls); + ok(r == S_OK, "WriteClassStg failed %x\n", r); + + r = IStorage_CreateStream(stg, stmname, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm); + ok(r==S_OK, "IStorage->CreateStream failed %x\n", r); + + pos.QuadPart = 0; + r = IStream_Seek(stm, pos, STREAM_SEEK_SET, &upos); + ok(r==S_OK, "IStream->Seek failed %x\n", r); + + memset(buffer, 'a', sizeof(buffer)); + for (i=0; i<4; i++) + { + /* Write enough bytes to pass the minimum storage file size */ + r = IStream_Write(stm, buffer, sizeof(buffer), NULL); + ok(r==S_OK, "IStream->Write failed %x\n", r); + } + + r = IStorage_Commit(stg, STGC_DEFAULT); + ok(r==S_OK, "IStorage->Commit failed %x\n", r); + + hfile = CreateFileA(filenameA, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, + NULL, OPEN_EXISTING, 0, NULL); + ok(hfile != NULL, "couldn't open file %d\n", GetLastError()); + + orig_size = GetFileSize(hfile, NULL); + + pos.QuadPart = 0; + r = IStream_Seek(stm, pos, STREAM_SEEK_SET, &upos); + ok(r==S_OK, "IStream->Seek failed %x\n", r); + + r = IStream_Write(stm, "b", 1, NULL); + ok(r==S_OK, "IStream->Write failed %x\n", r); + + r = IStorage_Commit(stg, STGC_OVERWRITE); + ok(r==S_OK, "IStorage->Commit failed %x\n", r); + + new_size = GetFileSize(hfile, NULL); + + todo_wine ok(new_size == orig_size, "file grew from %d bytes to %d\n", orig_size, new_size); + + IStream_Release(stm); + + IStorage_RenameElement(stg, stmname, stmname2); + + r = IStorage_Commit(stg, STGC_OVERWRITE); + ok(r==S_OK, "IStorage->Commit failed %x\n", r); + + new_size = GetFileSize(hfile, NULL); + + todo_wine ok(new_size == orig_size, "file grew from %d bytes to %d\n", orig_size, new_size); + + IStorage_Release(stg); + + r = StgOpenStorage(filename, NULL, STGM_READWRITE | STGM_TRANSACTED | STGM_SHARE_EXCLUSIVE, NULL, 0, &stg); + ok(r==S_OK, "StgOpenStorage failed %x\n", r); + + r = IStorage_OpenStream(stg, stmname2, NULL, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, &stm); + ok(r==S_OK, "IStorage->CreateStream failed %x\n", r); + + r = IStream_Read(stm, buffer, sizeof(buffer), &bytesread); + ok(r==S_OK, "IStream->Write failed %x\n", r); + ok(bytesread == sizeof(buffer), "only read %d bytes\n", bytesread); + ok(buffer[0] == 'b', "unexpected data at byte 0\n"); + + for (i=1; i<sizeof(buffer); i++) + if (buffer[i] != 'a') + break; + ok(i == sizeof(buffer), "unexpected data at byte %i\n", i); + + pos.QuadPart = 0; + r = IStream_Seek(stm, pos, STREAM_SEEK_SET, &upos); + ok(r==S_OK, "IStream->Seek failed %x\n", r); + + r = IStream_Write(stm, "c", 1, NULL); + ok(r==S_OK, "IStream->Write failed %x\n", r); + + r = IStorage_Commit(stg, STGC_OVERWRITE); + ok(r==S_OK, "IStorage->Commit failed %x\n", r); + + new_size = GetFileSize(hfile, NULL); + + todo_wine ok(new_size == orig_size, "file grew from %d bytes to %d\n", orig_size, new_size); + + IStream_Release(stm); + + IStorage_Release(stg); + + CloseHandle(hfile); + + DeleteFileA(filenameA); +} + START_TEST(storage32) { CHAR temp[MAX_PATH]; @@ -3576,4 +3689,5 @@ START_TEST(storage32) test_direct_swmr(); test_locking(); test_transacted_shared(); + test_overwrite(); }

1 0

Vincent Povirk : windowscodecs: Share WriteSource code between implementations.
by Alexandre Julliard 16 Jun '14

16 Jun '14

Module: wine Branch: master Commit: 30f98340618b1ebfce38c83ac7c189a34d2559e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30f98340618b1ebfce38c83ac… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Jun 13 14:02:23 2014 -0500 windowscodecs: Share WriteSource code between implementations. --- dlls/windowscodecs/bmpencode.c | 57 +++------------------ dlls/windowscodecs/icnsformat.c | 58 +++------------------ dlls/windowscodecs/jpegformat.c | 62 +++-------------------- dlls/windowscodecs/main.c | 86 ++++++++++++++++++++++++++++++++ dlls/windowscodecs/pngformat.c | 62 +++-------------------- dlls/windowscodecs/tiffformat.c | 64 +++--------------------- dlls/windowscodecs/wincodecs_private.h | 10 ++++ 7 files changed, 130 insertions(+), 269 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=30f98340618b1ebfce38c…

1 0

Vincent Povirk : windowscodecs: Check for empty rect in WriteSource_Proxy.
by Alexandre Julliard 16 Jun '14

16 Jun '14

Module: wine Branch: master Commit: 88f17cdb545855c1462bfc9a4f2083b8bc37b263 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88f17cdb545855c1462bfc9a4… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Jun 13 14:39:26 2014 -0500 windowscodecs: Check for empty rect in WriteSource_Proxy. --- dlls/windowscodecs/main.c | 2 +- dlls/windowscodecs/proxy.c | 3 ++ dlls/windowscodecs/tests/converter.c | 50 ++++++++++++++++++++++++++++++---- 3 files changed, 49 insertions(+), 6 deletions(-) diff --git a/dlls/windowscodecs/main.c b/dlls/windowscodecs/main.c index a4cb93f..d346711 100644 --- a/dlls/windowscodecs/main.c +++ b/dlls/windowscodecs/main.c @@ -182,7 +182,7 @@ HRESULT write_source(IWICBitmapFrameEncode *iface, prc = &rc; } - if (prc->Width != width) + if (prc->Width != width || prc->Height <= 0) return E_INVALIDARG; stride = (bpp * width + 7)/8; diff --git a/dlls/windowscodecs/proxy.c b/dlls/windowscodecs/proxy.c index 53c7d17..38f076f 100644 --- a/dlls/windowscodecs/proxy.c +++ b/dlls/windowscodecs/proxy.c @@ -225,6 +225,9 @@ HRESULT WINAPI IWICBitmapFrameEncode_SetThumbnail_Proxy_W(IWICBitmapFrameEncode HRESULT WINAPI IWICBitmapFrameEncode_WriteSource_Proxy_W(IWICBitmapFrameEncode *iface, IWICBitmapSource *pIBitmapSource, WICRect *prc) { + if (prc && (prc->Width <= 0 || prc->Height <= 0)) + prc = NULL; + return IWICBitmapFrameEncode_WriteSource(iface, pIBitmapSource, prc); } diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index 6c3d232..095298f 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -509,7 +509,7 @@ static void test_encoder_properties(const CLSID* clsid_encoder, IPropertyBag2 *o } static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* clsid_encoder, - const struct bitmap_data **dsts, const CLSID *clsid_decoder, const char *name) + const struct bitmap_data **dsts, const CLSID *clsid_decoder, WICRect *rc, const char *name) { HRESULT hr; IWICBitmapEncoder *encoder; @@ -565,8 +565,14 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls hr = IWICBitmapFrameEncode_SetSize(frameencode, srcs[i]->width, srcs[i]->height); ok(SUCCEEDED(hr), "SetSize failed, hr=%x\n", hr); - hr = IWICBitmapFrameEncode_WriteSource(frameencode, &src_obj->IWICBitmapSource_iface, NULL); - ok(SUCCEEDED(hr), "WriteSource failed, hr=%x\n", hr); + hr = IWICBitmapFrameEncode_WriteSource(frameencode, &src_obj->IWICBitmapSource_iface, rc); + if (rc && (rc->Width <= 0 || rc->Height <= 0)) + { + /* WriteSource fails but WriteSource_Proxy succeeds. */ + ok(hr == E_INVALIDARG, "WriteSource failed, hr=%x (%s)\n", hr, name); + hr = IWICBitmapFrameEncode_WriteSource_Proxy(frameencode, &src_obj->IWICBitmapSource_iface, rc); + } + ok(SUCCEEDED(hr), "WriteSource failed, hr=%x (%s)\n", hr, name); hr = IWICBitmapFrameEncode_Commit(frameencode); ok(SUCCEEDED(hr), "Commit failed, hr=%x\n", hr); @@ -635,7 +641,39 @@ static void test_encoder(const struct bitmap_data *src, const CLSID* clsid_encod dsts[0] = dst; dsts[1] = NULL; - test_multi_encoder(srcs, clsid_encoder, dsts, clsid_decoder, name); + test_multi_encoder(srcs, clsid_encoder, dsts, clsid_decoder, NULL, name); +} + +static void test_encoder_rects(void) +{ + const struct bitmap_data *srcs[2]; + const struct bitmap_data *dsts[2]; + WICRect rc; + + srcs[0] = &testdata_24bppBGR; + srcs[1] = NULL; + dsts[0] = &testdata_24bppBGR; + dsts[1] = NULL; + + rc.X = 0; + rc.Y = 0; + rc.Width = 4; + rc.Height = 2; + + test_multi_encoder(srcs, &CLSID_WICTiffEncoder, dsts, &CLSID_WICTiffDecoder, &rc, "test_encoder_rects full"); + + rc.Width = 0; + test_multi_encoder(srcs, &CLSID_WICTiffEncoder, dsts, &CLSID_WICTiffDecoder, &rc, "test_encoder_rects width=0"); + + rc.Width = -1; + test_multi_encoder(srcs, &CLSID_WICTiffEncoder, dsts, &CLSID_WICTiffDecoder, &rc, "test_encoder_rects width=-1"); + + rc.Width = 4; + rc.Height = 0; + test_multi_encoder(srcs, &CLSID_WICTiffEncoder, dsts, &CLSID_WICTiffDecoder, &rc, "test_encoder_rects height=0"); + + rc.Height = -1; + test_multi_encoder(srcs, &CLSID_WICTiffEncoder, dsts, &CLSID_WICTiffDecoder, &rc, "test_encoder_rects height=-1"); } static const struct bitmap_data *multiple_frames[3] = { @@ -673,7 +711,9 @@ START_TEST(converter) &testdata_24bppBGR, &CLSID_WICTiffDecoder, "TIFF encoder 24bppBGR"); test_multi_encoder(multiple_frames, &CLSID_WICTiffEncoder, - multiple_frames, &CLSID_WICTiffDecoder, "TIFF encoder multi-frame"); + multiple_frames, &CLSID_WICTiffDecoder, NULL, "TIFF encoder multi-frame"); + + test_encoder_rects(); CoUninitialize(); }

1 0

Łukasz Wojniłowicz : Polish translation for release 1.7.20
by Jeremy Newman 16 Jun '14

16 Jun '14

Module: website Branch: master Commit: 94a5df3630af048f613b927bd32de2dd3199e29b URL: http://source.winehq.org/git/website.git/?a=commit;h=94a5df3630af048f613b92… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Jun 14 07:36:21 2014 +0200 Polish translation for release 1.7.20 --- news/pl/2014061301.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/pl/2014061301.xml b/news/pl/2014061301.xml new file mode 100644 index 0000000..b287acd --- /dev/null +++ b/news/pl/2014061301.xml @@ -0,0 +1,16 @@ +<news> +<date>Czerwiec 13, 2014</date> +<title>Wydano Wine 1.7.20</title> +<body> + Wydanie rozwojowe Wine 1.7.20 jest już dostępne. + <a href="{$root}/announce/1.7.20">Co nowego</a> w tym wydaniu: +<ul> + <li>Poprawki do przeciągania i upuszczania w X11.</li> + <li>Dodanie kilku nowych funkcji bibliotek uruchomieniowych C/C++.</li> + <li>Poprawki rozmaitych problemów z pamięcią znalezionych przez Valgrind.</li> + <li>Kilka poprawek do systemu przechowalni OLE.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.20.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Frédéric Delanoy : French translation for release 1.7.20
by Jeremy Newman 16 Jun '14

16 Jun '14

Module: website Branch: master Commit: b544fbcc328b155d26d76326c94b9e8b385adc18 URL: http://source.winehq.org/git/website.git/?a=commit;h=b544fbcc328b155d26d763… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Jun 13 21:19:18 2014 +0200 French translation for release 1.7.20 --- news/fr/2014061301.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/fr/2014061301.xml b/news/fr/2014061301.xml new file mode 100644 index 0000000..10a6382 --- /dev/null +++ b/news/fr/2014061301.xml @@ -0,0 +1,15 @@ +<news> +<date>13 juin 2014</date> +<title>Sortie de Wine 1.7.20</title> +<body> + La version de développement 1.7.20 de Wine est disponible. + <a href="{$root}/announce/1.7.20">Nouveautés</a> de cette version : +<ul> + <li>Correctifs dans le glisser-déposer X11.</li> + <li>Quelques fonctions supplémentaires dans les moteurs C/C++.</li> + <li>Correctifs pour divers problèmes mémoire détectés par Valgrind.</li> + <li>Plusieurs correctifs dans le stockage OLE.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.20.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Julian Rüger : German translation for release 1.7.20
by Jeremy Newman 16 Jun '14

16 Jun '14

Module: website Branch: master Commit: 0298b8e1401264a305fa05a429b8c2a86f8928e3 URL: http://source.winehq.org/git/website.git/?a=commit;h=0298b8e1401264a305fa05… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri Jun 13 23:08:58 2014 +0200 German translation for release 1.7.20 --- news/de/2014061301.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2014061301.xml b/news/de/2014061301.xml new file mode 100644 index 0000000..829bd84 --- /dev/null +++ b/news/de/2014061301.xml @@ -0,0 +1,16 @@ +<news> +<date>13. Juni 2014</date> +<title>Wine 1.7.20 freigegeben</title> +<body> + Die Entwicklungsversion 1.7.20 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.7.20">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Korrekturen für X11 Drag & Drop.</li> + <li>Zusätzliche C/C++ Laufzeitfunktionen.</li> + <li>Fehlerkorrekturen für verschiedene Speicherprobleme, die mit Valgrind gefunden wurden.</li> + <li>Einige OLE-Speicher Verbesserungen.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.20.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0