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

Vincent Povirk : windowscodecs: Check for empty rect in WriteSource_Proxy.
by Alexandre Julliard June 16, 2014

June 16, 2014

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

Nikolay Sivov : comctl32/tests: Avoid testing uninitialized value ( Valgrind).
by Alexandre Julliard June 16, 2014

June 16, 2014

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

Vincent Povirk : windowscodecs: Share WriteSource code between implementations.
by Alexandre Julliard June 16, 2014

June 16, 2014

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 : ole32: Add tests for STGC_OVERWRITE.
by Alexandre Julliard June 16, 2014

June 16, 2014

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

Andrew Eikum : ole32: Respect TreatAs in CoCreateInstance.
by Alexandre Julliard June 16, 2014

June 16, 2014

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

Andrew Eikum : ole32: Implement CoTreatAsClass for classes without AutoTreatAs.
by Alexandre Julliard June 16, 2014

June 16, 2014

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

Jacek Caban : vbscript: Reset error number on error mode change.
by Alexandre Julliard June 16, 2014

June 16, 2014

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

Łukasz Wojniłowicz : Polish translation for release 1.7.20
by Jeremy Newman June 16, 2014

June 16, 2014

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> +<p> Wydanie rozwojowe Wine 1.7.20 jest już dostępne.</p> +<p> <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> +<p>Ź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>. +</p></body></news>

1 0

Julian Rüger : German translation for release 1.7.20
by Jeremy Newman June 16, 2014

June 16, 2014

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> +<p> Die Entwicklungsversion 1.7.20 von Wine ist jetzt verfügbar.</p> +<p> <a href="{$root}/announce/1.7.20">Neuerungen (en)</a> in dieser Version:</p> +<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> +<p>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. +</p></body></news>

1 0

Frédéric Delanoy : French translation for release 1.7.20
by Jeremy Newman June 16, 2014

June 16, 2014

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> +<p> La version de développement 1.7.20 de Wine est disponible.</p> +<p> <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></p> +<p><p>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. +</p></body></news>

1 0

Francois Gouget : testbot/web: Use a PropertyDescriptor and FormPage:: GenerateField() to handle the Remarks field.
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: tools Branch: master Commit: 421c5c8ad65b350c27a50fa759d365211b02b3bc URL: http://source.winehq.org/git/tools.git/?a=commit;h=421c5c8ad65b350c27a50fa7… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jun 13 18:28:53 2014 +0200 testbot/web: Use a PropertyDescriptor and FormPage::GenerateField() to handle the Remarks field. This increases code reuse and avoids losing that field if some other field was invalid. --- testbot/web/Register.pl | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/testbot/web/Register.pl b/testbot/web/Register.pl index 1e18e23..70d8868 100644 --- a/testbot/web/Register.pl +++ b/testbot/web/Register.pl @@ -21,6 +21,8 @@ use strict; package RegisterPage; use URI::Escape; + +use ObjectModel::BasicPropertyDescriptor; use ObjectModel::CGI::ItemPage; use WineTestBot::Config; use WineTestBot::Users; @@ -33,6 +35,11 @@ sub _initialize($$$) my ($self, $Request, $RequiredRole) = @_; $self->SUPER::_initialize($Request, $RequiredRole, CreateUsers()); + + $self->GetParam("Remarks", "") if (!defined $self->GetParam("Remarks")); + $self->{ExtraProperties} = [ + CreateBasicPropertyDescriptor("Remarks", "Remarks", !1, !1, "textarea", 200) + ]; } sub GetTitle($) @@ -81,8 +88,10 @@ sub GenerateFields($) my ($self) = @_; print "<div><input type='hidden' name='Status' value='active'></div>\n"; + $self->SUPER::GenerateFields(); - print "<div class='DetailProperty'><label>Remarks</label><textarea name='Remarks' cols='40' rows='4'></textarea></div>\n"; + map { $self->GenerateField($_, "rw") } @{$self->{ExtraProperties}}; + $self->GenerateRequiredLegend(); $self->{HasRequired} = !1; }

1 0

Francois Gouget : testbot/CGI: Let FormPage::GenerateField() print the label as well as the input tag.
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: tools Branch: master Commit: b49b22c6654e6699f04ceac3096ee8c8f0857427 URL: http://source.winehq.org/git/tools.git/?a=commit;h=b49b22c6654e6699f04ceac3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jun 13 18:27:10 2014 +0200 testbot/CGI: Let FormPage::GenerateField() print the label as well as the input tag. --- testbot/lib/ObjectModel/CGI/FormPage.pm | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index 77c02b3..740b97e 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -148,14 +148,7 @@ sub GenerateFields($) foreach my $PropertyDescriptor (@{$PropertyDescriptors}) { my $Display = $self->DisplayProperty($PropertyDescriptor); - if ($Display) - { - print "<div class='ItemProperty'><label>", - $self->CGI->escapeHTML($self->GetDisplayName($PropertyDescriptor)) . - "</label>"; - $self->GenerateField($PropertyDescriptor, $Display); - print "</div>\n"; - } + $self->GenerateField($PropertyDescriptor, $Display) if ($Display); } } @@ -231,6 +224,10 @@ sub GenerateField($$$) { my ($self, $PropertyDescriptor, $Display) = @_; + print "<div class='ItemProperty'><label>", + $self->CGI->escapeHTML($self->GetDisplayName($PropertyDescriptor)) . + "</label>"; + my $Value = $self->GetDisplayValue($PropertyDescriptor); if ($Display eq "rw") { @@ -303,6 +300,8 @@ sub GenerateField($$$) print " "; } } + + print "</div>\n"; } sub GenerateRequired($$)

1 0

Francois Gouget : testbot/web: Recognize 'textarea' properties and use the appropriate input type.
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: tools Branch: master Commit: 197a4e91f94c36b02be16355355708bfd7626375 URL: http://source.winehq.org/git/tools.git/?a=commit;h=197a4e91f94c36b02be16355… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jun 13 18:22:17 2014 +0200 testbot/web: Recognize 'textarea' properties and use the appropriate input type. This simplifies the code for web pages that have multiline input fields. --- testbot/lib/ObjectModel/CGI/FormPage.pm | 15 ++++----------- testbot/web/Feedback.pl | 14 +------------- 2 files changed, 5 insertions(+), 24 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index dc4a58a..77c02b3 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -221,17 +221,10 @@ sub GetInputType($$) { my ($self, $PropertyDescriptor) = @_; - if ($PropertyDescriptor->GetClass() eq "Enum") - { - return "select"; - } - - if ($PropertyDescriptor->GetType() eq "B") - { - return "checkbox"; - } - - return "text"; + return $PropertyDescriptor->GetClass() eq "Enum" ? "select" : + $PropertyDescriptor->GetType() eq "B" ? "checkbox" : + $PropertyDescriptor->GetType() eq "textarea" ? "textarea" : + "text"; } sub GenerateField($$$) diff --git a/testbot/web/Feedback.pl b/testbot/web/Feedback.pl index 39558da..f0ae921 100644 --- a/testbot/web/Feedback.pl +++ b/testbot/web/Feedback.pl @@ -34,7 +34,7 @@ sub _initialize($$$) my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("Name", "Name", !1, !1, "A", 40), CreateBasicPropertyDescriptor("EMail", "Email", !1, !1, "A", 40), - CreateBasicPropertyDescriptor("Remarks", "Remarks", !1, 1, "A", 1024), + CreateBasicPropertyDescriptor("Remarks", "Remarks", !1, 1, "textarea", 1024), ); $self->SUPER::_initialize($Request, $RequiredRole, \@PropertyDescriptors); @@ -79,18 +79,6 @@ sub GetHeaderText($) "or email address."; } -sub GetInputType($$) -{ - my ($self, $PropertyDescriptor) = @_; - - if (substr($PropertyDescriptor->GetName(), 0, 8) eq "Remarks") - { - return "textarea"; - } - - return $self->SUPER::GetInputType($PropertyDescriptor); -} - sub GetActions($) { my ($self) = @_;

1 0

Francois Gouget : testbot/lib: Improve the PropertyDescriptor methods argument handling.
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: tools Branch: master Commit: 7c18f6d54ce2686fd869fb0d4054502402be47e0 URL: http://source.winehq.org/git/tools.git/?a=commit;h=7c18f6d54ce2686fd869fb0d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jun 13 18:19:51 2014 +0200 testbot/lib: Improve the PropertyDescriptor methods argument handling. This standardizes the way we handle the arguments. Make it so one can readily see the list of arguments the method takes without having to hunt down the implementation of all its ancestors. Because these are methods the added prototypes have no effect whatsoever as far as Perl is concerned. However they do document which arguments are optional. --- testbot/lib/ObjectModel/BasicPropertyDescriptor.pm | 30 +++++++++----------- .../lib/ObjectModel/DetailrefPropertyDescriptor.pm | 22 +++++++------- testbot/lib/ObjectModel/EnumPropertyDescriptor.pm | 25 ++++++++-------- .../lib/ObjectModel/ItemrefPropertyDescriptor.pm | 26 ++++++++--------- testbot/lib/ObjectModel/PropertyDescriptor.pm | 26 +++++++++-------- 5 files changed, 64 insertions(+), 65 deletions(-) diff --git a/testbot/lib/ObjectModel/BasicPropertyDescriptor.pm b/testbot/lib/ObjectModel/BasicPropertyDescriptor.pm index 2e83b60..e355aa6 100644 --- a/testbot/lib/ObjectModel/BasicPropertyDescriptor.pm +++ b/testbot/lib/ObjectModel/BasicPropertyDescriptor.pm @@ -37,44 +37,41 @@ require Exporter; @ISA = qw(ObjectModel::PropertyDescriptor Exporter); @EXPORT = qw(&CreateBasicPropertyDescriptor); -sub _initialize +sub _initialize($$$) { - my $self = shift; - my $Type = shift; - my $MaxLength = shift; + my ($self, $Type, $MaxLength) = @_; $self->{Class} = "Basic"; $self->{Type} = $Type; $self->{MaxLength} = $MaxLength; - $self->SUPER::_initialize(@_); + $self->SUPER::_initialize(); } -sub GetType +sub GetType($) { - my $self = shift; + my ($self) = @_; return $self->{Type}; } -sub GetMaxLength +sub GetMaxLength($) { - my $self = shift; + my ($self) = @_; return $self->{MaxLength}; } -sub GetColNames +sub GetColNames($) { - my $self = shift; + my ($self) = @_; return [$self->{Name}]; } -sub ValidateValue +sub ValidateValue($$$) { - my $self = shift; - my ($Value, $IsNew) = @_; + my ($self, $Value, $IsNew) = @_; if ($self->GetIsRequired()) { @@ -104,9 +101,10 @@ sub ValidateValue return undef; } -sub CreateBasicPropertyDescriptor +sub CreateBasicPropertyDescriptor($$$$$$) { - return ObjectModel::BasicPropertyDescriptor->new(@_); + my ($Name, $DisplayName, $IsKey, $IsRequired, $Type, $MaxLength) = @_; + return ObjectModel::BasicPropertyDescriptor->new($Name, $DisplayName, $IsKey, $IsRequired, $Type, $MaxLength); } 1; diff --git a/testbot/lib/ObjectModel/DetailrefPropertyDescriptor.pm b/testbot/lib/ObjectModel/DetailrefPropertyDescriptor.pm index 4832dd7..9575466 100644 --- a/testbot/lib/ObjectModel/DetailrefPropertyDescriptor.pm +++ b/testbot/lib/ObjectModel/DetailrefPropertyDescriptor.pm @@ -30,37 +30,39 @@ require Exporter; @ISA = qw(ObjectModel::PropertyDescriptor Exporter); @EXPORT = qw(&CreateDetailrefPropertyDescriptor); -sub _initialize +sub _initialize($$) { - my $self = shift; - my $Creator = shift; + my ($self, $Creator) = @_; $self->{Class} = "Detailref"; $self->{Creator} = $Creator; - $self->SUPER::_initialize(@_); + $self->SUPER::_initialize(); } -sub GetColNames +sub GetColNames($) { + #my ($self) = @_; return []; } -sub GetCreator +sub GetCreator($) { - my $self = shift; + my ($self) = @_; return $self->{Creator}; } -sub ValidateValue +sub ValidateValue($$$) { + #my ($self, $Value, $IsNew) = @_; return undef; } -sub CreateDetailrefPropertyDescriptor +sub CreateDetailrefPropertyDescriptor($$$$$) { - return ObjectModel::DetailrefPropertyDescriptor->new(@_); + my ($Name, $DisplayName, $IsKey, $IsRequired, $Creator) = @_; + return ObjectModel::DetailrefPropertyDescriptor->new($Name, $DisplayName, $IsKey, $IsRequired, $Creator); } 1; diff --git a/testbot/lib/ObjectModel/EnumPropertyDescriptor.pm b/testbot/lib/ObjectModel/EnumPropertyDescriptor.pm index 3373c47..29c618b 100644 --- a/testbot/lib/ObjectModel/EnumPropertyDescriptor.pm +++ b/testbot/lib/ObjectModel/EnumPropertyDescriptor.pm @@ -37,35 +37,33 @@ require Exporter; @ISA = qw(ObjectModel::PropertyDescriptor Exporter); @EXPORT = qw(&CreateEnumPropertyDescriptor); -sub _initialize +sub _initialize($$) { - my $self = shift; - my $Values = shift; + my ($self, $Values) = @_; $self->{Class} = "Enum"; $self->{Values} = $Values; - $self->SUPER::_initialize(@_); + $self->SUPER::_initialize(); } -sub GetValues +sub GetValues($) { - my $self = shift; + my ($self) = @_; return $self->{Values}; } -sub GetColNames +sub GetColNames($) { - my $self = shift; + my ($self) = @_; return [$self->{Name}]; } -sub ValidateValue +sub ValidateValue($$$) { - my $self = shift; - my ($Value, $IsNew) = @_; + my ($self, $Value, $IsNew) = @_; if ($self->GetIsRequired()) { @@ -82,9 +80,10 @@ sub ValidateValue return $self->GetDisplayName() . ": Is not valid"; } -sub CreateEnumPropertyDescriptor +sub CreateEnumPropertyDescriptor($$$$$) { - return ObjectModel::EnumPropertyDescriptor->new(@_); + my ($Name, $DisplayName, $IsKey, $IsRequired, $Values) = @_; + return ObjectModel::EnumPropertyDescriptor->new($Name, $DisplayName, $IsKey, $IsRequired, $Values); } 1; diff --git a/testbot/lib/ObjectModel/ItemrefPropertyDescriptor.pm b/testbot/lib/ObjectModel/ItemrefPropertyDescriptor.pm index bf2a548..64b577a 100644 --- a/testbot/lib/ObjectModel/ItemrefPropertyDescriptor.pm +++ b/testbot/lib/ObjectModel/ItemrefPropertyDescriptor.pm @@ -30,37 +30,34 @@ require Exporter; @ISA = qw(ObjectModel::PropertyDescriptor Exporter); @EXPORT = qw(&CreateItemrefPropertyDescriptor); -sub _initialize +sub _initialize($$$) { - my $self = shift; - my $Creator = shift; - my $ColNames = shift; + my ($self, $Creator, $ColNames) = @_; $self->{Class} = "Itemref"; $self->{Creator} = $Creator; $self->{ColNames} = $ColNames; - $self->SUPER::_initialize(@_); + $self->SUPER::_initialize(); } -sub GetCreator +sub GetCreator($) { - my $self = shift; + my ($self) = @_; return $self->{Creator}; } -sub GetColNames +sub GetColNames($) { - my $self = shift; + my ($self) = @_; return $self->{ColNames}; } -sub ValidateValue +sub ValidateValue($$$) { - my $self = shift; - my ($Value, $IsNew) = @_; + my ($self, $Value, $IsNew) = @_; if ($self->GetIsRequired() && ! defined($Value)) { @@ -70,9 +67,10 @@ sub ValidateValue return undef; } -sub CreateItemrefPropertyDescriptor +sub CreateItemrefPropertyDescriptor($$$$$$) { - return ObjectModel::ItemrefPropertyDescriptor->new(@_); + my ($Name, $DisplayName, $IsKey, $IsRequired, $Creator, $ColNames) = @_; + return ObjectModel::ItemrefPropertyDescriptor->new($Name, $DisplayName, $IsKey, $IsRequired, $Creator, $ColNames); } 1; diff --git a/testbot/lib/ObjectModel/PropertyDescriptor.pm b/testbot/lib/ObjectModel/PropertyDescriptor.pm index 5b5cbc4..a8a7271 100644 --- a/testbot/lib/ObjectModel/PropertyDescriptor.pm +++ b/testbot/lib/ObjectModel/PropertyDescriptor.pm @@ -36,7 +36,7 @@ use vars qw(@ISA @EXPORT); require Exporter; @ISA = qw(Exporter); -sub new +sub new($$$$$@) { my $class = shift; my $Name = shift; @@ -54,41 +54,43 @@ sub new return $self; } -sub _initialize +sub _initialize($) { + #my ($self) = @_; } -sub GetName +sub GetName($) { - my $self = shift; + my ($self) = @_; return $self->{Name}; } -sub GetDisplayName +sub GetDisplayName($) { - my $self = shift; + my ($self) = @_; return $self->{DisplayName}; } -sub GetIsKey +sub GetIsKey($) { - my $self = shift; + my ($self) = @_; return $self->{IsKey}; } -sub GetIsRequired +sub GetIsRequired($) { - my $self = shift; + my ($self) = @_; + return $self->{IsRequired}; } -sub GetClass +sub GetClass($) { - my $self = shift; + my ($self) = @_; return $self->{Class}; }

1 0

Francois Gouget : testbot/web: Add a simple 'captcha' on the registration page.
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: tools Branch: master Commit: a83696fd675954763053ea193f09977b6d452625 URL: http://source.winehq.org/git/tools.git/?a=commit;h=a83696fd675954763053ea19… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jun 13 18:32:32 2014 +0200 testbot/web: Add a simple 'captcha' on the registration page. The captcha is in the form of a simple configurable question where the answer should be obvious to Wine developers. --- testbot/lib/WineTestBot/Config.pm | 6 ++++-- testbot/lib/WineTestBot/ConfigLocalTemplate.pl | 5 +++++ testbot/web/Register.pl | 20 +++++++++++++++++--- 3 files changed, 26 insertions(+), 5 deletions(-) diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index fbf2b0b..db7f18d 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -33,7 +33,8 @@ use vars qw (@ISA @EXPORT @EXPORT_OK $UseSSL $LogDir $DataDir $BinDir $ProjectName $PatchesMailingList $LDAPServer $LDAPBindDN $LDAPSearchBase $LDAPSearchFilter $LDAPRealNameAttribute $LDAPEMailAttribute $AgentPort $Tunnel - $TunnelDefaults $JobPurgeDays $JobArchiveDays $WebHostName); + $TunnelDefaults $JobPurgeDays $JobArchiveDays $WebHostName + $RegistrationQ $RegistrationARE); require Exporter; @ISA = qw(Exporter); @@ -45,7 +46,8 @@ require Exporter; $TagPrefix $ProjectName $PatchesMailingList $LDAPServer $LDAPBindDN $LDAPSearchBase $LDAPSearchFilter $LDAPRealNameAttribute $LDAPEMailAttribute $AgentPort $Tunnel - $TunnelDefaults $JobPurgeDays $JobArchiveDays $WebHostName); + $TunnelDefaults $JobPurgeDays $JobArchiveDays $WebHostName + $RegistrationQ $RegistrationARE); @EXPORT_OK = qw($DbDataSource $DbUsername $DbPassword); if ($::RootDir !~ m=^/=) diff --git a/testbot/lib/WineTestBot/ConfigLocalTemplate.pl b/testbot/lib/WineTestBot/ConfigLocalTemplate.pl index 260d79e..6d8128b 100644 --- a/testbot/lib/WineTestBot/ConfigLocalTemplate.pl +++ b/testbot/lib/WineTestBot/ConfigLocalTemplate.pl @@ -49,6 +49,11 @@ $WineTestBot::Config::WinePatchCc = ""; # Host name of the web interface $WineTestBot::Config::WebHostName = undef; +# The question to ask to filter out bots trying to register, and the regular +# expression that the answer must match. +$RegistrationQ = "What is the software project being tested?"; +$RegistrationARE = "(?i:wine)"; + # Prefix of the tag used for sending winetest reports $WineTestBot::Config::TagPrefix = undef; diff --git a/testbot/web/Register.pl b/testbot/web/Register.pl index 70d8868..eb0f1ec 100644 --- a/testbot/web/Register.pl +++ b/testbot/web/Register.pl @@ -35,11 +35,15 @@ sub _initialize($$$) my ($self, $Request, $RequiredRole) = @_; $self->SUPER::_initialize($Request, $RequiredRole, CreateUsers()); + $self->{ExtraProperties} = []; + if ($RegistrationQ) + { + $self->GetParam("RegA", "") if (!defined $self->GetParam("RegA")); + push @{$self->{ExtraProperties}}, CreateBasicPropertyDescriptor("RegA", "Please demonstrate you are not a bot by answering this question: $RegistrationQ", !1, 1, "A", 40); + } $self->GetParam("Remarks", "") if (!defined $self->GetParam("Remarks")); - $self->{ExtraProperties} = [ - CreateBasicPropertyDescriptor("Remarks", "Remarks", !1, !1, "textarea", 200) - ]; + push @{$self->{ExtraProperties}}, CreateBasicPropertyDescriptor("Remarks", "Remarks", !1, !1, "textarea", 160); } sub GetTitle($) @@ -110,6 +114,16 @@ sub OnSendRequest($) { my ($self) = @_; + if ($RegistrationQ) + { + my $RegA = $self->GetParam("RegA"); + if ($RegA !~ /$RegistrationARE/) + { + $self->{ErrMessage} = "Wrong 'captcha' answer. Please try again."; + $self->{ErrField} = "Captcha"; + return !1; + } + } if (! $self->Save()) { return !1;

1 0

Francois Gouget : testbot/bin: Standardize handling of the Engine' s function arguments and add prototypes.
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: tools Branch: master Commit: 8c390b93891db0b59adc94044ca8bdb43f10fb90 URL: http://source.winehq.org/git/tools.git/?a=commit;h=8c390b93891db0b59adc9404… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jun 13 18:20:06 2014 +0200 testbot/bin: Standardize handling of the Engine's function arguments and add prototypes. The prototypes let Perl detect when the wrong number of parameters is passed to these functions. The exception to the rule is the HandleXxx() functions due to the way they are called. The prototypes also document which arguments are optional. --- testbot/bin/Engine.pl | 46 ++++++++++++++++-------------- testbot/lib/WineTestBot/Engine/Events.pm | 12 ++++---- testbot/lib/WineTestBot/Engine/Notify.pm | 30 +++++++++---------- 3 files changed, 45 insertions(+), 43 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index ccaadc1..29dc919 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -56,7 +56,7 @@ use WineTestBot::VMs; my $RunEngine = 1; -sub FatalError +sub FatalError(@) { LogMsg @_; LogMsg "Shutdown following a fatal error\n"; @@ -215,7 +215,7 @@ sub Cleanup(;$$) } -sub HandleShutdown +sub HandleShutdown($$) { my ($KillTasks, $KillVMs) = @_; @@ -252,12 +252,12 @@ sub HandleShutdown return "1OK\n"; } -sub HandlePing +sub HandlePing() { return "1pong\n"; } -sub HandleJobStatusChange +sub HandleJobStatusChange($$$) { my ($JobKey, $OldStatus, $NewStatus) = @_; @@ -297,9 +297,9 @@ sub HandleJobStatusChange return "1OK"; } -sub HandleJobCancel +sub HandleJobCancel($) { - my $JobKey = $_[0]; + my ($JobKey) = @_; my $Job = CreateJobs()->GetItem($JobKey); if (! $Job) @@ -327,9 +327,9 @@ sub HandleJobCancel return "1OK"; } -sub HandleJobRestart +sub HandleJobRestart($) { - my $JobKey = $_[0]; + my ($JobKey) = @_; my $Job = CreateJobs()->GetItem($JobKey); if (! $Job) @@ -357,7 +357,7 @@ sub HandleJobRestart return "1OK"; } -sub HandleRescheduleJobs +sub HandleRescheduleJobs() { my $ErrMessage = ScheduleJobs(); if (defined($ErrMessage)) @@ -368,7 +368,7 @@ sub HandleRescheduleJobs return "1OK"; } -sub HandleVMStatusChange +sub HandleVMStatusChange($$$) { my ($VMKey, $OldStatus, $NewStatus) = @_; @@ -392,7 +392,7 @@ sub HandleVMStatusChange return "1OK"; } -sub HandleWinePatchMLSubmission +sub HandleWinePatchMLSubmission() { my $dh; if (!opendir($dh, "$DataDir/staging")) @@ -443,7 +443,7 @@ sub HandleWinePatchMLSubmission return @ErrMessages ? "0". join("; ", @ErrMessages) : "1OK"; } -sub HandleWinePatchWebSubmission +sub HandleWinePatchWebSubmission() { my $LatestWebPatchId = 0; my $Patches = CreatePatches(); @@ -514,15 +514,17 @@ sub HandleWinePatchWebSubmission return @ErrMessages ? "0". join("; ", @ErrMessages) : "1OK"; } -sub HandleGetScreenshot +sub HandleGetScreenshot($) { + my ($VMName) = @_; + # Validate VM name - if ($_[0] !~ m/^(\w+)$/) + if ($VMName !~ m/^(\w+)$/) { LogMsg "Invalid VM name for screenshot\n"; return "0Invalid VM name"; } - my $VMName = $1; + $VMName = $1; my $VM = CreateVMs()->GetItem($VMName); if (! defined($VM)) @@ -554,7 +556,7 @@ my %Handlers=( "winepatchwebsubmission" => \&HandleWinePatchWebSubmission, ); -sub HandleClientCmd +sub HandleClientCmd(@) { my $Cmd = shift; @@ -565,9 +567,9 @@ sub HandleClientCmd return "0Unknown command $Cmd\n"; } -sub ClientRead +sub ClientRead($) { - my $Client = shift; + my ($Client) = @_; my $Buf; my $GotSomething = !1; @@ -596,7 +598,7 @@ checks whether any pending patchsets are now complete and thus can be scheduled. =back =cut -sub SafetyNet +sub SafetyNet() { CheckJobs(); ScheduleJobs(); @@ -610,9 +612,9 @@ sub SafetyNet } } -sub PrepareSocket +sub PrepareSocket($) { - my $Socket = $_[0]; + my ($Socket) = @_; my $Flags = 0; if (fcntl($Socket, F_GETFL, $Flags)) @@ -663,7 +665,7 @@ sub REAPER $SIG{CHLD} = \&REAPER; # still loathe SysV } -sub main +sub main() { my ($Shutdown, $KillTasks, $KillVMs); while (@ARGV) diff --git a/testbot/lib/WineTestBot/Engine/Events.pm b/testbot/lib/WineTestBot/Engine/Events.pm index 9a8da83..584a7e5 100644 --- a/testbot/lib/WineTestBot/Engine/Events.pm +++ b/testbot/lib/WineTestBot/Engine/Events.pm @@ -34,7 +34,7 @@ require Exporter; my %Events; -sub AddEvent +sub AddEvent($$$$) { my ($Name, $Timeout, $Repeat, $HandlerFunc) = @_; @@ -44,21 +44,21 @@ sub AddEvent HandlerFunc => $HandlerFunc}; } -sub DeleteEvent +sub DeleteEvent($) { - my $Name = $_[0]; + my ($Name) = @_; delete $Events{$Name}; } -sub EventScheduled +sub EventScheduled($) { - my $Name = $_[0]; + my ($Name) = @_; return defined($Events{$Name}); } -sub RunEvents +sub RunEvents() { my $Now = time(); my $Next = undef; diff --git a/testbot/lib/WineTestBot/Engine/Notify.pm b/testbot/lib/WineTestBot/Engine/Notify.pm index d0d4890..3063e99 100644 --- a/testbot/lib/WineTestBot/Engine/Notify.pm +++ b/testbot/lib/WineTestBot/Engine/Notify.pm @@ -39,9 +39,9 @@ require Exporter; @EXPORT_OK = qw($RunningInEngine); -sub SendCmdReceiveReply +sub SendCmdReceiveReply($) { - my $Cmd = shift; + my ($Cmd) = @_; if (defined($RunningInEngine)) { @@ -74,7 +74,7 @@ sub SendCmdReceiveReply return $Reply; } -sub Shutdown +sub Shutdown($$) { my ($KillTasks, $KillVMs) = @_; @@ -93,13 +93,13 @@ sub Shutdown return substr($Reply, 1); } -sub PingEngine +sub PingEngine() { my $Reply = SendCmdReceiveReply("ping\n"); return 1 <= length($Reply) && substr($Reply, 0, 1) eq "1"; } -sub JobStatusChange +sub JobStatusChange($$$) { my ($JobKey, $OldStatus, $NewStatus) = @_; @@ -116,9 +116,9 @@ sub JobStatusChange return substr($Reply, 1); } -sub JobCancel +sub JobCancel($) { - my $JobKey = $_[0]; + my ($JobKey) = @_; my $Reply = SendCmdReceiveReply("jobcancel $JobKey\n"); if (length($Reply) < 1) @@ -133,9 +133,9 @@ sub JobCancel return substr($Reply, 1); } -sub JobRestart +sub JobRestart($) { - my $JobKey = $_[0]; + my ($JobKey) = @_; my $Reply = SendCmdReceiveReply("jobrestart $JobKey\n"); if (length($Reply) < 1) @@ -150,7 +150,7 @@ sub JobRestart return substr($Reply, 1); } -sub RescheduleJobs +sub RescheduleJobs() { my $Reply = SendCmdReceiveReply("reschedulejobs\n"); if (length($Reply) < 1) @@ -165,7 +165,7 @@ sub RescheduleJobs return substr($Reply, 1); } -sub VMStatusChange +sub VMStatusChange($$$) { my ($VMKey, $OldStatus, $NewStatus) = @_; @@ -182,7 +182,7 @@ sub VMStatusChange return substr($Reply, 1); } -sub WinePatchMLSubmission +sub WinePatchMLSubmission() { my $Reply = SendCmdReceiveReply("winepatchmlsubmission\n"); if (length($Reply) < 1) @@ -197,7 +197,7 @@ sub WinePatchMLSubmission return substr($Reply, 1); } -sub WinePatchWebSubmission +sub WinePatchWebSubmission() { my $Reply = SendCmdReceiveReply("winepatchwebsubmission\n"); if (length($Reply) < 1) @@ -212,9 +212,9 @@ sub WinePatchWebSubmission return substr($Reply, 1); } -sub GetScreenshot +sub GetScreenshot($) { - my $VMName = $_[0]; + my ($VMName) = @_; my $Reply = SendCmdReceiveReply("getscreenshot $VMName\n"); if (length($Reply) < 1)

1 0

Francois Gouget : testbot/web: Simplify the FeedBack page by using GetParam() to set suitable defaults.
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: tools Branch: master Commit: 5e34ba480fac9e561253ca91c1ea9530a4bd1e0e URL: http://source.winehq.org/git/tools.git/?a=commit;h=5e34ba480fac9e561253ca91… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jun 13 18:23:32 2014 +0200 testbot/web: Simplify the FeedBack page by using GetParam() to set suitable defaults. --- testbot/web/Feedback.pl | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/testbot/web/Feedback.pl b/testbot/web/Feedback.pl index f0ae921..5d3e2e6 100644 --- a/testbot/web/Feedback.pl +++ b/testbot/web/Feedback.pl @@ -42,27 +42,11 @@ sub _initialize($$$) my $Session = $self->GetCurrentSession(); if (defined($Session)) { + # Provide default values my $User = $Session->User; - $self->{Name} = $User->RealName; - $self->{EMail} = $User->EMail; + $self->GetParam("Name", $User->RealName) if (!defined $self->GetParam("Name")); + $self->GetParam("EMail", $User->EMail) if (!defined $self->GetParam("EMail")); } - else - { - $self->{Name} = undef; - $self->{EMail} = undef; - } -} - -sub GetPropertyValue($$) -{ - my ($self, $PropertyDescriptor) = @_; - - if (defined($self->{$PropertyDescriptor->GetName()})) - { - return $self->{$PropertyDescriptor->GetName()}; - } - - return $self->SUPER::GetPropertyValue($PropertyDescriptor); } sub GetTitle($)

1 0

Francois Gouget : testbot/web: Fix the vertical-align CSS statements so the form labels and inputs align correctly.
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: tools Branch: master Commit: d56366da8ee186c474b17cfd2fb599bbb8dcc44b URL: http://source.winehq.org/git/tools.git/?a=commit;h=d56366da8ee186c474b17cfd… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jun 13 18:21:38 2014 +0200 testbot/web: Fix the vertical-align CSS statements so the form labels and inputs align correctly. --- testbot/web/WineTestBot.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testbot/web/WineTestBot.css b/testbot/web/WineTestBot.css index a64584b..5d25c42 100644 --- a/testbot/web/WineTestBot.css +++ b/testbot/web/WineTestBot.css @@ -191,7 +191,7 @@ h2 { width: 45%; display: inline-block; - vertical-align: center; + vertical-align: middle; text-align: right; padding-right: 6px; } @@ -199,6 +199,7 @@ h2 .ItemValue { display: inline-block; + vertical-align: middle; /* The joys of IE. Got the following 2 lines from http://blog.mozilla.com/webdev/2009/02/20/cross-browser-inline-block/ */ zoom: 1;

1 0

Alexandre Julliard : Wine release 1.7.20
by Alexandre Julliard June 13, 2014

June 13, 2014

Module: website Branch: master Commit: 379eab9862638a3df289d3a1a716b3427ce2146d URL: http://source.winehq.org/git/website.git/?a=commit;h=379eab9862638a3df289d3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 13 19:53:01 2014 +0200 Wine release 1.7.20 --- news/en/2014061301.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2014061301.xml b/news/en/2014061301.xml new file mode 100644 index 0000000..8d72896 --- /dev/null +++ b/news/en/2014061301.xml @@ -0,0 +1,16 @@ +<news> +<date>June 13, 2014</date> +<title>Wine 1.7.20 Released</title> +<body> +<p> The Wine development release 1.7.20 is now available.</p> +<p> <a href="{$root}/announce/1.7.20">What's new</a> in this release: +<ul> + <li>X11 drag & drop fixes.</li> + <li>A few more C/C++ runtime functions.</li> + <li>Fixes for various memory issues found by Valgrind.</li> + <li>Some OLE storage fixes.</li> + <li>Various bug fixes.</li> +</ul> +<p>The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.20.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</p></body></news>

1 0

Tag wine-1.7.20 : Alexandre Julliard : Release 1.7.20
by Alexandre Julliard June 13, 2014

June 13, 2014

Module: wine Branch: refs/tags/wine-1.7.20 Tag: 144e733c73abef6fe05846d57efaf440613a498f URL: http://source.winehq.org/git/wine.git/?a=tag;h=144e733c73abef6fe05846d57efa… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 13 19:45:11 2014 +0200 Release 1.7.20

1 0

Alexandre Julliard : Release 1.7.20.
by Alexandre Julliard June 13, 2014

June 13, 2014

Module: wine Branch: master Commit: 56999940a37df73fd69d4ec9876eeb3e2015e4a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56999940a37df73fd69d4ec98… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 13 19:45:11 2014 +0200 Release 1.7.20. --- ANNOUNCE | 760 ++++++++++++++++++++++++++++++------------------------------- AUTHORS | 5 + VERSION | 2 +- configure | 18 +- 4 files changed, 384 insertions(+), 401 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=56999940a37df73fd69d4…

1 0

Damjan Jovanovic : winex11.drv: Migrate importing text/ uri-list XDND selections to the clipboard.
by Alexandre Julliard June 13, 2014

June 13, 2014

Module: wine Branch: master Commit: 026fe4d08e14c7a706985f8b367bb28895335bd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=026fe4d08e14c7a706985f8b3… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue May 27 02:23:55 2014 +0200 winex11.drv: Migrate importing text/uri-list XDND selections to the clipboard. --- dlls/winex11.drv/clipboard.c | 176 +++++++++++++++++++++++++++++++++ dlls/winex11.drv/xdnd.c | 223 ++---------------------------------------- 2 files changed, 182 insertions(+), 217 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=026fe4d08e14c7a706985…

1 0

Michael Stefaniuc : dmusic: Remove the redundant "IDirectMusicCollection" from method names.
by Alexandre Julliard June 13, 2014

June 13, 2014

Module: wine Branch: master Commit: d33989f675d3a98c98268ab92a39c69650a1ebe9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d33989f675d3a98c98268ab92… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 12 11:22:45 2014 +0200 dmusic: Remove the redundant "IDirectMusicCollection" from method names. --- dlls/dmusic/collection.c | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index f3bb510..5754884 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -60,7 +60,8 @@ static inline IDirectMusicCollectionImpl *impl_from_IPersistStream(IPersistStrea } /* IDirectMusicCollectionImpl IUnknown part: */ -static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicCollection_QueryInterface(LPDIRECTMUSICCOLLECTION iface, REFIID riid, LPVOID *ret_iface) +static HRESULT WINAPI IDirectMusicCollectionImpl_QueryInterface(IDirectMusicCollection *iface, + REFIID riid, void **ret_iface) { IDirectMusicCollectionImpl *This = impl_from_IDirectMusicCollection(iface); @@ -84,7 +85,7 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicCollection_QueryInt return S_OK; } -static ULONG WINAPI IDirectMusicCollectionImpl_IDirectMusicCollection_AddRef(LPDIRECTMUSICCOLLECTION iface) +static ULONG WINAPI IDirectMusicCollectionImpl_AddRef(IDirectMusicCollection *iface) { IDirectMusicCollectionImpl *This = impl_from_IDirectMusicCollection(iface); ULONG ref = InterlockedIncrement(&This->ref); @@ -94,7 +95,7 @@ static ULONG WINAPI IDirectMusicCollectionImpl_IDirectMusicCollection_AddRef(LPD return ref; } -static ULONG WINAPI IDirectMusicCollectionImpl_IDirectMusicCollection_Release(LPDIRECTMUSICCOLLECTION iface) +static ULONG WINAPI IDirectMusicCollectionImpl_Release(IDirectMusicCollection *iface) { IDirectMusicCollectionImpl *This = impl_from_IDirectMusicCollection(iface); ULONG ref = InterlockedDecrement(&This->ref); @@ -110,7 +111,8 @@ static ULONG WINAPI IDirectMusicCollectionImpl_IDirectMusicCollection_Release(LP } /* IDirectMusicCollection Interface follows: */ -static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicCollection_GetInstrument(LPDIRECTMUSICCOLLECTION iface, DWORD patch, IDirectMusicInstrument** instrument) +static HRESULT WINAPI IDirectMusicCollectionImpl_GetInstrument(IDirectMusicCollection *iface, + DWORD patch, IDirectMusicInstrument **instrument) { IDirectMusicCollectionImpl *This = impl_from_IDirectMusicCollection(iface); DMUS_PRIVATE_INSTRUMENTENTRY *inst_entry; @@ -136,7 +138,8 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicCollection_GetInstr return DMUS_E_INVALIDPATCH; } -static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicCollection_EnumInstrument(LPDIRECTMUSICCOLLECTION iface, DWORD index, DWORD* patch, LPWSTR name, DWORD name_length) +static HRESULT WINAPI IDirectMusicCollectionImpl_EnumInstrument(IDirectMusicCollection *iface, + DWORD index, DWORD *patch, LPWSTR name, DWORD name_length) { IDirectMusicCollectionImpl *This = impl_from_IDirectMusicCollection(iface); DWORD i = 0; @@ -165,11 +168,11 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicCollection_EnumInst } static const IDirectMusicCollectionVtbl DirectMusicCollection_Collection_Vtbl = { - IDirectMusicCollectionImpl_IDirectMusicCollection_QueryInterface, - IDirectMusicCollectionImpl_IDirectMusicCollection_AddRef, - IDirectMusicCollectionImpl_IDirectMusicCollection_Release, - IDirectMusicCollectionImpl_IDirectMusicCollection_GetInstrument, - IDirectMusicCollectionImpl_IDirectMusicCollection_EnumInstrument + IDirectMusicCollectionImpl_QueryInterface, + IDirectMusicCollectionImpl_AddRef, + IDirectMusicCollectionImpl_Release, + IDirectMusicCollectionImpl_GetInstrument, + IDirectMusicCollectionImpl_EnumInstrument }; /* IDirectMusicCollectionImpl IDirectMusicObject part: */ @@ -191,7 +194,8 @@ static HRESULT read_from_stream(IStream *stream, void *data, ULONG size) return S_OK; } -static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicObject_ParseDescriptor(LPDIRECTMUSICOBJECT iface, LPSTREAM stream, LPDMUS_OBJECTDESC desc) +static HRESULT WINAPI IDirectMusicObjectImpl_ParseDescriptor(IDirectMusicObject *iface, + IStream *stream, DMUS_OBJECTDESC *desc) { struct dmobject *This = impl_from_IDirectMusicObject(iface); DMUS_PRIVATE_CHUNK chunk; @@ -385,11 +389,12 @@ static const IDirectMusicObjectVtbl dmobject_vtbl = { dmobj_IDirectMusicObject_Release, dmobj_IDirectMusicObject_GetDescriptor, dmobj_IDirectMusicObject_SetDescriptor, - IDirectMusicCollectionImpl_IDirectMusicObject_ParseDescriptor + IDirectMusicObjectImpl_ParseDescriptor }; /* IDirectMusicCollectionImpl IPersistStream part: */ -static HRESULT WINAPI IDirectMusicCollectionImpl_IPersistStream_Load(LPPERSISTSTREAM iface, IStream* stream) +static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, + IStream *stream) { IDirectMusicCollectionImpl *This = impl_from_IPersistStream(iface); DMUS_PRIVATE_CHUNK chunk; @@ -698,7 +703,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { dmobj_IPersistStream_Release, unimpl_IPersistStream_GetClassID, unimpl_IPersistStream_IsDirty, - IDirectMusicCollectionImpl_IPersistStream_Load, + IPersistStreamImpl_Load, unimpl_IPersistStream_Save, unimpl_IPersistStream_GetSizeMax };

1 0

Michael Stefaniuc : dmusic: Use generic "unimplemented" methods for IPersistStream.
by Alexandre Julliard June 13, 2014

June 13, 2014

Module: wine Branch: master Commit: 4e81a977c7601ae5542bb0084a72b44a891bff57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e81a977c7601ae5542bb0084… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 12 11:12:28 2014 +0200 dmusic: Use generic "unimplemented" methods for IPersistStream. --- dlls/dmusic/collection.c | 28 ++++------------------------ dlls/dmusic/dmobject.c | 26 ++++++++++++++++++++++++++ dlls/dmusic/dmobject.h | 9 +++++++++ 3 files changed, 39 insertions(+), 24 deletions(-) diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index 9c6f357..c7084db 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -390,16 +390,6 @@ static const IDirectMusicObjectVtbl dmobject_vtbl = { }; /* IDirectMusicCollectionImpl IPersistStream part: */ -static HRESULT WINAPI IDirectMusicCollectionImpl_IPersistStream_GetClassID(LPPERSISTSTREAM iface, CLSID* pClassID) -{ - return E_NOTIMPL; -} - -static HRESULT WINAPI IDirectMusicCollectionImpl_IPersistStream_IsDirty(LPPERSISTSTREAM iface) -{ - return S_FALSE; -} - static HRESULT WINAPI IDirectMusicCollectionImpl_IPersistStream_Load(LPPERSISTSTREAM iface, IStream* stream) { IDirectMusicCollectionImpl *This = impl_from_IPersistStream(iface); @@ -703,25 +693,15 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IPersistStream_Load(LPPERSISTST return S_OK; } -static HRESULT WINAPI IDirectMusicCollectionImpl_IPersistStream_Save(LPPERSISTSTREAM iface, IStream* pStm, BOOL fClearDirty) -{ - return E_NOTIMPL; -} - -static HRESULT WINAPI IDirectMusicCollectionImpl_IPersistStream_GetSizeMax(LPPERSISTSTREAM iface, ULARGE_INTEGER* pcbSize) -{ - return E_NOTIMPL; -} - static const IPersistStreamVtbl persiststream_vtbl = { dmobj_IPersistStream_QueryInterface, dmobj_IPersistStream_AddRef, dmobj_IPersistStream_Release, - IDirectMusicCollectionImpl_IPersistStream_GetClassID, - IDirectMusicCollectionImpl_IPersistStream_IsDirty, + unimpl_IPersistStream_GetClassID, + unimpl_IPersistStream_IsDirty, IDirectMusicCollectionImpl_IPersistStream_Load, - IDirectMusicCollectionImpl_IPersistStream_Save, - IDirectMusicCollectionImpl_IPersistStream_GetSizeMax + unimpl_IPersistStream_Save, + unimpl_IPersistStream_GetSizeMax }; diff --git a/dlls/dmusic/dmobject.c b/dlls/dmusic/dmobject.c index f6c83a0..4afd5b9 100644 --- a/dlls/dmusic/dmobject.c +++ b/dlls/dmusic/dmobject.c @@ -134,6 +134,32 @@ ULONG WINAPI dmobj_IPersistStream_Release(IPersistStream *iface) return IUnknown_Release(This->outer_unk); } +/* IPersistStream methods not implemented in native */ +HRESULT WINAPI unimpl_IPersistStream_GetClassID(IPersistStream *iface, CLSID *class) +{ + TRACE("(%p, %p): method not implemented\n", iface, class); + return E_NOTIMPL; +} + +HRESULT WINAPI unimpl_IPersistStream_IsDirty(IPersistStream *iface) +{ + TRACE("(%p): method not implemented, always returning S_FALSE\n", iface); + return S_FALSE; +} + +HRESULT WINAPI unimpl_IPersistStream_Save(IPersistStream *iface, IStream *stream, + BOOL clear_dirty) +{ + TRACE("(%p, %p, %d): method not implemented\n", iface, stream, clear_dirty); + return E_NOTIMPL; +} + +HRESULT WINAPI unimpl_IPersistStream_GetSizeMax(IPersistStream *iface, ULARGE_INTEGER *size) +{ + TRACE("(%p, %p): method not implemented\n", iface, size); + return E_NOTIMPL; +} + void dmobject_init(struct dmobject *dmobj, const GUID *class, IUnknown *outer_unk) { diff --git a/dlls/dmusic/dmobject.h b/dlls/dmusic/dmobject.h index 1a09a0b..3574939 100644 --- a/dlls/dmusic/dmobject.h +++ b/dlls/dmusic/dmobject.h @@ -42,3 +42,12 @@ HRESULT WINAPI dmobj_IPersistStream_QueryInterface(IPersistStream *iface, REFIID void **ret_iface) DECLSPEC_HIDDEN; ULONG WINAPI dmobj_IPersistStream_AddRef(IPersistStream *iface) DECLSPEC_HIDDEN; ULONG WINAPI dmobj_IPersistStream_Release(IPersistStream *iface) DECLSPEC_HIDDEN; + +/* IPersistStream methods not implemented in native */ +HRESULT WINAPI unimpl_IPersistStream_GetClassID(IPersistStream *iface, + CLSID *class) DECLSPEC_HIDDEN; +HRESULT WINAPI unimpl_IPersistStream_IsDirty(IPersistStream *iface) DECLSPEC_HIDDEN; +HRESULT WINAPI unimpl_IPersistStream_Save(IPersistStream *iface, IStream *stream, + BOOL clear_dirty) DECLSPEC_HIDDEN; +HRESULT WINAPI unimpl_IPersistStream_GetSizeMax(IPersistStream *iface, + ULARGE_INTEGER *size) DECLSPEC_HIDDEN;

1 0

Andrew Eikum : ole32: Fix return type.
by Alexandre Julliard June 13, 2014

June 13, 2014

Module: wine Branch: master Commit: e9533ca85aba0fefe72e1d942489adb2beb8f7e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9533ca85aba0fefe72e1d942… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Jun 13 09:07:57 2014 -0500 ole32: Fix return type. --- dlls/ole32/storage32.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 69a2198..757138d 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -7910,9 +7910,9 @@ HRESULT SmallBlockChainStream_WriteAt( /* * Step to the next big block. */ - if(FAILED(SmallBlockChainStream_GetNextBlockInChain(This, blockIndex, - &blockIndex))) - return FALSE; + res = SmallBlockChainStream_GetNextBlockInChain(This, blockIndex, &blockIndex); + if (FAILED(res)) + return res; bufferWalker += bytesWrittenToBigBlockFile; size -= bytesWrittenToBigBlockFile; *bytesWritten += bytesWrittenToBigBlockFile;

1 0

Nikolay Sivov : shlwapi/tests: Skip if test ini file wasn't created.
by Alexandre Julliard June 13, 2014

June 13, 2014

Module: wine Branch: master Commit: 31fb427737f189b7a1750b0c3c5059614955e0d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31fb427737f189b7a1750b0c3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 1 21:56:13 2014 +0400 shlwapi/tests: Skip if test ini file wasn't created. --- dlls/shlwapi/tests/ordinal.c | 66 +++++++++++++++++++++++------------------- 1 file changed, 37 insertions(+), 29 deletions(-) diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 6833095..531844f 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -2667,7 +2667,7 @@ static void test_SHIShellFolder_EnumObjects(void) IShellFolder_Release(folder); } -static void write_inifile(LPCWSTR filename) +static BOOL write_inifile(LPCWSTR filename) { DWORD written; HANDLE file; @@ -2678,12 +2678,16 @@ static void write_inifile(LPCWSTR filename) "AnotherKey=asdf\r\n"; file = CreateFileW(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); - if(file == INVALID_HANDLE_VALUE) - return; + if(file == INVALID_HANDLE_VALUE) { + win_skip("failed to create ini file at %s\n", wine_dbgstr_w(filename)); + return FALSE; + } WriteFile(file, data, sizeof(data), &written, NULL); CloseHandle(file); + + return TRUE; } #define verify_inifile(f, e) r_verify_inifile(__LINE__, f, e) @@ -2694,6 +2698,7 @@ static void r_verify_inifile(unsigned l, LPCWSTR filename, LPCSTR exp) DWORD read; file = CreateFileW(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); + if(file == INVALID_HANDLE_VALUE) return; @@ -2712,52 +2717,54 @@ static void test_SHGetIniString(void) WCHAR out[64] = {0}; static const WCHAR TestAppW[] = {'T','e','s','t','A','p','p',0}; - static const WCHAR TestIniW[] = {'C',':','\\','t','e','s','t','.','i','n','i',0}; static const WCHAR AKeyW[] = {'A','K','e','y',0}; static const WCHAR AnotherKeyW[] = {'A','n','o','t','h','e','r','K','e','y',0}; static const WCHAR JunkKeyW[] = {'J','u','n','k','K','e','y',0}; + static const WCHAR testpathW[] = {'C',':','\\','t','e','s','t','.','i','n','i',0}; + WCHAR pathW[MAX_PATH]; if(!pSHGetIniStringW || is_win2k_and_lower){ win_skip("SHGetIniStringW is not available\n"); return; } - write_inifile(TestIniW); + lstrcpyW(pathW, testpathW); + + if (!write_inifile(pathW)) + return; if(0){ /* these crash on Windows */ pSHGetIniStringW(NULL, NULL, NULL, 0, NULL); - pSHGetIniStringW(NULL, AKeyW, out, sizeof(out), TestIniW); - pSHGetIniStringW(TestAppW, AKeyW, NULL, sizeof(out), TestIniW); + pSHGetIniStringW(NULL, AKeyW, out, sizeof(out), pathW); + pSHGetIniStringW(TestAppW, AKeyW, NULL, sizeof(out), pathW); } - ret = pSHGetIniStringW(TestAppW, AKeyW, out, 0, TestIniW); + ret = pSHGetIniStringW(TestAppW, AKeyW, out, 0, pathW); ok(ret == 0, "SHGetIniStringW should have given 0, instead: %d\n", ret); /* valid arguments */ - ret = pSHGetIniStringW(TestAppW, NULL, out, sizeof(out), TestIniW); - ok(broken(ret == 0) || /* win 98 */ - ret == 4, "SHGetIniStringW should have given 4, instead: %d\n", ret); - ok(!lstrcmpW(out, AKeyW), "Expected %s, got: %s\n", - wine_dbgstr_w(AKeyW), wine_dbgstr_w(out)); - - ret = pSHGetIniStringW(TestAppW, AKeyW, out, sizeof(out), TestIniW); - ok(broken(ret == 0) || /* win 98 */ - ret == 1, "SHGetIniStringW should have given 1, instead: %d\n", ret); - ok(broken(*out == 0) || /*win 98 */ - !strcmp_wa(out, "1"), "Expected L\"1\", got: %s\n", wine_dbgstr_w(out)); - - ret = pSHGetIniStringW(TestAppW, AnotherKeyW, out, sizeof(out), TestIniW); - ok(broken(ret == 0) || /* win 98 */ - ret == 4, "SHGetIniStringW should have given 4, instead: %d\n", ret); - ok(broken(*out == 0) || /* win 98 */ - !strcmp_wa(out, "asdf"), "Expected L\"asdf\", got: %s\n", wine_dbgstr_w(out)); - - ret = pSHGetIniStringW(TestAppW, JunkKeyW, out, sizeof(out), TestIniW); + out[0] = 0; + SetLastError(0xdeadbeef); + ret = pSHGetIniStringW(TestAppW, NULL, out, sizeof(out), pathW); + ok(ret == 4, "SHGetIniStringW should have given 4, instead: %d\n", ret); + ok(!lstrcmpW(out, AKeyW), "Expected %s, got: %s, %d\n", + wine_dbgstr_w(AKeyW), wine_dbgstr_w(out), GetLastError()); + + ret = pSHGetIniStringW(TestAppW, AKeyW, out, sizeof(out), pathW); + ok(ret == 1, "SHGetIniStringW should have given 1, instead: %d\n", ret); + ok(!strcmp_wa(out, "1"), "Expected L\"1\", got: %s\n", wine_dbgstr_w(out)); + + ret = pSHGetIniStringW(TestAppW, AnotherKeyW, out, sizeof(out), pathW); + ok(ret == 4, "SHGetIniStringW should have given 4, instead: %d\n", ret); + ok(!strcmp_wa(out, "asdf"), "Expected L\"asdf\", got: %s\n", wine_dbgstr_w(out)); + + out[0] = 1; + ret = pSHGetIniStringW(TestAppW, JunkKeyW, out, sizeof(out), pathW); ok(ret == 0, "SHGetIniStringW should have given 0, instead: %d\n", ret); ok(*out == 0, "Expected L\"\", got: %s\n", wine_dbgstr_w(out)); - DeleteFileW(TestIniW); + DeleteFileW(pathW); } static void test_SHSetIniString(void) @@ -2776,7 +2783,8 @@ static void test_SHSetIniString(void) return; } - write_inifile(TestIniW); + if (!write_inifile(TestIniW)) + return; ret = pSHSetIniStringW(TestAppW, AKeyW, AValueW, TestIniW); ok(ret == TRUE, "SHSetIniStringW should not have failed\n");

1 0

Damjan Jovanovic : winex11.drv: Store XDND cached data in global memory objects.
by Alexandre Julliard June 13, 2014

June 13, 2014

Module: wine Branch: master Commit: a58c220d9ba4ab496e4c33f5551c480caf172846 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a58c220d9ba4ab496e4c33f55… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue May 27 02:23:32 2014 +0200 winex11.drv: Store XDND cached data in global memory objects. --- dlls/winex11.drv/xdnd.c | 60 +++++++++++++++++++++++------------------------ 1 file changed, 29 insertions(+), 31 deletions(-) diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index db88fc2..4cd67de 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -38,6 +38,7 @@ #define COBJMACROS #include "x11drv.h" +#include "shellapi.h" #include "shlobj.h" /* DROPFILES */ #include "oleidl.h" #include "objidl.h" @@ -56,8 +57,7 @@ typedef struct tagXDNDDATA { int cf_win; Atom cf_xdnd; - void *data; - unsigned int size; + HANDLE contents; struct list entry; } XDNDDATA, *LPXDNDDATA; @@ -71,7 +71,7 @@ static HWND XDNDLastTargetWnd; /* might be an ancestor of XDNDLastTargetWnd */ static HWND XDNDLastDropTargetWnd; -static void X11DRV_XDND_InsertXDNDData(int property, int format, void* data, unsigned int len); +static void X11DRV_XDND_InsertXDNDData(int property, int format, HANDLE contents); static int X11DRV_XDND_DeconstructTextURIList(int property, void* data, int len); static void X11DRV_XDND_MapFormat(Display *display, Window xwin, unsigned int property, unsigned char *data, int len); static void X11DRV_XDND_ResolveProperty(Display *display, Window xwin, Time tm, @@ -516,7 +516,7 @@ static void X11DRV_XDND_ResolveProperty(Display *display, Window xwin, Time tm, if (current->cf_win != CF_HDROP && current->cf_win < CF_MAX) { list_remove(&current->entry); - HeapFree(GetProcessHeap(), 0, current->data); + GlobalFree(current->contents); HeapFree(GetProcessHeap(), 0, current); } } @@ -529,7 +529,7 @@ static void X11DRV_XDND_ResolveProperty(Display *display, Window xwin, Time tm, * * Cache available XDND property */ -static void X11DRV_XDND_InsertXDNDData(int property, int format, void* data, unsigned int len) +static void X11DRV_XDND_InsertXDNDData(int property, int format, HANDLE contents) { LPXDNDDATA current = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(XDNDDATA)); @@ -538,8 +538,7 @@ static void X11DRV_XDND_InsertXDNDData(int property, int format, void* data, uns EnterCriticalSection(&xdnd_cs); current->cf_xdnd = property; current->cf_win = format; - current->data = data; - current->size = len; + current->contents = contents; list_add_tail(&xdndData, &current->entry); LeaveCriticalSection(&xdnd_cs); } @@ -553,14 +552,20 @@ static void X11DRV_XDND_InsertXDNDData(int property, int format, void* data, uns */ static void X11DRV_XDND_MapFormat(Display *display, Window xwin, unsigned int property, unsigned char *data, int len) { - void* xdata; + HANDLE xdata; TRACE("%d: %s\n", property, data); /* Always include the raw type */ - xdata = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); - memcpy(xdata, data, len); - X11DRV_XDND_InsertXDNDData(property, property, xdata, len); + xdata = GlobalAlloc(GMEM_FIXED, len); + if (xdata) + { + memcpy(GlobalLock(xdata), data, len); + GlobalUnlock(xdata); + X11DRV_XDND_InsertXDNDData(property, property, xdata); + } + else + ERR("out of memory\n"); if (property == x11drv_atom(text_uri_list)) X11DRV_XDND_DeconstructTextURIList(property, data, len); @@ -571,18 +576,7 @@ static void X11DRV_XDND_MapFormat(Display *display, Window xwin, unsigned int pr UINT windowsFormat; contents = X11DRV_CLIPBOARD_ImportSelection(display, property, xwin, x11drv_atom(XdndTarget), &windowsFormat); if (contents) - { - void *data = HeapAlloc(GetProcessHeap(), 0, GlobalSize(contents)); - if (data) - { - memcpy(data, GlobalLock(contents), GlobalSize(contents)); - GlobalUnlock(contents); - X11DRV_XDND_InsertXDNDData(property, windowsFormat, data, GlobalSize(contents)); - } - else - ERR("out of memory\n"); - GlobalFree(contents); - } + X11DRV_XDND_InsertXDNDData(property, windowsFormat, contents); } } @@ -651,10 +645,12 @@ static int X11DRV_XDND_DeconstructTextURIList(int property, void* data, int len) } if (out && end >= len) { + HDROP hDrop; DROPFILES *dropFiles; - dropFiles = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DROPFILES) + (size + 1)*sizeof(WCHAR)); - if (dropFiles) + hDrop = GlobalAlloc(GMEM_FIXED | GMEM_ZEROINIT, sizeof(DROPFILES) + (size + 1)*sizeof(WCHAR)); + if (hDrop) { + dropFiles = GlobalLock(hDrop); dropFiles->pFiles = sizeof(DROPFILES); dropFiles->pt.x = XDNDxy.x; dropFiles->pt.y = XDNDxy.y; @@ -662,7 +658,8 @@ static int X11DRV_XDND_DeconstructTextURIList(int property, void* data, int len) dropFiles->fWide = TRUE; out[size] = '\0'; memcpy(((char*)dropFiles) + dropFiles->pFiles, out, (size + 1)*sizeof(WCHAR)); - X11DRV_XDND_InsertXDNDData(property, CF_HDROP, dropFiles, sizeof(DROPFILES) + (size + 1)*sizeof(WCHAR)); + GlobalUnlock(hDrop); + X11DRV_XDND_InsertXDNDData(property, CF_HDROP, hDrop); count = 1; } } @@ -693,14 +690,14 @@ static void X11DRV_XDND_SendDropFiles(HWND hwnd) if (found) { - HGLOBAL dropHandle = GlobalAlloc(GMEM_FIXED, current->size); + HGLOBAL dropHandle = GlobalAlloc(GMEM_FIXED, GlobalSize(current->contents)); if (dropHandle) { DROPFILES *lpDrop = GlobalLock(dropHandle); lpDrop->pt.x = XDNDxy.x; lpDrop->pt.y = XDNDxy.y; - memcpy(lpDrop, current->data, current->size); + memcpy(lpDrop, GlobalLock(current->contents), GlobalSize(current->contents)); TRACE("Sending WM_DROPFILES: hWnd(0x%p) %p(%s)\n", hwnd, ((char*)lpDrop) + lpDrop->pFiles, debugstr_w((WCHAR*)(((char*)lpDrop) + lpDrop->pFiles))); GlobalUnlock(dropHandle); @@ -730,7 +727,7 @@ static void X11DRV_XDND_FreeDragDropOp(void) LIST_FOR_EACH_ENTRY_SAFE(current, next, &xdndData, XDNDDATA, entry) { list_remove(&current->entry); - HeapFree(GetProcessHeap(), 0, current->data); + GlobalFree(current->contents); HeapFree(GetProcessHeap(), 0, current); } @@ -917,11 +914,12 @@ static HRESULT WINAPI XDNDDATAOBJECT_GetData(IDataObject *dataObject, if (current->cf_win == formatEtc->cfFormat) { pMedium->tymed = TYMED_HGLOBAL; - pMedium->u.hGlobal = GlobalAlloc(GMEM_FIXED | GMEM_ZEROINIT, current->size); + pMedium->u.hGlobal = GlobalAlloc(GMEM_FIXED | GMEM_ZEROINIT, GlobalSize(current->contents)); if (pMedium->u.hGlobal == NULL) return E_OUTOFMEMORY; - memcpy(GlobalLock(pMedium->u.hGlobal), current->data, current->size); + memcpy(GlobalLock(pMedium->u.hGlobal), GlobalLock(current->contents), GlobalSize(current->contents)); GlobalUnlock(pMedium->u.hGlobal); + GlobalUnlock(current->contents); pMedium->pUnkForRelease = 0; return S_OK; }

1 0

Damjan Jovanovic : winex11.drv: Import text/ plain XDND selections through the clipboard.
by Alexandre Julliard June 13, 2014

June 13, 2014

Module: wine Branch: master Commit: c2f73b97802dc9e1f84220c271038b97415bad5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2f73b97802dc9e1f84220c27… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue May 27 02:23:27 2014 +0200 winex11.drv: Import text/plain XDND selections through the clipboard. --- dlls/winex11.drv/clipboard.c | 1 + dlls/winex11.drv/xdnd.c | 57 ------------------------------------------ 2 files changed, 1 insertion(+), 57 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 350eeab..dfd09e9 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -186,6 +186,7 @@ static const struct } builtin_formats[] = { { CF_TEXT, XA_STRING, X11DRV_CLIPBOARD_ImportXAString, X11DRV_CLIPBOARD_ExportString}, + { CF_TEXT, XATOM_text_plain, X11DRV_CLIPBOARD_ImportXAString, X11DRV_CLIPBOARD_ExportString}, { CF_BITMAP, XATOM_WCF_BITMAP, X11DRV_CLIPBOARD_ImportClipboardData, NULL}, { CF_METAFILEPICT, XATOM_WCF_METAFILEPICT, X11DRV_CLIPBOARD_ImportMetaFilePict, X11DRV_CLIPBOARD_ExportMetaFilePict }, { CF_SYLK, XATOM_WCF_SYLK, X11DRV_CLIPBOARD_ImportClipboardData, X11DRV_CLIPBOARD_ExportClipboardData }, diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index 2184a42..db88fc2 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -73,13 +73,11 @@ static HWND XDNDLastDropTargetWnd; static void X11DRV_XDND_InsertXDNDData(int property, int format, void* data, unsigned int len); static int X11DRV_XDND_DeconstructTextURIList(int property, void* data, int len); -static int X11DRV_XDND_DeconstructTextPlain(int property, void* data, int len); static void X11DRV_XDND_MapFormat(Display *display, Window xwin, unsigned int property, unsigned char *data, int len); static void X11DRV_XDND_ResolveProperty(Display *display, Window xwin, Time tm, Atom *types, unsigned long count); static void X11DRV_XDND_SendDropFiles(HWND hwnd); static void X11DRV_XDND_FreeDragDropOp(void); -static unsigned int X11DRV_XDND_UnixToDos(char** lpdest, char* lpsrc, int len); static WCHAR* X11DRV_XDND_URIToDOS(char *encodedURI); static CRITICAL_SECTION xdnd_cs; @@ -566,8 +564,6 @@ static void X11DRV_XDND_MapFormat(Display *display, Window xwin, unsigned int pr if (property == x11drv_atom(text_uri_list)) X11DRV_XDND_DeconstructTextURIList(property, data, len); - else if (property == x11drv_atom(text_plain)) - X11DRV_XDND_DeconstructTextPlain(property, data, len); else { /* use the clipboard import functions for other types */ @@ -676,25 +672,6 @@ static int X11DRV_XDND_DeconstructTextURIList(int property, void* data, int len) /************************************************************************** - * X11DRV_XDND_DeconstructTextPlain - * - * Interpret text/plain Data and add records to <dndfmt> linked list - */ -static int X11DRV_XDND_DeconstructTextPlain(int property, void* data, int len) -{ - char* dostext; - - /* Always supply plain text */ - X11DRV_XDND_UnixToDos(&dostext, data, len); - X11DRV_XDND_InsertXDNDData(property, CF_TEXT, dostext, strlen(dostext)); - - TRACE("CF_TEXT (%d): %s\n", CF_TEXT, dostext); - - return 1; -} - - -/************************************************************************** * X11DRV_XDND_SendDropFiles */ static void X11DRV_XDND_SendDropFiles(HWND hwnd) @@ -766,40 +743,6 @@ static void X11DRV_XDND_FreeDragDropOp(void) } - -/************************************************************************** - * X11DRV_XDND_UnixToDos - */ -static unsigned int X11DRV_XDND_UnixToDos(char** lpdest, char* lpsrc, int len) -{ - int i; - unsigned int destlen, lines; - - for (i = 0, lines = 0; i <= len; i++) - { - if (lpsrc[i] == '\n') - lines++; - } - - destlen = len + lines + 1; - - if (lpdest) - { - char* lpstr = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, destlen); - for (i = 0, lines = 0; i <= len; i++) - { - if (lpsrc[i] == '\n') - lpstr[++lines + i] = '\r'; - lpstr[lines + i] = lpsrc[i]; - } - - *lpdest = lpstr; - } - - return lines; -} - - /************************************************************************** * X11DRV_XDND_URIToDOS */

1 0

Michael Stefaniuc : dmusic: Get rid of the extra pointer to a DMUS_OBJECTDESC.
by Alexandre Julliard June 13, 2014

June 13, 2014

Module: wine Branch: master Commit: 147f100f3ea88851777ac78ef74b397490fceb4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=147f100f3ea88851777ac78ef… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 12 11:14:58 2014 +0200 dmusic: Get rid of the extra pointer to a DMUS_OBJECTDESC. --- dlls/dmusic/collection.c | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index c7084db..f3bb510 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -35,7 +35,6 @@ typedef struct IDirectMusicCollectionImpl { IStream *pStm; /* stream from which we load collection and later instruments */ LARGE_INTEGER liCollectionPosition; /* offset in a stream where collection was loaded from */ LARGE_INTEGER liWavePoolTablePosition; /* offset in a stream where wave pool table can be found */ - DMUS_OBJECTDESC *pDesc; CHAR *szCopyright; /* FIXME: should probably placed somewhere else */ DLSHEADER *pHeader; /* pool table */ @@ -440,14 +439,14 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IPersistStream_Load(LPPERSISTST } case FOURCC_DLID: { TRACE_(dmfile)(": DLID (GUID) chunk\n"); - This->pDesc->dwValidData |= DMUS_OBJ_OBJECT; - IStream_Read(stream, &This->pDesc->guidObject, chunk.dwSize, NULL); + This->dmobj.desc.dwValidData |= DMUS_OBJ_OBJECT; + IStream_Read(stream, &This->dmobj.desc.guidObject, chunk.dwSize, NULL); break; } case FOURCC_VERS: { TRACE_(dmfile)(": version chunk\n"); - This->pDesc->dwValidData |= DMUS_OBJ_VERSION; - IStream_Read(stream, &This->pDesc->vVersion, chunk.dwSize, NULL); + This->dmobj.desc.dwValidData |= DMUS_OBJ_VERSION; + IStream_Read(stream, &This->dmobj.desc.vVersion, chunk.dwSize, NULL); break; } case FOURCC_PTBL: { @@ -475,9 +474,9 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IPersistStream_Load(LPPERSISTST case mmioFOURCC('I','N','A','M'): { CHAR szName[DMUS_MAX_NAME]; TRACE_(dmfile)(": name chunk\n"); - This->pDesc->dwValidData |= DMUS_OBJ_NAME; + This->dmobj.desc.dwValidData |= DMUS_OBJ_NAME; IStream_Read(stream, szName, chunk.dwSize, NULL); - MultiByteToWideChar(CP_ACP, 0, szName, -1, This->pDesc->wszName, DMUS_MAX_NAME); + MultiByteToWideChar(CP_ACP, 0, szName, -1, This->dmobj.desc.wszName, DMUS_MAX_NAME); if (even_or_odd(chunk.dwSize)) { ListCount[0]++; liMove.QuadPart = 1; @@ -671,13 +670,13 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IPersistStream_Load(LPPERSISTST struct list *listEntry; TRACE("*** IDirectMusicCollection (%p) ***\n", &This->IDirectMusicCollection_iface); - if (This->pDesc->dwValidData & DMUS_OBJ_OBJECT) - TRACE(" - GUID = %s\n", debugstr_dmguid(&This->pDesc->guidObject)); - if (This->pDesc->dwValidData & DMUS_OBJ_VERSION) - TRACE(" - Version = %i,%i,%i,%i\n", (This->pDesc->vVersion.dwVersionMS >> 8) & 0x0000FFFF, This->pDesc->vVersion.dwVersionMS & 0x0000FFFF, - (This->pDesc->vVersion.dwVersionLS >> 8) & 0x0000FFFF, This->pDesc->vVersion.dwVersionLS & 0x0000FFFF); - if (This->pDesc->dwValidData & DMUS_OBJ_NAME) - TRACE(" - Name = %s\n", debugstr_w(This->pDesc->wszName)); + if (This->dmobj.desc.dwValidData & DMUS_OBJ_OBJECT) + TRACE(" - GUID = %s\n", debugstr_dmguid(&This->dmobj.desc.guidObject)); + if (This->dmobj.desc.dwValidData & DMUS_OBJ_VERSION) + TRACE(" - Version = %i,%i,%i,%i\n", (This->dmobj.desc.vVersion.dwVersionMS >> 8) & 0x0000FFFF, This->dmobj.desc.vVersion.dwVersionMS & 0x0000FFFF, + (This->dmobj.desc.vVersion.dwVersionLS >> 8) & 0x0000FFFF, This->dmobj.desc.vVersion.dwVersionLS & 0x0000FFFF); + if (This->dmobj.desc.dwValidData & DMUS_OBJ_NAME) + TRACE(" - Name = %s\n", debugstr_w(This->dmobj.desc.wszName)); TRACE(" - Collection header:\n"); TRACE(" - cInstruments: %d\n", This->pHeader->cInstruments); @@ -724,7 +723,6 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicCollectionImpl(LPCGUID lpcGUID, LPVOID* p (IUnknown*)&obj->IDirectMusicCollection_iface); obj->dmobj.IDirectMusicObject_iface.lpVtbl = &dmobject_vtbl; obj->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl; - obj->pDesc = &obj->dmobj.desc; list_init (&obj->Instruments);

1 0

Vincent Povirk : notepad: Check IsDialogMessage before TranslateAccelerator.
by Alexandre Julliard June 13, 2014

June 13, 2014

Module: wine Branch: master Commit: 8e873c8afcc23ad012177fc8c9eeda72ce648f76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e873c8afcc23ad012177fc8c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed May 21 11:18:03 2014 -0500 notepad: Check IsDialogMessage before TranslateAccelerator. --- programs/notepad/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/notepad/main.c b/programs/notepad/main.c index 5c465ca..8b654da 100644 --- a/programs/notepad/main.c +++ b/programs/notepad/main.c @@ -790,7 +790,7 @@ int PASCAL WinMain(HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show) while (GetMessageW(&msg, 0, 0, 0)) { - if (!TranslateAcceleratorW(Globals.hMainWnd, hAccel, &msg) && !IsDialogMessageW(Globals.hFindReplaceDlg, &msg)) + if (!IsDialogMessageW(Globals.hFindReplaceDlg, &msg) && !TranslateAcceleratorW(Globals.hMainWnd, hAccel, &msg)) { TranslateMessage(&msg); DispatchMessageW(&msg);

1 0

Andrew Eikum : ole32: Fix return value logging.
by Alexandre Julliard June 13, 2014

June 13, 2014

Module: wine Branch: master Commit: f02c0ae6567bb28a6afd8967d97aa9455f737e99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f02c0ae6567bb28a6afd8967d… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Jun 13 09:07:39 2014 -0500 ole32: Fix return value logging. --- dlls/ole32/stg_stream.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ole32/stg_stream.c b/dlls/ole32/stg_stream.c index b60b17b..7738cf1 100644 --- a/dlls/ole32/stg_stream.c +++ b/dlls/ole32/stg_stream.c @@ -252,7 +252,7 @@ static HRESULT WINAPI StgStreamImpl_Write( if (SUCCEEDED(res)) res = StorageBaseImpl_Flush(This->parentStorage); - TRACE("<-- S_OK, written %u\n", *pcbWritten); + TRACE("<-- %08x, written %u\n", res, *pcbWritten); return res; }

1 0

Nikolay Sivov : quartz/tests: Unregister filters only when registered successfully.
by Alexandre Julliard June 13, 2014

June 13, 2014

Module: wine Branch: master Commit: c6de8ad981fed73c3bbcab34df50358d900ee4fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6de8ad981fed73c3bbcab34d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 13 10:19:35 2014 +0400 quartz/tests: Unregister filters only when registered successfully. --- dlls/quartz/tests/filtergraph.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 6938e67..713df7b 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -1847,17 +1847,17 @@ static void test_render_filter_priority(void) get_connected_filter_name(ptestfilter, ConnectedFilterName1); ok(!strcmp(ConnectedFilterName1, "TestfilterInstance3"), "unexpected connected filter: %s\n", ConnectedFilterName1); - } - hr = IFilterMapper2_UnregisterFilter(pMapper2, &CLSID_LegacyAmFilterCategory, NULL, - &CLSID_TestFilter2); - ok(SUCCEEDED(hr), "IFilterMapper2_UnregisterFilter failed with %x\n", hr); - hr = IFilterMapper2_UnregisterFilter(pMapper2, &CLSID_LegacyAmFilterCategory, NULL, - &CLSID_TestFilter3); - ok(SUCCEEDED(hr), "IFilterMapper2_UnregisterFilter failed with %x\n", hr); - hr = IFilterMapper2_UnregisterFilter(pMapper2, &CLSID_LegacyAmFilterCategory, NULL, - &CLSID_TestFilter4); - ok(SUCCEEDED(hr), "IFilterMapper2_UnregisterFilter failed with %x\n", hr); + hr = IFilterMapper2_UnregisterFilter(pMapper2, &CLSID_LegacyAmFilterCategory, NULL, + &CLSID_TestFilter2); + ok(hr == S_OK, "IFilterMapper2_UnregisterFilter failed with %x\n", hr); + hr = IFilterMapper2_UnregisterFilter(pMapper2, &CLSID_LegacyAmFilterCategory, NULL, + &CLSID_TestFilter3); + ok(hr == S_OK, "IFilterMapper2_UnregisterFilter failed with %x\n", hr); + hr = IFilterMapper2_UnregisterFilter(pMapper2, &CLSID_LegacyAmFilterCategory, NULL, + &CLSID_TestFilter4); + ok(hr == S_OK, "IFilterMapper2_UnregisterFilter failed with %x\n", hr); + } out:

1 0

Henri Verbeet : wined3d: Add format information for WINED3DFMT_R8_UNORM.
by Alexandre Julliard June 13, 2014

June 13, 2014

Module: wine Branch: master Commit: fa312a32b268c6c3199867d7a5911e3d706e70eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa312a32b268c6c3199867d7a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 13 10:01:19 2014 +0200 wined3d: Add format information for WINED3DFMT_R8_UNORM. --- dlls/wined3d/glsl_shader.c | 3 ++- dlls/wined3d/utils.c | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e5eb685..515e815 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -6567,7 +6567,8 @@ static void shader_glsl_get_caps(const struct wined3d_gl_info *gl_info, struct s if (gl_info->supported[EXT_GPU_SHADER4] && gl_info->supported[ARB_SHADER_BIT_ENCODING] && gl_info->supported[ARB_GEOMETRY_SHADER4] && gl_info->glsl_version >= MAKEDWORD_VERSION(1, 50) - && gl_info->supported[ARB_DRAW_ELEMENTS_BASE_VERTEX] && gl_info->supported[ARB_DRAW_INSTANCED]) + && gl_info->supported[ARB_DRAW_ELEMENTS_BASE_VERTEX] && gl_info->supported[ARB_DRAW_INSTANCED] + && gl_info->supported[ARB_TEXTURE_RG]) shader_model = 4; /* ARB_shader_texture_lod or EXT_gpu_shader4 is required for the SM3 * texldd and texldl instructions. */ diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 6a27920..afc77fc 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -85,6 +85,7 @@ static const struct wined3d_format_channels formats[] = {WINED3DFMT_B5G5R5A1_UNORM, 5, 5, 5, 1, 10, 5, 0, 15, 2, 0, 0}, {WINED3DFMT_B4G4R4A4_UNORM, 4, 4, 4, 4, 8, 4, 0, 12, 2, 0, 0}, {WINED3DFMT_B2G3R3_UNORM, 3, 3, 2, 0, 5, 2, 0, 0, 1, 0, 0}, + {WINED3DFMT_R8_UNORM, 8, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, {WINED3DFMT_A8_UNORM, 0, 0, 0, 8, 0, 0, 0, 0, 1, 0, 0}, {WINED3DFMT_B2G3R3A8_UNORM, 3, 3, 2, 8, 5, 2, 0, 8, 2, 0, 0}, {WINED3DFMT_B4G4R4X4_UNORM, 4, 4, 4, 0, 8, 4, 0, 0, 2, 0, 0}, @@ -782,6 +783,11 @@ static const struct wined3d_format_texture_info format_texture_info[] = GL_RGB, GL_UNSIGNED_BYTE_3_3_2, 0, WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, WINED3D_GL_EXT_NONE, NULL}, + {WINED3DFMT_R8_UNORM, GL_R8, GL_R8, 0, + GL_RED, GL_UNSIGNED_BYTE, 0, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING + | WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_VTF, + ARB_TEXTURE_RG, NULL}, {WINED3DFMT_A8_UNORM, GL_ALPHA8, GL_ALPHA8, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, @@ -3056,6 +3062,7 @@ DWORD wined3d_format_convert_from_float(const struct wined3d_surface *surface, c {WINED3DFMT_B5G6R5_UNORM, 31.0f, 63.0f, 31.0f, 0.0f, 11, 5, 0, 0}, {WINED3DFMT_B5G5R5A1_UNORM, 31.0f, 31.0f, 31.0f, 1.0f, 10, 5, 0, 15}, {WINED3DFMT_B5G5R5X1_UNORM, 31.0f, 31.0f, 31.0f, 1.0f, 10, 5, 0, 15}, + {WINED3DFMT_R8_UNORM, 255.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0}, {WINED3DFMT_A8_UNORM, 0.0f, 0.0f, 0.0f, 255.0f, 0, 0, 0, 0}, {WINED3DFMT_B4G4R4A4_UNORM, 15.0f, 15.0f, 15.0f, 15.0f, 8, 4, 0, 12}, {WINED3DFMT_B4G4R4X4_UNORM, 15.0f, 15.0f, 15.0f, 15.0f, 8, 4, 0, 12},

1 0

Henri Verbeet : ddraw: Don' t try to create surfaces for wined3d internal textures.
by Alexandre Julliard June 13, 2014

June 13, 2014

Module: wine Branch: master Commit: d30720d825fc594559104c12f27858f89a8673ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=d30720d825fc594559104c12f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 13 10:01:18 2014 +0200 ddraw: Don't try to create surfaces for wined3d internal textures. --- dlls/ddraw/ddraw.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index aa74a1e..062fe02 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4733,8 +4733,8 @@ static HRESULT CDECL device_parent_surface_created(struct wined3d_device_parent TRACE("device_parent %p, container_parent %p, surface %p, parent %p, parent_ops %p.\n", device_parent, container_parent, surface, parent, parent_ops); - /* We have a swapchain texture. */ - if (container_parent == ddraw) + /* We have a swapchain or wined3d internal texture. */ + if (!container_parent || container_parent == ddraw) { *parent = NULL; *parent_ops = &ddraw_null_wined3d_parent_ops;

1 0

Michael Stefaniuc : dmusic: Move the common parts of DMObject to a generic implementation.
by Alexandre Julliard June 13, 2014

June 13, 2014

Module: wine Branch: master Commit: 02ed47fa3c69b399dc6360379ffe93390358f447 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02ed47fa3c69b399dc6360379… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 12 11:10:24 2014 +0200 dmusic: Move the common parts of DMObject to a generic implementation. --- dlls/dmusic/Makefile.in | 1 + dlls/dmusic/collection.c | 151 +++++++----------------------------------- dlls/dmusic/dmobject.c | 144 ++++++++++++++++++++++++++++++++++++++++ dlls/dmusic/dmobject.h | 44 ++++++++++++ dlls/dmusic/dmusic_private.h | 7 -- 5 files changed, 214 insertions(+), 133 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=02ed47fa3c69b399dc636…

1 0

Alexandre Julliard : gdi32/tests: Remove some noisy traces.
by Alexandre Julliard June 13, 2014

June 13, 2014

Module: wine Branch: master Commit: 7d21dd26c83c1a1a869fb29955e2c1d805e2ca9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d21dd26c83c1a1a869fb2995… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 13 10:12:28 2014 +0200 gdi32/tests: Remove some noisy traces. --- dlls/gdi32/tests/font.c | 47 ++++++++++++----------------------------------- 1 file changed, 12 insertions(+), 35 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index dd63297..245fd56 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -960,7 +960,6 @@ static void test_bitmap_font_metrics(void) if(!TranslateCharsetInfo( fs, &csi, TCI_SRCFONTSIG )) continue; lf.lfCharSet = csi.ciCharset; - trace("looking for %s height %d charset %d\n", lf.lfFaceName, lf.lfHeight, lf.lfCharSet); ret = EnumFontFamiliesExA(hdc, &lf, find_font_proc, (LPARAM)&lf, 0); if (fd[i].height & FH_SCALE) ok(ret, "scaled font height %d should not be enumerated\n", height); @@ -988,7 +987,6 @@ static void test_bitmap_font_metrics(void) { ok(ret != ANSI_CHARSET, "font charset should not be ANSI_CHARSET\n"); ok(ret != expected_cs, "font charset %d should not be %d\n", ret, expected_cs); - trace("Skipping replacement %s height %d charset %d\n", face_name, tm.tmHeight, tm.tmCharSet); SelectObject(hdc, old_hfont); DeleteObject(hfont); continue; @@ -1843,7 +1841,6 @@ static void test_height( HDC hdc, const struct font_data *fd ) ok(ret, "GetTextMetrics error %d\n", GetLastError()); if(fd[i].dpi == tm.tmDigitizedAspectX) { - trace("found font %s, height %d charset %x dpi %d\n", lf.lfFaceName, lf.lfHeight, lf.lfCharSet, fd[i].dpi); ok(tm.tmWeight == fd[i].weight, "%s(%d): tm.tmWeight %d != %d\n", fd[i].face_name, fd[i].requested_height, tm.tmWeight, fd[i].weight); ok(match_off_by_1(tm.tmHeight, fd[i].height, fd[i].exact), "%s(%d): tm.tmHeight %d != %d\n", fd[i].face_name, fd[i].requested_height, tm.tmHeight, fd[i].height); ok(match_off_by_1(tm.tmAscent, fd[i].ascent, fd[i].exact), "%s(%d): tm.tmAscent %d != %d\n", fd[i].face_name, fd[i].requested_height, tm.tmAscent, fd[i].ascent); @@ -2215,8 +2212,6 @@ static void testJustification(HDC hdc, PCSTR str, RECT *clientArea) } } - trace( "%u %.*s\n", size.cx, (int)(pLastChar - pFirstChar), pFirstChar); - y += size.cy; str = pLastChar; } while (*str && y < clientArea->bottom); @@ -4879,8 +4874,6 @@ static void test_fullname2_helper(const char *Family) FaceName = (char *)efnd.elf[i].elfFullName; StyleName = (char *)efnd.elf[i].elfStyle; - trace("Checking font %s:\nFamilyName: %s; FaceName: %s; StyleName: %s\n", Family, FamilyName, FaceName, StyleName); - get_vertical = ( FamilyName[0] == '@' ); ok(get_vertical == want_vertical, "Vertical flags don't match: %s %s\n", Family, FamilyName); @@ -4906,12 +4899,8 @@ static void test_fullname2_helper(const char *Family) bufW[0] = 0; bufA[0] = 0; ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FONT_FAMILY, bufW, buf_size, GetSystemDefaultLangID()); - if (!ret) - { - trace("no localized FONT_FAMILY found.\n"); - ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FONT_FAMILY, bufW, buf_size, TT_MS_LANGID_ENGLISH_UNITED_STATES); - } - ok(ret, "FAMILY (family name) could not be read\n"); + if (!ret) ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FONT_FAMILY, bufW, buf_size, TT_MS_LANGID_ENGLISH_UNITED_STATES); + ok(ret, "%s: FAMILY (family name) could not be read\n", FamilyName); if (want_vertical) bufW = prepend_at(bufW); WideCharToMultiByte(CP_ACP, 0, bufW, -1, bufA, buf_size, NULL, FALSE); ok(!lstrcmpA(FamilyName, bufA), "font family names don't match: returned %s, expect %s\n", FamilyName, bufA); @@ -4921,44 +4910,32 @@ static void test_fullname2_helper(const char *Family) bufW[0] = 0; bufA[0] = 0; ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FULL_NAME, bufW, buf_size, GetSystemDefaultLangID()); - if (!ret) - { - trace("no localized FULL_NAME found.\n"); - ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FULL_NAME, bufW, buf_size, TT_MS_LANGID_ENGLISH_UNITED_STATES); - } + if (!ret) ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FULL_NAME, bufW, buf_size, TT_MS_LANGID_ENGLISH_UNITED_STATES); ok(ret, "FULL_NAME (face name) could not be read\n"); if (want_vertical) bufW = prepend_at(bufW); WideCharToMultiByte(CP_ACP, 0, bufW, -1, bufA, buf_size, NULL, FALSE); - ok(!lstrcmpA(FaceName, bufA), "font face names don't match: returned %s, expect %s\n", FaceName, bufA); + ok(!lstrcmpA(FaceName, bufA), "%s: font face names don't match: returned %s, expect %s\n", FamilyName, FaceName, bufA); otmStr = (LPSTR)otm + (UINT_PTR)otm->otmpFaceName; - ok(!lstrcmpA(FaceName, otmStr), "FaceName %s doesn't match otmpFaceName %s\n", FaceName, otmStr); + ok(!lstrcmpA(FaceName, otmStr), "%s: FaceName %s doesn't match otmpFaceName %s\n", FamilyName, FaceName, otmStr); bufW[0] = 0; bufA[0] = 0; ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FONT_SUBFAMILY, bufW, buf_size, GetSystemDefaultLangID()); - if (!ret) - { - trace("no localized FONT_SUBFAMILY found.\n"); - ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FONT_SUBFAMILY, bufW, buf_size, TT_MS_LANGID_ENGLISH_UNITED_STATES); - } - ok(ret, "SUBFAMILY (style name) could not be read\n"); + if (!ret) ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FONT_SUBFAMILY, bufW, buf_size, TT_MS_LANGID_ENGLISH_UNITED_STATES); + ok(ret, "%s: SUBFAMILY (style name) could not be read\n", FamilyName); WideCharToMultiByte(CP_ACP, 0, bufW, -1, bufA, buf_size, NULL, FALSE); - ok(!lstrcmpA(StyleName, bufA), "style names don't match: returned %s, expect %s\n", StyleName, bufA); + ok(!lstrcmpA(StyleName, bufA), "%s: style names don't match: returned %s, expect %s\n", FamilyName, StyleName, bufA); otmStr = (LPSTR)otm + (UINT_PTR)otm->otmpStyleName; - ok(!lstrcmpA(StyleName, otmStr), "StyleName %s doesn't match otmpStyleName %s\n", StyleName, otmStr); + ok(!lstrcmpA(StyleName, otmStr), "%s: StyleName %s doesn't match otmpStyleName %s\n", FamilyName, StyleName, otmStr); bufW[0] = 0; bufA[0] = 0; ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_UNIQUE_ID, bufW, buf_size, GetSystemDefaultLangID()); - if (!ret) - { - trace("no localized UNIQUE_ID found.\n"); - ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_UNIQUE_ID, bufW, buf_size, TT_MS_LANGID_ENGLISH_UNITED_STATES); - } - ok(ret, "UNIQUE_ID (full name) could not be read\n"); + if (!ret) ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_UNIQUE_ID, bufW, buf_size, TT_MS_LANGID_ENGLISH_UNITED_STATES); + ok(ret, "%s: UNIQUE_ID (full name) could not be read\n", FamilyName); WideCharToMultiByte(CP_ACP, 0, bufW, -1, bufA, buf_size, NULL, FALSE); otmStr = (LPSTR)otm + (UINT_PTR)otm->otmpFullName; - ok(!lstrcmpA(otmStr, bufA), "UNIQUE ID (full name) doesn't match: returned %s, expect %s\n", otmStr, bufA); + ok(!lstrcmpA(otmStr, bufA), "%s: UNIQUE ID (full name) doesn't match: returned %s, expect %s\n", FamilyName, otmStr, bufA); SelectObject(hdc, of); DeleteObject(hfont);

1 0

Henri Verbeet : user32: Ensure at least one character is used in TEXT_WordBreak().
by Alexandre Julliard June 13, 2014

June 13, 2014

Module: wine Branch: master Commit: f25317a6086700ec5c895cab9a1c791a17d8ff01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f25317a6086700ec5c895cab9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 13 10:01:22 2014 +0200 user32: Ensure at least one character is used in TEXT_WordBreak(). --- dlls/user32/tests/text.c | 8 ++++++++ dlls/user32/text.c | 5 +++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/text.c b/dlls/user32/tests/text.c index 19bcd72..06705a7 100644 --- a/dlls/user32/tests/text.c +++ b/dlls/user32/tests/text.c @@ -564,6 +564,10 @@ static void test_DrawTextCalcRect(void) textheight = DrawTextA(hdc, wordbreak_text, -1, &rect, DT_CALCRECT | DT_WORDBREAK); ok(textheight == heightcheck * 2, "Got unexpected textheight %d, expected %d.\n", textheight, heightcheck * 2); + SetRect(&rect, 0, 0, 1, 1); + textheight = DrawTextA(hdc, wordbreak_text, -1, &rect, DT_CALCRECT | DT_WORDBREAK | DT_EDITCONTROL); + ok(textheight >= heightcheck * 6, "Got unexpected textheight %d, expected at least %d.\n", + textheight, heightcheck * 6); SetRect(&rect, 0, 0, 1, 1); heightcheck = DrawTextW(hdc, wordbreak_textW, -1, &rect, DT_CALCRECT); @@ -571,6 +575,10 @@ static void test_DrawTextCalcRect(void) textheight = DrawTextW(hdc, wordbreak_textW, -1, &rect, DT_CALCRECT | DT_WORDBREAK); ok(textheight == heightcheck * 2, "Got unexpected textheight %d, expected %d.\n", textheight, heightcheck * 2); + SetRect(&rect, 0, 0, 1, 1); + textheight = DrawTextW(hdc, wordbreak_textW, -1, &rect, DT_CALCRECT | DT_WORDBREAK | DT_EDITCONTROL); + ok(textheight >= heightcheck * 6, "Got unexpected textheight %d, expected at least %d.\n", + textheight, heightcheck * 6); SelectObject(hdc, hOldFont); ret = DeleteObject(hFont); diff --git a/dlls/user32/text.c b/dlls/user32/text.c index fdc3554..66a35d2 100644 --- a/dlls/user32/text.c +++ b/dlls/user32/text.c @@ -413,8 +413,9 @@ static void TEXT_WordBreak (HDC hdc, WCHAR *str, unsigned int max_str, DT_EDITCONTROL) { /* break the word after the last character that fits (there must be - * at least one; none is caught earlier). - */ + * at least one). */ + if (!chars_fit) + ++chars_fit; *len_str = chars_fit; *chars_used = chars_fit;

1 0

Henri Verbeet : d3d10core: Implement d3d10_device_GetDeviceRemovedReason() .
by Alexandre Julliard June 13, 2014

June 13, 2014

Module: wine Branch: master Commit: 8d23f13b1655c34f1f4e524f69d251611202269a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d23f13b1655c34f1f4e524f6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 13 10:01:21 2014 +0200 d3d10core: Implement d3d10_device_GetDeviceRemovedReason(). --- dlls/d3d10core/device.c | 7 +++++-- dlls/d3d10core/tests/device.c | 22 ++++++++++++++++++++++ 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 1aa5e8b..722b5aa 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -1007,9 +1007,12 @@ static void STDMETHODCALLTYPE d3d10_device_RSGetScissorRects(ID3D10Device1 *ifac static HRESULT STDMETHODCALLTYPE d3d10_device_GetDeviceRemovedReason(ID3D10Device1 *iface) { - FIXME("iface %p stub!\n", iface); + TRACE("iface %p.\n", iface); - return E_NOTIMPL; + /* In the current implementation the device is never removed, so we can + * just return S_OK here. */ + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_device_SetExceptionMode(ID3D10Device1 *iface, UINT flags) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 8fb62a0..d761dae 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -880,6 +880,27 @@ static void test_create_predicate(void) ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_device_removed_reason(void) +{ + ID3D10Device *device; + ULONG refcount; + HRESULT hr; + + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + + hr = ID3D10Device_GetDeviceRemovedReason(device); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3D10Device_GetDeviceRemovedReason(device); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + START_TEST(device) { test_create_texture2d(); @@ -893,4 +914,5 @@ START_TEST(device) test_create_depthstencil_state(); test_create_rasterizer_state(); test_create_predicate(); + test_device_removed_reason(); }

1 0

Henri Verbeet : d3d10_1: Forward D3D10CreateEffectFromMemory to d3d10.
by Alexandre Julliard June 13, 2014

June 13, 2014

Module: wine Branch: master Commit: 90e662c4e7d34b4112e9d1cd87def97d56e2c5f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90e662c4e7d34b4112e9d1cd8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 13 10:01:20 2014 +0200 d3d10_1: Forward D3D10CreateEffectFromMemory to d3d10. --- dlls/d3d10_1/d3d10_1.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d10_1/d3d10_1.spec b/dlls/d3d10_1/d3d10_1.spec index 5ec86f8..4ca69ec 100644 --- a/dlls/d3d10_1/d3d10_1.spec +++ b/dlls/d3d10_1/d3d10_1.spec @@ -4,7 +4,7 @@ @ stub D3D10CreateBlob @ stdcall D3D10CreateDevice1(ptr long ptr long long long ptr) @ stub D3D10CreateDeviceAndSwapChain1 -@ stub D3D10CreateEffectFromMemory +@ stdcall D3D10CreateEffectFromMemory(ptr long long ptr ptr ptr) d3d10.D3D10CreateEffectFromMemory @ stub D3D10CreateEffectPoolFromMemory @ stub D3D10CreateStateBlock @ stub D3D10DisassembleEffect

1 0

Akihiro Sagawa : user32: Don' t close a popup menu when clicking a sub-menu parent item twice.
by Alexandre Julliard June 13, 2014

June 13, 2014

Module: wine Branch: master Commit: cb2b15921daeebf763e8eb34fd9fa336d3b3311a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb2b15921daeebf763e8eb34f… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Jun 13 21:11:34 2014 +0900 user32: Don't close a popup menu when clicking a sub-menu parent item twice. --- dlls/user32/menu.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 0aa7744..93bee49 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -2617,13 +2617,14 @@ static INT MENU_ButtonUp( MTRACKER* pmt, HMENU hPtMenu, UINT wFlags) return executedMenuId; } - /* If we are dealing with the top-level menu */ + /* If we are dealing with the menu bar */ /* and this is a click on an already "popped" item: */ /* Stop the menu tracking and close the opened submenus */ if((pmt->hTopMenu == hPtMenu) && ptmenu->bTimeToHide) return 0; } - ptmenu->bTimeToHide = TRUE; + if( GetMenu(ptmenu->hWnd) == hPtMenu ) + ptmenu->bTimeToHide = TRUE; } return -1; }

1 0

Alexandre Julliard : user32/tests: Remove some noisy traces.
by Alexandre Julliard June 13, 2014

June 13, 2014

Module: wine Branch: master Commit: a95651a5dc7b6b2bb62b3a68a4f1c2bcb7edb29a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a95651a5dc7b6b2bb62b3a68a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 13 10:12:32 2014 +0200 user32/tests: Remove some noisy traces. --- dlls/user32/tests/win.c | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index cbcd6b6..5bdfed6 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -705,19 +705,12 @@ static LRESULT WINAPI main_window_procA(HWND hwnd, UINT msg, WPARAM wparam, LPAR { case WM_GETMINMAXINFO: { - MINMAXINFO* minmax = (MINMAXINFO *)lparam; - - trace("WM_GETMINMAXINFO: hwnd %p, %08lx, %08lx\n", hwnd, wparam, lparam); - dump_minmax_info( minmax ); SetWindowLongPtrA(hwnd, GWLP_USERDATA, 0x20031021); break; } case WM_WINDOWPOSCHANGING: { WINDOWPOS *winpos = (WINDOWPOS *)lparam; - trace("main: WM_WINDOWPOSCHANGING %p after %p, x %d, y %d, cx %d, cy %d flags %08x\n", - winpos->hwnd, winpos->hwndInsertAfter, - winpos->x, winpos->y, winpos->cx, winpos->cy, winpos->flags); if (!(winpos->flags & SWP_NOMOVE)) { ok(winpos->x >= -32768 && winpos->x <= 32767, "bad winpos->x %d\n", winpos->x); @@ -739,9 +732,6 @@ static LRESULT WINAPI main_window_procA(HWND hwnd, UINT msg, WPARAM wparam, LPAR { RECT rc1, rc2; WINDOWPOS *winpos = (WINDOWPOS *)lparam; - trace("main: WM_WINDOWPOSCHANGED %p after %p, x %d, y %d, cx %d, cy %d flags %08x\n", - winpos->hwnd, winpos->hwndInsertAfter, - winpos->x, winpos->y, winpos->cx, winpos->cy, winpos->flags); ok(winpos->x >= -32768 && winpos->x <= 32767, "bad winpos->x %d\n", winpos->x); ok(winpos->y >= -32768 && winpos->y <= 32767, "bad winpos->y %d\n", winpos->y); @@ -775,10 +765,6 @@ static LRESULT WINAPI main_window_procA(HWND hwnd, UINT msg, WPARAM wparam, LPAR BOOL got_getminmaxinfo = GetWindowLongPtrA(hwnd, GWLP_USERDATA) == 0x20031021; CREATESTRUCTA *cs = (CREATESTRUCTA *)lparam; - trace("WM_NCCREATE: hwnd %p, parent %p, style %08x\n", hwnd, cs->hwndParent, cs->style); - if (got_getminmaxinfo) - trace("%p got WM_GETMINMAXINFO\n", hwnd); - if ((cs->style & WS_THICKFRAME) || !(cs->style & (WS_POPUP | WS_CHILD))) ok(got_getminmaxinfo, "main: WM_GETMINMAXINFO should have been received before WM_NCCREATE\n"); else @@ -803,10 +789,6 @@ static LRESULT WINAPI tool_window_procA(HWND hwnd, UINT msg, WPARAM wparam, LPAR { case WM_GETMINMAXINFO: { - MINMAXINFO* minmax = (MINMAXINFO *)lparam; - - trace("hwnd %p, WM_GETMINMAXINFO, %08lx, %08lx\n", hwnd, wparam, lparam); - dump_minmax_info( minmax ); SetWindowLongPtrA(hwnd, GWLP_USERDATA, 0x20031021); break; } @@ -815,10 +797,6 @@ static LRESULT WINAPI tool_window_procA(HWND hwnd, UINT msg, WPARAM wparam, LPAR BOOL got_getminmaxinfo = GetWindowLongPtrA(hwnd, GWLP_USERDATA) == 0x20031021; CREATESTRUCTA *cs = (CREATESTRUCTA *)lparam; - trace("WM_NCCREATE: hwnd %p, parent %p, style %08x\n", hwnd, cs->hwndParent, cs->style); - if (got_getminmaxinfo) - trace("%p got WM_GETMINMAXINFO\n", hwnd); - if ((cs->style & WS_THICKFRAME) || !(cs->style & (WS_POPUP | WS_CHILD))) ok(got_getminmaxinfo, "tool: WM_GETMINMAXINFO should have been received before WM_NCCREATE\n"); else

1 0

Akihiro Sagawa : kernel32: Return correct buffer size when returning DBCS characters.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: 80695cde4f475903f355821fec0d9c978c9aa29d URL: http://source.winehq.org/git/wine.git/?a=commit;h=80695cde4f475903f355821fe… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Jun 12 22:51:24 2014 +0900 kernel32: Return correct buffer size when returning DBCS characters. --- dlls/kernel32/tests/time.c | 17 ++++++++++++++++- dlls/kernel32/time.c | 13 +++++++------ 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/time.c b/dlls/kernel32/tests/time.c index 0cc4485..55d4be9 100644 --- a/dlls/kernel32/tests/time.c +++ b/dlls/kernel32/tests/time.c @@ -667,7 +667,7 @@ static void test_GetCalendarInfo(void) char bufferA[20]; WCHAR bufferW[20]; DWORD val1, val2; - int ret; + int ret, ret2; if (!pGetCalendarInfoA || !pGetCalendarInfoW) { @@ -716,6 +716,21 @@ static void test_GetCalendarInfo(void) ret = pGetCalendarInfoW( 0x0409, CAL_GREGORIAN, CAL_ITWODIGITYEARMAX, NULL, 0, NULL ); ok( ret, "GetCalendarInfoW failed err %u\n", GetLastError() ); ok( ret == 5, "wrong size %u\n", ret ); + + ret = pGetCalendarInfoA( LANG_SYSTEM_DEFAULT, CAL_GREGORIAN, CAL_SDAYNAME1, + bufferA, sizeof(bufferA), NULL); + ok( ret, "GetCalendarInfoA failed err %u\n", GetLastError() ); + ret2 = pGetCalendarInfoA( LANG_SYSTEM_DEFAULT, CAL_GREGORIAN, CAL_SDAYNAME1, + bufferA, 0, NULL); + ok( ret2, "GetCalendarInfoA failed err %u\n", GetLastError() ); + ok( ret == ret2, "got %d, expected %d\n", ret2, ret ); + + ret2 = pGetCalendarInfoW( LANG_SYSTEM_DEFAULT, CAL_GREGORIAN, CAL_SDAYNAME1, + bufferW, sizeof(bufferW), NULL); + ok( ret2, "GetCalendarInfoW failed err %u\n", GetLastError() ); + ret2 = WideCharToMultiByte( CP_ACP, 0, bufferW, -1, NULL, 0, NULL, NULL ); + ok( ret == ret2, "got %d, expected %d\n", ret, ret2 ); + } START_TEST(time) diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index 11df7ff..21ac120 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -614,7 +614,7 @@ BOOL WINAPI GetProcessTimes( HANDLE hprocess, LPFILETIME lpCreationTime, int WINAPI GetCalendarInfoA(LCID lcid, CALID Calendar, CALTYPE CalType, LPSTR lpCalData, int cchData, LPDWORD lpValue) { - int ret; + int ret, cchDataW = cchData; LPWSTR lpCalDataW = NULL; if (NLS_IsUnicodeOnlyLcid(lcid)) @@ -623,13 +623,14 @@ int WINAPI GetCalendarInfoA(LCID lcid, CALID Calendar, CALTYPE CalType, return 0; } - if (cchData && - !(lpCalDataW = HeapAlloc(GetProcessHeap(), 0, cchData*sizeof(WCHAR)))) - return 0; + if (!cchData && !(CalType & CAL_RETURN_NUMBER)) + cchDataW = GetCalendarInfoW(lcid, Calendar, CalType, NULL, 0, NULL); + if (!(lpCalDataW = HeapAlloc(GetProcessHeap(), 0, cchDataW*sizeof(WCHAR)))) + return 0; - ret = GetCalendarInfoW(lcid, Calendar, CalType, lpCalDataW, cchData, lpValue); + ret = GetCalendarInfoW(lcid, Calendar, CalType, lpCalDataW, cchDataW, lpValue); if(ret && lpCalDataW && lpCalData) - WideCharToMultiByte(CP_ACP, 0, lpCalDataW, -1, lpCalData, cchData, NULL, NULL); + ret = WideCharToMultiByte(CP_ACP, 0, lpCalDataW, -1, lpCalData, cchData, NULL, NULL); else if (CalType & CAL_RETURN_NUMBER) ret *= sizeof(WCHAR); HeapFree(GetProcessHeap(), 0, lpCalDataW);

1 0

Guillaume Charifi : pdh: Implement PdhExpandCounterPathA/W.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: f823b6abe3265f0ed45796f6064a66fde453cb5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f823b6abe3265f0ed45796f60… Author: Guillaume Charifi <guillaume.charifi(a)sfr.fr> Date: Wed Jun 4 19:00:50 2014 +0200 pdh: Implement PdhExpandCounterPathA/W. --- dlls/pdh/pdh.spec | 4 ++-- dlls/pdh/pdh_main.c | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/pdh/pdh.spec b/dlls/pdh/pdh.spec index b475d53..fc1aa4f 100644 --- a/dlls/pdh/pdh.spec +++ b/dlls/pdh/pdh.spec @@ -36,8 +36,8 @@ @ stub PdhEnumObjectsHA @ stub PdhEnumObjectsHW @ stub PdhEnumObjectsW -@ stub PdhExpandCounterPathA -@ stub PdhExpandCounterPathW +@ stdcall PdhExpandCounterPathA(str ptr ptr) +@ stdcall PdhExpandCounterPathW(wstr ptr ptr) @ stdcall PdhExpandWildCardPathA(str str ptr ptr long) @ stub PdhExpandWildCardPathHA @ stub PdhExpandWildCardPathHW diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c index 25bd858..f197095 100644 --- a/dlls/pdh/pdh_main.c +++ b/dlls/pdh/pdh_main.c @@ -636,6 +636,24 @@ PDH_STATUS WINAPI PdhExpandWildCardPathW( LPCWSTR szDataSource, LPCWSTR szWildCa } /*********************************************************************** + * PdhExpandCounterPathA (PDH.@) + */ +PDH_STATUS WINAPI PdhExpandCounterPathA( LPCSTR szWildCardPath, LPSTR mszExpandedPathList, LPDWORD pcchPathListLength ) +{ + FIXME("%s, %p, %p: stub\n", debugstr_a(szWildCardPath), mszExpandedPathList, pcchPathListLength); + return PdhExpandWildCardPathA(NULL, szWildCardPath, mszExpandedPathList, pcchPathListLength, 0); +} + +/*********************************************************************** + * PdhExpandCounterPathW (PDH.@) + */ +PDH_STATUS WINAPI PdhExpandCounterPathW( LPCWSTR szWildCardPath, LPWSTR mszExpandedPathList, LPDWORD pcchPathListLength ) +{ + FIXME("%s, %p, %p: stub\n", debugstr_w(szWildCardPath), mszExpandedPathList, pcchPathListLength); + return PdhExpandWildCardPathW(NULL, szWildCardPath, mszExpandedPathList, pcchPathListLength, 0); +} + +/*********************************************************************** * PdhGetCounterInfoA (PDH.@) */ PDH_STATUS WINAPI PdhGetCounterInfoA( PDH_HCOUNTER handle, BOOLEAN text, LPDWORD size, PPDH_COUNTER_INFO_A info )

1 0

Guillaume Charifi : ole32: CoCreateGuid returns E_INVALIDARG on null-GUID.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: 216b24527dc2b465a87ea72b848f4ca51708f903 URL: http://source.winehq.org/git/wine.git/?a=commit;h=216b24527dc2b465a87ea72b8… Author: Guillaume Charifi <guillaume.charifi(a)sfr.fr> Date: Sat Jun 7 19:24:28 2014 +0200 ole32: CoCreateGuid returns E_INVALIDARG on null-GUID. --- dlls/ole32/compobj.c | 6 +++++- dlls/ole32/tests/compobj.c | 9 +++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 250c0f9..d117c02 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -2051,7 +2051,11 @@ HRESULT WINAPI CoDisconnectObject( LPUNKNOWN lpUnk, DWORD reserved ) */ HRESULT WINAPI CoCreateGuid(GUID *pguid) { - DWORD status = UuidCreate(pguid); + DWORD status; + + if(!pguid) return E_INVALIDARG; + + status = UuidCreate(pguid); if (status == RPC_S_OK || status == RPC_S_UUID_LOCAL_ONLY) return S_OK; return HRESULT_FROM_WIN32( status ); } diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index b85842b..16ae501 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -1977,6 +1977,14 @@ static void test_OleRegGetMiscStatus(void) } } +static void test_CoCreateGuid(void) +{ + HRESULT hr; + + hr = CoCreateGuid(NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); +} + static void init_funcs(void) { HMODULE hOle32 = GetModuleHandleA("ole32"); @@ -2033,4 +2041,5 @@ START_TEST(compobj) test_CoGetTreatAsClass(); test_CoInitializeEx(); test_OleRegGetMiscStatus(); + test_CoCreateGuid(); }

1 0

Piotr Caban : msvcrt: Add _wcsxfrm_l implementation.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: b540277cc7b8dc5b8118ce948b485afe802ab79e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b540277cc7b8dc5b8118ce948… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 12 17:52:56 2014 +0200 msvcrt: Add _wcsxfrm_l implementation. --- dlls/msvcr100/msvcr100.spec | 4 +-- dlls/msvcr110/msvcr110.spec | 4 +-- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 4 +-- dlls/msvcr90/msvcr90.spec | 4 +-- dlls/msvcrt/msvcrt.spec | 4 +-- dlls/msvcrt/wcs.c | 58 +++++++++++++++++++++++++++++++++++++++++++ 8 files changed, 70 insertions(+), 12 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index ab71711..108fae5 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1518,7 +1518,7 @@ @ cdecl _wcsupr_l(wstr ptr) MSVCRT__wcsupr_l @ cdecl _wcsupr_s(wstr long) MSVCRT__wcsupr_s @ cdecl _wcsupr_s_l(wstr long ptr) MSVCRT__wcsupr_s_l -@ stub _wcsxfrm_l +@ cdecl _wcsxfrm_l(ptr wstr long ptr) MSVCRT__wcsxfrm_l @ cdecl _wctime32(ptr) MSVCRT__wctime32 @ stub _wctime32_s @ cdecl _wctime64(ptr) MSVCRT__wctime64 @@ -1877,7 +1877,7 @@ @ cdecl wcstombs(ptr ptr long) MSVCRT_wcstombs @ cdecl wcstombs_s(ptr ptr long wstr long) MSVCRT_wcstombs_s @ cdecl wcstoul(wstr ptr long) MSVCRT_wcstoul -@ stub wcsxfrm(ptr wstr long) +@ cdecl wcsxfrm(ptr wstr long) MSVCRT_wcsxfrm @ cdecl wctob(long) MSVCRT_wctob @ cdecl wctomb(ptr long) MSVCRT_wctomb @ cdecl wctomb_s(ptr ptr long long) MSVCRT_wctomb_s diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index c231de9..4f89b24 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1877,7 +1877,7 @@ @ cdecl _wcsupr_l(wstr ptr) MSVCRT__wcsupr_l @ cdecl _wcsupr_s(wstr long) MSVCRT__wcsupr_s @ cdecl _wcsupr_s_l(wstr long ptr) MSVCRT__wcsupr_s_l -@ stub _wcsxfrm_l +@ cdecl _wcsxfrm_l(ptr wstr long ptr) MSVCRT__wcsxfrm_l @ cdecl _wctime32(ptr) MSVCRT__wctime32 @ stub _wctime32_s @ cdecl _wctime64(ptr) MSVCRT__wctime64 @@ -2236,7 +2236,7 @@ @ cdecl wcstombs(ptr ptr long) MSVCRT_wcstombs @ cdecl wcstombs_s(ptr ptr long wstr long) MSVCRT_wcstombs_s @ cdecl wcstoul(wstr ptr long) MSVCRT_wcstoul -@ stub wcsxfrm(ptr wstr long) +@ cdecl wcsxfrm(ptr wstr long) MSVCRT_wcsxfrm @ cdecl wctob(long) MSVCRT_wctob @ cdecl wctomb(ptr long) MSVCRT_wctomb @ cdecl wctomb_s(ptr ptr long long) MSVCRT_wctomb_s diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index 0168359..1a94ee2 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -870,7 +870,7 @@ @ cdecl wcstol(wstr ptr long) ntdll.wcstol @ cdecl wcstombs(ptr ptr long) MSVCRT_wcstombs @ cdecl wcstoul(wstr ptr long) MSVCRT_wcstoul -@ stub wcsxfrm(ptr wstr long) +@ cdecl wcsxfrm(ptr wstr long) MSVCRT_wcsxfrm @ cdecl wctomb(ptr long) MSVCRT_wctomb @ varargs wprintf(wstr) MSVCRT_wprintf @ varargs wscanf(wstr) MSVCRT_wscanf diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index f5ff608..127a440 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -866,7 +866,7 @@ @ cdecl wcstol(wstr ptr long) ntdll.wcstol @ cdecl wcstombs(ptr ptr long) MSVCRT_wcstombs @ cdecl wcstoul(wstr ptr long) MSVCRT_wcstoul -@ stub wcsxfrm(ptr wstr long) +@ cdecl wcsxfrm(ptr wstr long) MSVCRT_wcsxfrm @ cdecl wctomb(ptr long) MSVCRT_wctomb @ varargs wprintf(wstr) MSVCRT_wprintf @ varargs wscanf(wstr) MSVCRT_wscanf diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index d4985bc..302abe5 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1197,7 +1197,7 @@ @ cdecl _wcsupr_l(wstr ptr) MSVCRT__wcsupr_l @ cdecl _wcsupr_s(wstr long) MSVCRT__wcsupr_s @ cdecl _wcsupr_s_l(wstr long ptr) MSVCRT__wcsupr_s_l -@ stub _wcsxfrm_l +@ cdecl _wcsxfrm_l(ptr wstr long ptr) MSVCRT__wcsxfrm_l @ cdecl _wctime32(ptr) MSVCRT__wctime32 @ stub _wctime32_s @ cdecl _wctime64(ptr) MSVCRT__wctime64 @@ -1557,7 +1557,7 @@ @ cdecl wcstombs(ptr ptr long) MSVCRT_wcstombs @ cdecl wcstombs_s(ptr ptr long wstr long) MSVCRT_wcstombs_s @ cdecl wcstoul(wstr ptr long) MSVCRT_wcstoul -@ stub wcsxfrm(ptr wstr long) +@ cdecl wcsxfrm(ptr wstr long) MSVCRT_wcsxfrm @ cdecl wctob(long) MSVCRT_wctob @ cdecl wctomb(ptr long) MSVCRT_wctomb @ cdecl wctomb_s(ptr ptr long long) MSVCRT_wctomb_s diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index c5ec79a..28d37d1 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1173,7 +1173,7 @@ @ cdecl _wcsupr_l(wstr ptr) MSVCRT__wcsupr_l @ cdecl _wcsupr_s(wstr long) MSVCRT__wcsupr_s @ cdecl _wcsupr_s_l(wstr long ptr) MSVCRT__wcsupr_s_l -@ stub _wcsxfrm_l +@ cdecl _wcsxfrm_l(ptr wstr long ptr) MSVCRT__wcsxfrm_l @ cdecl _wctime32(ptr) MSVCRT__wctime32 @ stub _wctime32_s @ cdecl _wctime64(ptr) MSVCRT__wctime64 @@ -1530,7 +1530,7 @@ @ cdecl wcstombs(ptr ptr long) MSVCRT_wcstombs @ cdecl wcstombs_s(ptr ptr long wstr long) MSVCRT_wcstombs_s @ cdecl wcstoul(wstr ptr long) MSVCRT_wcstoul -@ stub wcsxfrm(ptr wstr long) +@ cdecl wcsxfrm(ptr wstr long) MSVCRT_wcsxfrm @ cdecl wctob(long) MSVCRT_wctob @ cdecl wctomb(ptr long) MSVCRT_wctomb @ cdecl wctomb_s(ptr ptr long long) MSVCRT_wctomb_s diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 82d352d..2349580 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1134,7 +1134,7 @@ @ cdecl _wcsupr_l(wstr ptr) MSVCRT__wcsupr_l @ cdecl _wcsupr_s(wstr long) MSVCRT__wcsupr_s @ cdecl _wcsupr_s_l(wstr long ptr) MSVCRT__wcsupr_s_l -# stub _wcsxfrm_l(ptr wstr long ptr) +@ cdecl _wcsxfrm_l(ptr wstr long ptr) MSVCRT__wcsxfrm_l @ cdecl _wctime(ptr) MSVCRT__wctime @ cdecl _wctime32(ptr) MSVCRT__wctime32 # stub _wctime32_s(ptr long ptr) @@ -1509,7 +1509,7 @@ @ cdecl wcstombs(ptr ptr long) MSVCRT_wcstombs @ cdecl wcstombs_s(ptr ptr long wstr long) MSVCRT_wcstombs_s @ cdecl wcstoul(wstr ptr long) MSVCRT_wcstoul -@ stub wcsxfrm(ptr wstr long) +@ cdecl wcsxfrm(ptr wstr long) MSVCRT_wcsxfrm @ cdecl wctob(long) MSVCRT_wctob @ cdecl wctomb(ptr long) MSVCRT_wctomb @ cdecl wctomb_s(ptr ptr long long) MSVCRT_wctomb_s diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 7c299a7..c2b8f58 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -2056,3 +2056,61 @@ int CDECL MSVCRT_wcsncmp(const MSVCRT_wchar_t *str1, const MSVCRT_wchar_t *str2, { return strncmpW(str1, str2, n); } + +/********************************************************************* + * _wcsxfrm_l (MSVCRT.@) + */ +MSVCRT_size_t CDECL MSVCRT__wcsxfrm_l(MSVCRT_wchar_t *dest, const MSVCRT_wchar_t *src, + MSVCRT_size_t len, MSVCRT__locale_t locale) +{ + MSVCRT_pthreadlocinfo locinfo; + int i, ret; + + if(!MSVCRT_CHECK_PMT(src)) return INT_MAX; + if(!MSVCRT_CHECK_PMT(dest || !len)) return INT_MAX; + + if(len > INT_MAX) { + FIXME("len > INT_MAX not supported\n"); + len = INT_MAX; + } + + if(!locale) + locinfo = get_locinfo(); + else + locinfo = locale->locinfo; + + if(!locinfo->lc_handle[MSVCRT_LC_COLLATE]) { + MSVCRT_wcsncpy(dest, src, len); + return strlenW(src); + } + + ret = LCMapStringW(locinfo->lc_handle[MSVCRT_LC_COLLATE], + LCMAP_SORTKEY, src, -1, NULL, 0); + if(!ret) { + if(len) dest[0] = 0; + *MSVCRT__errno() = MSVCRT_EILSEQ; + return INT_MAX; + } + if(!len) return ret-1; + + if(ret > len) { + dest[0] = 0; + *MSVCRT__errno() = MSVCRT_ERANGE; + return ret-1; + } + + ret = LCMapStringW(locinfo->lc_handle[MSVCRT_LC_COLLATE], + LCMAP_SORTKEY, src, -1, dest, len) - 1; + for(i=ret; i>=0; i--) + dest[i] = ((unsigned char*)dest)[i]; + return ret; +} + +/********************************************************************* + * wcsxfrm (MSVCRT.@) + */ +MSVCRT_size_t CDECL MSVCRT_wcsxfrm(MSVCRT_wchar_t *dest, + const MSVCRT_wchar_t *src, MSVCRT_size_t len) +{ + return MSVCRT__wcsxfrm_l(dest, src, len, NULL); +}

1 0

Piotr Caban : msvcrt: Add _strxfrm_l implementation.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: 00bce25143b09a17c628dfded47ce2506b90aba5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00bce25143b09a17c628dfded… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 12 17:52:40 2014 +0200 msvcrt: Add _strxfrm_l implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/string.c | 49 +++++++++++++++++++++++++++++-- dlls/msvcrt/tests/string.c | 68 +++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 120 insertions(+), 7 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index ed40b65..ab71711 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1367,7 +1367,7 @@ @ cdecl _strupr_l(str ptr) MSVCRT__strupr_l @ cdecl _strupr_s(str long) MSVCRT__strupr_s @ cdecl _strupr_s_l(str long ptr) MSVCRT__strupr_s_l -@ stub _strxfrm_l +@ cdecl _strxfrm_l(ptr str long ptr) MSVCRT__strxfrm_l @ cdecl _swab(str str long) MSVCRT__swab @ varargs _swprintf(ptr wstr) MSVCRT_swprintf @ stub _swprintf_c diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 8af410c..c231de9 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1725,7 +1725,7 @@ @ cdecl _strupr_l(str ptr) MSVCRT__strupr_l @ cdecl _strupr_s(str long) MSVCRT__strupr_s @ cdecl _strupr_s_l(str long ptr) MSVCRT__strupr_s_l -@ stub _strxfrm_l +@ cdecl _strxfrm_l(ptr str long ptr) MSVCRT__strxfrm_l @ cdecl _swab(str str long) MSVCRT__swab @ varargs _swprintf(ptr wstr) MSVCRT_swprintf @ stub _swprintf_c diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 1898d11..d4985bc 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1047,7 +1047,7 @@ @ cdecl _strupr_l(str ptr) MSVCRT__strupr_l @ cdecl _strupr_s(str long) MSVCRT__strupr_s @ cdecl _strupr_s_l(str long ptr) MSVCRT__strupr_s_l -@ stub _strxfrm_l +@ cdecl _strxfrm_l(ptr str long ptr) MSVCRT__strxfrm_l @ cdecl _swab(str str long) MSVCRT__swab @ varargs _swprintf(ptr wstr) MSVCRT_swprintf @ stub _swprintf_c diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index b4ea4b8..c5ec79a 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1022,7 +1022,7 @@ @ cdecl _strupr_l(str ptr) MSVCRT__strupr_l @ cdecl _strupr_s(str long) MSVCRT__strupr_s @ cdecl _strupr_s_l(str long ptr) MSVCRT__strupr_s_l -@ stub _strxfrm_l +@ cdecl _strxfrm_l(ptr str long ptr) MSVCRT__strxfrm_l @ cdecl _swab(str str long) MSVCRT__swab @ varargs _swprintf(ptr wstr) MSVCRT_swprintf @ stub _swprintf_c diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 69020f6..82d352d 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -988,7 +988,7 @@ @ cdecl _strupr_l(str ptr) MSVCRT__strupr_l @ cdecl _strupr_s(str long) MSVCRT__strupr_s @ cdecl _strupr_s_l(str long ptr) MSVCRT__strupr_s_l -# stub _strxfrm_l(ptr str long ptr) +@ cdecl _strxfrm_l(ptr str long ptr) MSVCRT__strxfrm_l @ cdecl _swab(str str long) MSVCRT__swab @ varargs _swprintf(ptr wstr) MSVCRT_swprintf # stub _swprintf_c(ptr long str) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index e1a14ac..60e00c9 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -701,12 +701,57 @@ char* __cdecl MSVCRT_strncat(char *dst, const char *src, MSVCRT_size_t len) } /********************************************************************* + * _strxfrm_l (MSVCRT.@) + */ +MSVCRT_size_t CDECL MSVCRT__strxfrm_l( char *dest, const char *src, + MSVCRT_size_t len, MSVCRT__locale_t locale ) +{ + MSVCRT_pthreadlocinfo locinfo; + int ret; + + if(!MSVCRT_CHECK_PMT(src)) return INT_MAX; + if(!MSVCRT_CHECK_PMT(dest || !len)) return INT_MAX; + + if(len > INT_MAX) { + FIXME("len > INT_MAX not supported\n"); + len = INT_MAX; + } + + if(!locale) + locinfo = get_locinfo(); + else + locinfo = locale->locinfo; + + if(!locinfo->lc_handle[MSVCRT_LC_COLLATE]) { + MSVCRT_strncpy(dest, src, len); + return strlen(src); + } + + ret = LCMapStringA(locinfo->lc_handle[MSVCRT_LC_COLLATE], + LCMAP_SORTKEY, src, -1, NULL, 0); + if(!ret) { + if(len) dest[0] = 0; + *MSVCRT__errno() = MSVCRT_EILSEQ; + return INT_MAX; + } + if(!len) return ret-1; + + if(ret > len) { + dest[0] = 0; + *MSVCRT__errno() = MSVCRT_ERANGE; + return ret-1; + } + + return LCMapStringA(locinfo->lc_handle[MSVCRT_LC_COLLATE], + LCMAP_SORTKEY, src, -1, dest, len) - 1; +} + +/********************************************************************* * strxfrm (MSVCRT.@) */ MSVCRT_size_t CDECL MSVCRT_strxfrm( char *dest, const char *src, MSVCRT_size_t len ) { - /* FIXME: handle Windows locale */ - return strxfrm( dest, src, len ); + return MSVCRT__strxfrm_l(dest, src, len, NULL); } /******************************************************************** diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 822c952..6604819 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -2649,6 +2649,73 @@ static void test_strncpy(void) ok(!strncmp(dst, "0123456789", TEST_STRNCPY_LEN), "dst != 0123456789\n"); } +static void test_strxfrm(void) +{ + char dest[256]; + size_t ret; + + /* crashes on old version of msvcrt */ + if(p__atodbl_l) { + errno = 0xdeadbeef; + ret = strxfrm(NULL, "src", 1); + ok(ret == INT_MAX, "ret = %d\n", (int)ret); + ok(errno == EINVAL, "errno = %d\n", errno); + + errno = 0xdeadbeef; + ret = strxfrm(dest, NULL, 100); + ok(ret == INT_MAX, "ret = %d\n", (int)ret); + ok(errno == EINVAL, "errno = %d\n", errno); + } + + ret = strxfrm(NULL, "src", 0); + ok(ret == 3, "ret = %d\n", (int)ret); + dest[0] = 'a'; + ret = strxfrm(dest, "src", 0); + ok(ret == 3, "ret = %d\n", (int)ret); + ok(dest[0] == 'a', "dest[0] = %d\n", dest[0]); + + dest[3] = 'a'; + ret = strxfrm(dest, "src", 5); + ok(ret == 3, "ret = %d\n", (int)ret); + ok(!strcmp(dest, "src"), "dest = %s\n", dest); + + errno = 0xdeadbeef; + dest[1] = 'a'; + ret = strxfrm(dest, "src", 1); + ok(ret == 3, "ret = %d\n", (int)ret); + ok(dest[0] == 's', "dest[0] = %d\n", dest[0]); + ok(dest[1] == 'a', "dest[1] = %d\n", dest[1]); + ok(errno == 0xdeadbeef, "errno = %d\n", errno); + + ret = strxfrm(dest, "", 5); + ok(ret == 0, "ret = %d\n", (int)ret); + ok(!dest[0], "dest[0] = %d\n", dest[0]); + + if(!setlocale(LC_ALL, "polish")) { + win_skip("stxfrm tests\n"); + return; + } + + ret = strxfrm(NULL, "src", 0); + ok(ret < sizeof(dest)-1, "ret = %d\n", (int)ret); + dest[0] = 'a'; + ret = strxfrm(dest, "src", 0); + ok(ret < sizeof(dest)-1, "ret = %d\n", (int)ret); + ok(dest[0] == 'a', "dest[0] = %d\n", dest[0]); + + ret = strxfrm(dest, "src", ret+1); + ok(ret < sizeof(dest)-1, "ret = %d\n", (int)ret); + ok(dest[0], "dest[0] = 0\n"); + + errno = 0xdeadbeef; + dest[0] = 'a'; + ret = strxfrm(dest, "src", 5); + ok(ret>5 && ret<sizeof(dest)-1, "ret = %d\n", (int)ret); + ok(!dest[0] || broken(!p__atodbl_l && dest[0]=='a'), "dest[0] = %d\n", dest[0]); + + setlocale(LC_ALL, "C"); +} + START_TEST(string) { char mem[100]; @@ -2748,4 +2815,5 @@ START_TEST(string) test__wcstoi64(); test_atoi(); test_strncpy(); + test_strxfrm(); }

1 0

Akihiro Sagawa : kernel32: Avoid uninitialised value read in GetCalendarInfoA.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: 89a558fe8f0b9034b53c0443431dab3739c6ddff URL: http://source.winehq.org/git/wine.git/?a=commit;h=89a558fe8f0b9034b53c04434… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Jun 12 22:51:22 2014 +0900 kernel32: Avoid uninitialised value read in GetCalendarInfoA. --- dlls/kernel32/time.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index 01d38fc..11df7ff 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -629,7 +629,7 @@ int WINAPI GetCalendarInfoA(LCID lcid, CALID Calendar, CALTYPE CalType, ret = GetCalendarInfoW(lcid, Calendar, CalType, lpCalDataW, cchData, lpValue); if(ret && lpCalDataW && lpCalData) - WideCharToMultiByte(CP_ACP, 0, lpCalDataW, cchData, lpCalData, cchData, NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, lpCalDataW, -1, lpCalData, cchData, NULL, NULL); else if (CalType & CAL_RETURN_NUMBER) ret *= sizeof(WCHAR); HeapFree(GetProcessHeap(), 0, lpCalDataW);

1 0

Nikolay Sivov : services: Defer service delete until all handles are closed.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: 6a4c14696266aef22f3bfe890dd3e9955d87bdc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a4c14696266aef22f3bfe890… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 4 23:54:17 2014 +0400 services: Defer service delete until all handles are closed. --- dlls/advapi32/service.c | 2 ++ dlls/advapi32/tests/service.c | 17 ++++++----------- programs/services/rpc.c | 13 +++++++------ programs/services/services.c | 9 ++++++++- programs/services/services.h | 10 ++++++++-- 5 files changed, 31 insertions(+), 20 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 0047031..6bfdda6 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -1087,6 +1087,8 @@ BOOL WINAPI DeleteService( SC_HANDLE hService ) { DWORD err; + TRACE("%p\n", hService); + __TRY { err = svcctl_DeleteService(hService); diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 4ebae1c..beb589d 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -187,7 +187,7 @@ static void test_open_svc(void) static void test_create_delete_svc(void) { - SC_HANDLE scm_handle, svc_handle1; + SC_HANDLE scm_handle, svc_handle1, svc_handle2; CHAR username[UNLEN + 1], domain[MAX_PATH]; DWORD user_size = UNLEN + 1; CHAR account[UNLEN + 3]; @@ -412,6 +412,11 @@ static void test_create_delete_svc(void) ret = DeleteService(svc_handle1); ok(ret, "Expected success, got error %u\n", GetLastError()); + /* Service is marked for delete, but handle is still open. Try to open service again. */ + svc_handle2 = OpenServiceA(scm_handle, servicename, GENERIC_READ); + ok(svc_handle2 != NULL, "got %p, error %u\n", svc_handle2, GetLastError()); + CloseServiceHandle(svc_handle2); + CloseServiceHandle(svc_handle1); CloseServiceHandle(scm_handle); @@ -2341,19 +2346,9 @@ static void test_refcount(void) svc_handle5 = CreateServiceA(scm_handle, servicename, NULL, GENERIC_ALL, SERVICE_WIN32_OWN_PROCESS | SERVICE_INTERACTIVE_PROCESS, SERVICE_DISABLED, 0, pathname, NULL, NULL, NULL, NULL, NULL); - todo_wine - { ok(!svc_handle5, "Expected failure\n"); ok(GetLastError() == ERROR_SERVICE_MARKED_FOR_DELETE, "Expected ERROR_SERVICE_MARKED_FOR_DELETE, got %d\n", GetLastError()); - } - - /* FIXME: Remove this when Wine is fixed */ - if (svc_handle5) - { - DeleteService(svc_handle5); - CloseServiceHandle(svc_handle5); - } /* Close all the handles to the service and try again */ ret = CloseServiceHandle(svc_handle4); diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 166e2b7..3955e09 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -481,8 +481,8 @@ DWORD __cdecl svcctl_CreateServiceW( DWORD dwPasswordSize, SC_RPC_HANDLE *phService) { + struct service_entry *entry, *found; struct sc_manager_handle *manager; - struct service_entry *entry; DWORD err; WINE_TRACE("(%s, %s, 0x%x, %s)\n", wine_dbgstr_w(lpServiceName), wine_dbgstr_w(lpDisplayName), dwDesiredAccess, wine_dbgstr_w(lpBinaryPathName)); @@ -533,11 +533,14 @@ DWORD __cdecl svcctl_CreateServiceW( scmdatabase_lock_exclusive(manager->db); - if (scmdatabase_find_service(manager->db, lpServiceName)) + if ((found = scmdatabase_find_service(manager->db, lpServiceName))) { + service_lock_exclusive(found); + err = is_marked_for_delete(found) ? ERROR_SERVICE_MARKED_FOR_DELETE : ERROR_SERVICE_EXISTS; + service_unlock(found); scmdatabase_unlock(manager->db); free_service_entry(entry); - return ERROR_SERVICE_EXISTS; + return err; } if (scmdatabase_find_service_by_displayname(manager->db, get_display_name(entry))) @@ -568,16 +571,14 @@ DWORD __cdecl svcctl_DeleteService( if ((err = validate_service_handle(hService, DELETE, &service)) != ERROR_SUCCESS) return err; - scmdatabase_lock_exclusive(service->service_entry->db); service_lock_exclusive(service->service_entry); if (!is_marked_for_delete(service->service_entry)) - err = scmdatabase_remove_service(service->service_entry->db, service->service_entry); + err = mark_for_delete(service->service_entry); else err = ERROR_SERVICE_MARKED_FOR_DELETE; service_unlock(service->service_entry); - scmdatabase_unlock(service->service_entry->db); return err; } diff --git a/programs/services/services.c b/programs/services/services.c index 2fe3806..632d92a 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -245,7 +245,7 @@ DWORD scmdatabase_add_service(struct scmdatabase *db, struct service_entry *serv return ERROR_SUCCESS; } -DWORD scmdatabase_remove_service(struct scmdatabase *db, struct service_entry *service) +static DWORD scmdatabase_remove_service(struct scmdatabase *db, struct service_entry *service) { int err; @@ -422,7 +422,14 @@ struct service_entry *scmdatabase_find_service_by_displayname(struct scmdatabase void release_service(struct service_entry *service) { if (InterlockedDecrement(&service->ref_count) == 0 && is_marked_for_delete(service)) + { + scmdatabase_lock_exclusive(service->db); + service_lock_exclusive(service); + scmdatabase_remove_service(service->db, service); + service_unlock(service); + scmdatabase_unlock(service->db); free_service_entry(service); + } } static DWORD scmdatabase_create(struct scmdatabase **db) diff --git a/programs/services/services.h b/programs/services/services.h index 3e36141..88a84ad 100644 --- a/programs/services/services.h +++ b/programs/services/services.h @@ -48,6 +48,7 @@ struct service_entry HANDLE control_pipe; HANDLE overlapped_event; HANDLE status_changed_event; + BOOL marked_for_delete; }; extern struct scmdatabase *active_database; @@ -57,7 +58,6 @@ extern struct scmdatabase *active_database; struct service_entry *scmdatabase_find_service(struct scmdatabase *db, LPCWSTR name); struct service_entry *scmdatabase_find_service_by_displayname(struct scmdatabase *db, LPCWSTR name); DWORD scmdatabase_add_service(struct scmdatabase *db, struct service_entry *entry); -DWORD scmdatabase_remove_service(struct scmdatabase *db, struct service_entry *entry); DWORD scmdatabase_lock_startup(struct scmdatabase *db); void scmdatabase_unlock_startup(struct scmdatabase *db); @@ -106,7 +106,13 @@ static inline LPCWSTR get_display_name(struct service_entry *service) static inline BOOL is_marked_for_delete(struct service_entry *service) { - return service->entry.next == NULL; + return service->marked_for_delete; +} + +static inline DWORD mark_for_delete(struct service_entry *service) +{ + service->marked_for_delete = TRUE; + return ERROR_SUCCESS; } #endif /*WINE_PROGRAMS_UTILS_H_*/

1 0

Austin English : msasn1: Add stub dll.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: d13d296c2784c42a73d1e44295988166a79caf2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d13d296c2784c42a73d1e4429… Author: Austin English <austinenglish(a)gmail.com> Date: Sun Jun 1 17:22:16 2014 -0700 msasn1: Add stub dll. --- configure | 2 + configure.ac | 1 + dlls/msasn1/Makefile.in | 5 + dlls/msasn1/main.c | 39 +++++++ dlls/msasn1/msasn1.spec | 266 +++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 313 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d13d296c2784c42a73d1e…

1 0

Michael Müller : ntdll: Stub TokenAppContainerSid in NtQueryInformationToken.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: 97c3bb040e7811fcd506fb5c29f5bdbec4ffead5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97c3bb040e7811fcd506fb5c2… Author: Michael Müller <michael(a)fds-team.de> Date: Sat May 31 02:08:45 2014 +0200 ntdll: Stub TokenAppContainerSid in NtQueryInformationToken. --- dlls/ntdll/nt.c | 22 +++++++++++++++++++++- include/winnt.h | 17 +++++++++++++++++ 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index ce648de..73d9383 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -279,7 +279,20 @@ NTSTATUS WINAPI NtQueryInformationToken( sizeof(TOKEN_MANDATORY_LABEL) + sizeof(SID), /* TokenIntegrityLevel [sizeof(SID) includes one SubAuthority] */ 0, /* TokenUIAccess */ 0, /* TokenMandatoryPolicy */ - 0 /* TokenLogonSid */ + 0, /* TokenLogonSid */ + 0, /* TokenIsAppContainer */ + 0, /* TokenCapabilities */ + sizeof(TOKEN_APPCONTAINER_INFORMATION) + sizeof(SID), /* TokenAppContainerSid */ + 0, /* TokenAppContainerNumber */ + 0, /* TokenUserClaimAttributes*/ + 0, /* TokenDeviceClaimAttributes */ + 0, /* TokenRestrictedUserClaimAttributes */ + 0, /* TokenRestrictedDeviceClaimAttributes */ + 0, /* TokenDeviceGroups */ + 0, /* TokenRestrictedDeviceGroups */ + 0, /* TokenSecurityAttributes */ + 0, /* TokenIsRestricted */ + 0 /* TokenProcessTrustLevel */ }; ULONG len = 0; @@ -521,6 +534,13 @@ NTSTATUS WINAPI NtQueryInformationToken( memcpy(psid, &high_level, sizeof(SID)); } break; + case TokenAppContainerSid: + { + TOKEN_APPCONTAINER_INFORMATION *container = tokeninfo; + FIXME("QueryInformationToken( ..., TokenAppContainerSid, ...) semi-stub\n"); + container->TokenAppContainer = NULL; + } + break; default: { ERR("Unhandled Token Information class %d!\n", tokeninfoclass); diff --git a/include/winnt.h b/include/winnt.h index bae8aed..280cba0 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -3685,6 +3685,19 @@ typedef enum _TOKEN_INFORMATION_CLASS { TokenUIAccess, TokenMandatoryPolicy, TokenLogonSid, + TokenIsAppContainer, + TokenCapabilities, + TokenAppContainerSid, + TokenAppContainerNumber, + TokenUserClaimAttributes, + TokenDeviceClaimAttributes, + TokenRestrictedUserClaimAttributes, + TokenRestrictedDeviceClaimAttributes, + TokenDeviceGroups, + TokenRestrictedDeviceGroups, + TokenSecurityAttributes, + TokenIsRestricted, + TokenProcessTrustLevel, MaxTokenInfoClass } TOKEN_INFORMATION_CLASS; @@ -4410,6 +4423,10 @@ typedef struct _TOKEN_MANDATORY_LABEL { SID_AND_ATTRIBUTES Label; } TOKEN_MANDATORY_LABEL, * PTOKEN_MANDATORY_LABEL; +typedef struct _TOKEN_APPCONTAINER_INFORMATION { + PSID TokenAppContainer; +} TOKEN_APPCONTAINER_INFORMATION, * PTOKEN_APPCONTAINER_INFORMATION; + /* * ACLs of NT */

1 0

Damjan Jovanovic : winex11.drv: Use the clipboard to import text/ html XDND selections.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: b6d0df6a31e2b88c66d67937a10928bdec846bf0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6d0df6a31e2b88c66d67937a… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue May 27 02:23:21 2014 +0200 winex11.drv: Use the clipboard to import text/html XDND selections. --- dlls/winex11.drv/xdnd.c | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index 3941900..2184a42 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -74,7 +74,6 @@ static HWND XDNDLastDropTargetWnd; static void X11DRV_XDND_InsertXDNDData(int property, int format, void* data, unsigned int len); static int X11DRV_XDND_DeconstructTextURIList(int property, void* data, int len); static int X11DRV_XDND_DeconstructTextPlain(int property, void* data, int len); -static int X11DRV_XDND_DeconstructTextHTML(int property, void* data, int len); static void X11DRV_XDND_MapFormat(Display *display, Window xwin, unsigned int property, unsigned char *data, int len); static void X11DRV_XDND_ResolveProperty(Display *display, Window xwin, Time tm, Atom *types, unsigned long count); @@ -569,8 +568,6 @@ static void X11DRV_XDND_MapFormat(Display *display, Window xwin, unsigned int pr X11DRV_XDND_DeconstructTextURIList(property, data, len); else if (property == x11drv_atom(text_plain)) X11DRV_XDND_DeconstructTextPlain(property, data, len); - else if (property == x11drv_atom(text_html)) - X11DRV_XDND_DeconstructTextHTML(property, data, len); else { /* use the clipboard import functions for other types */ @@ -698,26 +695,6 @@ static int X11DRV_XDND_DeconstructTextPlain(int property, void* data, int len) /************************************************************************** - * X11DRV_XDND_DeconstructTextHTML - * - * Interpret text/html data and add records to <dndfmt> linked list - */ -static int X11DRV_XDND_DeconstructTextHTML(int property, void* data, int len) -{ - char* dostext; - - X11DRV_XDND_UnixToDos(&dostext, data, len); - - X11DRV_XDND_InsertXDNDData(property, - RegisterClipboardFormatA("HTML Format"), dostext, strlen(dostext)); - - TRACE("HTML Format: %s\n", dostext); - - return 1; -} - - -/************************************************************************** * X11DRV_XDND_SendDropFiles */ static void X11DRV_XDND_SendDropFiles(HWND hwnd)

1 0

Damjan Jovanovic : winex11.drv: text/html should be imported as CF_HTML (" HTML Format"), not CFSTR_INETURL ("UniformResourceLocator").
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: d0360402f0bf9d50df862a2ebf13498f7e0a0d6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0360402f0bf9d50df862a2eb… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue May 27 02:21:40 2014 +0200 winex11.drv: text/html should be imported as CF_HTML ("HTML Format"), not CFSTR_INETURL ("UniformResourceLocator"). --- dlls/winex11.drv/xdnd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index dbe87e8..5ed0787 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -697,9 +697,9 @@ static int X11DRV_XDND_DeconstructTextHTML(int property, void* data, int len) X11DRV_XDND_UnixToDos(&dostext, data, len); X11DRV_XDND_InsertXDNDData(property, - RegisterClipboardFormatA("UniformResourceLocator"), dostext, strlen(dostext)); + RegisterClipboardFormatA("HTML Format"), dostext, strlen(dostext)); - TRACE("UniformResourceLocator: %s\n", dostext); + TRACE("HTML Format: %s\n", dostext); return 1; }

1 0

Henri Verbeet : ddraw: Properly support creating compressed user memory surfaces.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: b0f1feb4f068e4181f3be5621f2e0f68974e6355 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0f1feb4f068e4181f3be5621… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 12 11:52:31 2014 +0200 ddraw: Properly support creating compressed user memory surfaces. --- dlls/ddraw/ddraw_private.h | 7 +++ dlls/ddraw/surface.c | 105 ++++++++++++++++++++++++++++++------------- dlls/ddraw/tests/ddraw4.c | 106 ++++++++++++++++++++++++++++++++++++++++---- dlls/ddraw/tests/ddraw7.c | 106 ++++++++++++++++++++++++++++++++++++++++---- 4 files changed, 276 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b0f1feb4f068e4181f3be…

1 0

Henri Verbeet : ddraw: Clear DDSD_PITCH on compressed surfaces.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: 92ea79a198d315777a9876fb88f557192e48615a URL: http://source.winehq.org/git/wine.git/?a=commit;h=92ea79a198d315777a9876fb8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 12 11:52:29 2014 +0200 ddraw: Clear DDSD_PITCH on compressed surfaces. --- dlls/ddraw/surface.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index a326404..21ca19f 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -6118,7 +6118,8 @@ HRESULT ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, s || wined3d_desc.format == WINED3DFMT_DXT3 || wined3d_desc.format == WINED3DFMT_DXT4 || wined3d_desc.format == WINED3DFMT_DXT5) { - surface->surface_desc.dwFlags |= DDSD_LINEARSIZE; + desc->dwFlags |= DDSD_LINEARSIZE; + desc->dwFlags &= ~DDSD_PITCH; if (wined3d_desc.format == WINED3DFMT_DXT1) surface->surface_desc.u1.dwLinearSize = max(4, desc->dwWidth) * max(4, desc->dwHeight) / 2; else

1 0

Jacek Caban : jscript: Added accessing not existing property on IDispatchEx tests.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: cbe63d977c8e90a0d384a944f54410874ad6ac67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbe63d977c8e90a0d384a944f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 12 10:44:03 2014 +0200 jscript: Added accessing not existing property on IDispatchEx tests. --- dlls/jscript/tests/run.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index dbd9b6b..f6d600a 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -101,6 +101,7 @@ DEFINE_EXPECT(testobj_withprop_i); DEFINE_EXPECT(testobj_noprop_d); DEFINE_EXPECT(testobj_onlydispid_d); DEFINE_EXPECT(testobj_onlydispid_i); +DEFINE_EXPECT(testobj_notexists_d); DEFINE_EXPECT(GetItemInfo_testVal); DEFINE_EXPECT(ActiveScriptSite_OnScriptError); DEFINE_EXPECT(invoke_func); @@ -327,6 +328,11 @@ static HRESULT WINAPI testObj_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD *pid = DISPID_TESTOBJ_ONLYDISPID; return S_OK; } + if(!strcmp_wa(bstrName, "notExists")) { + CHECK_EXPECT(testobj_notexists_d); + test_grfdex(grfdex, fdexNameCaseSensitive); + return DISP_E_UNKNOWNNAME; + } ok(0, "unexpected name %s\n", wine_dbgstr_w(bstrName)); return E_NOTIMPL; @@ -2055,6 +2061,10 @@ static BOOL run_tests(void) parse_script_a("var notExists; notExists = 1;"); CHECK_CALLED(global_notexists_d); + SET_EXPECT(testobj_notexists_d); + parse_script_a("testObj.notExists;"); + CHECK_CALLED(testobj_notexists_d); + parse_script_a("function f() { var testPropGet; }"); parse_script_a("(function () { var testPropGet; })();"); parse_script_a("(function () { eval('var testPropGet;'); })();");

1 0

Piotr Caban : msvcp70: Export operators working on basic_string.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: 84bf97087db1f023beba8fb783d71ef7da162304 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84bf97087db1f023beba8fb78… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 12 10:37:08 2014 +0200 msvcp70: Export operators working on basic_string. --- dlls/msvcp70/msvcp70.spec | 102 ++++++++++++++++++++++----------------------- dlls/msvcp90/string.c | 53 +++++++++++++++++++++++ 2 files changed, 104 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=84bf97087db1f023beba8…

1 0

Shuai Meng : vbscript: Implemented CDbl.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: cde73e3a5eb8ae6d35c342eebd806c31641aeb29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cde73e3a5eb8ae6d35c342eeb… Author: Shuai Meng <mengshuaicalendr(a)gmail.com> Date: Mon Jun 2 08:15:34 2014 +0800 vbscript: Implemented CDbl. --- dlls/vbscript/global.c | 20 ++++++++++++++++-- dlls/vbscript/tests/api.vbs | 48 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index f8c875d..68b7638 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -470,8 +470,24 @@ static HRESULT Global_CDate(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VAR static HRESULT Global_CDbl(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + VARIANT v; + HRESULT hres; + + TRACE("%s\n", debugstr_variant(arg)); + + assert(args_cnt == 1); + + V_VT(&v) = VT_EMPTY; + hres = VariantChangeType(&v, arg, 0, VT_R8); + if(FAILED(hres)) + return hres; + + if(!res) + return DISP_E_BADVARTYPE; + else { + *res = v; + return S_OK; + } } static HRESULT Global_CSng(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 46c80d4..c9ae774 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -634,4 +634,52 @@ MyObject.myval = 0 Call ok(CCur(MyObject) = 0, "CCur(MyObject) = " & CCur(MyObject)) Call ok(getVT(CCur(MyObject)) = "VT_CY", "getVT(CCur(MyObject)) = " & getVT(CCur(MyObject))) +Sub testCDblError(strings, error_num1, error_num2) + on error resume next + Dim x + + Call Err.clear() + x = CDbl(strings) + Call ok(Err.number = error_num1, "Err.number = " & Err.number) + + Call Err.clear() + Call CDbl(strings) + Call ok(Err.number = error_num2, "Err.number = " & Err.number) +End Sub + +Call ok(CDbl(Empty) = 0, "CDbl(Empty) = " & CDbl(Empty)) +Call ok(getVT(CDbl(Empty)) = "VT_R8", "getVT(CDbl(Empty)) = " & getVT(CDbl(Empty))) +Call ok(CDbl(CByte(0)) = 0, "CDbl(CByte(0)) = " & CDbl(CByte(0))) +Call ok(getVT(CDbl(CCur(0))) = "VT_R8", "getVT(CDbl(CCur(0))) = " & getVT(CDbl(CCur(0)))) +Call ok(CDbl(CCur(0)) = 0, "CDbl(CCur(0)) = " & CDbl(CCur(0))) +Call ok(getVT(CDbl(CCur(0))) = "VT_R8", "getVT(CDbl(CCur(0))) = " & getVT(CDbl(CCur(0)))) +Call ok(CDbl(0) = 0, "CDbl(0) = " & CDbl(0)) +Call ok(getVT(CDbl(0)) = "VT_R8", "getVT(CDbl(0)) = " & getVT(CDbl(0))) +Call ok(CDbl(32768) = 32768, "CDbl(32768) = " & CDbl(32768)) +Call ok(getVT(CDbl(32768)) = "VT_R8", "getVT(CDbl(32768)) = " & getVT(CDbl(32768))) +Call ok(CDbl(0.001 * 0.001) = 0.000001, "CDbl(0.001 * 0.001) = " & CDbl(0.001 * 0.001)) +Call ok(getVT(CDbl(0.001 * 0.001)) = "VT_R8", "getVT(CDbl(0.001 * 0.001)) = " & getVT(CDbl(0.001 * 0.001))) +Call ok(CDbl("-1") = -1, "CDbl(""-1"") = " & CDbl("-1")) +Call ok(getVT(CDbl("-1")) = "VT_R8", "getVT(CDbl(""-1"")) = " & getVT(CDbl("-1"))) +If isEnglishLang Then + Call ok(CDbl("-0.5") = -0.5, "CDbl(""-0.5"") = " & CDbl("-0.5")) + Call ok(getVT(CDbl("-0.5")) = "VT_R8", "getVT(CDbl(""-0.5"")) = " & getVT(CDbl("-0.5"))) +End If +Call testCDblError("", 13, 13) +Call testCDblError("TRUE", 13, 13) +Call testCDblError("FALSE", 13, 13) +Call testCDblError("#TRue#", 13, 13) +Call testCDblError("#fAlSE#", 13, 13) +Call testCDblError(1, 0, 458) +Call ok(CDbl(True) = -1, "CDbl(True) = " & CDbl(True)) +Call ok(getVT(CDbl(True)) = "VT_R8", "getVT(CDbl(True)) = " & getVT(CDbl(True))) +Call ok(CDbl(False) = 0, "CDbl(False) = " & CDbl(False)) +Call ok(getVT(CDbl(False)) = "VT_R8", "getVT(CDbl(False)) = " & getVT(CDbl(False))) +MyObject.myval = 0.1 +Call ok(CDbl(MyObject) = 0.1, "CDbl(MyObject) = " & CDbl(MyObject)) +Call ok(getVT(CDbl(MyObject)) = "VT_R8", "getVT(CDbl(MyObject)) = " & getVT(CDbl(MyObject))) +MyObject.myval = 0 +Call ok(CDbl(MyObject) = 0, "CDbl(MyObject) = " & CDbl(MyObject)) +Call ok(getVT(CDbl(MyObject)) = "VT_R8", "getVT(CDbl(MyObject)) = " & getVT(CDbl(MyObject))) + Call reportSuccess()

1 0

Bruno Jesus : kernel32: Limit the environment variable size to 32767 in GetEnvironmentVariable.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: 515b8bebb6dfdf173f65beda6eb5f62f7e84c87d URL: http://source.winehq.org/git/wine.git/?a=commit;h=515b8bebb6dfdf173f65beda6… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri May 30 21:59:08 2014 -0300 kernel32: Limit the environment variable size to 32767 in GetEnvironmentVariable. --- dlls/kernel32/environ.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/kernel32/environ.c b/dlls/kernel32/environ.c index b6b3124..14283f8 100644 --- a/dlls/kernel32/environ.c +++ b/dlls/kernel32/environ.c @@ -176,6 +176,8 @@ DWORD WINAPI GetEnvironmentVariableA( LPCSTR name, LPSTR value, DWORD size ) return 0; } + /* limit the size to sane values */ + size = min(size, 32767); if (!(valueW = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)))) return 0;

1 0

Damjan Jovanovic : winex11.drv: Use the clipboard functions and formats to import selections that XDND doesn 't support.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: e339e0d476a8eae572493a7c83f6f972b41793f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e339e0d476a8eae572493a7c8… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue May 27 02:22:07 2014 +0200 winex11.drv: Use the clipboard functions and formats to import selections that XDND doesn't support. --- dlls/winex11.drv/clipboard.c | 18 ++++++++++++++++++ dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/xdnd.c | 26 +++++++++++++++++++++++--- 3 files changed, 42 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 730b6c9..350eeab 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -1519,6 +1519,24 @@ static HANDLE X11DRV_CLIPBOARD_ImportClipboardData(Display *display, Window w, A return hClipData; } +/************************************************************************** + * X11DRV_CLIPBOARD_ImportSelection + * + * Import the X selection into the clipboard format registered for the given X target. + */ +HANDLE X11DRV_CLIPBOARD_ImportSelection(Display *d, Atom target, Window w, Atom prop, UINT *windowsFormat) +{ + WINE_CLIPFORMAT *clipFormat; + + clipFormat = X11DRV_CLIPBOARD_LookupProperty(NULL, target); + if (clipFormat) + { + *windowsFormat = clipFormat->wFormatID; + return clipFormat->lpDrvImportFunc(d, w, prop); + } + return NULL; +} + /************************************************************************** X11DRV_CLIPBOARD_ExportClipboardData diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 7a3374d..bcbfe14 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -238,6 +238,7 @@ extern void X11DRV_XDND_EnterEvent( HWND hWnd, XClientMessageEvent *event ) DECL extern void X11DRV_XDND_PositionEvent( HWND hWnd, XClientMessageEvent *event ) DECLSPEC_HIDDEN; extern void X11DRV_XDND_DropEvent( HWND hWnd, XClientMessageEvent *event ) DECLSPEC_HIDDEN; extern void X11DRV_XDND_LeaveEvent( HWND hWnd, XClientMessageEvent *event ) DECLSPEC_HIDDEN; +extern HANDLE X11DRV_CLIPBOARD_ImportSelection(Display *d, Atom target, Window w, Atom prop, UINT *windowsFormat) DECLSPEC_HIDDEN; /************************************************************************** * X11 GDI driver diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index 4db938f..3941900 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -75,7 +75,7 @@ static void X11DRV_XDND_InsertXDNDData(int property, int format, void* data, uns static int X11DRV_XDND_DeconstructTextURIList(int property, void* data, int len); static int X11DRV_XDND_DeconstructTextPlain(int property, void* data, int len); static int X11DRV_XDND_DeconstructTextHTML(int property, void* data, int len); -static void X11DRV_XDND_MapFormat(unsigned int property, unsigned char *data, int len); +static void X11DRV_XDND_MapFormat(Display *display, Window xwin, unsigned int property, unsigned char *data, int len); static void X11DRV_XDND_ResolveProperty(Display *display, Window xwin, Time tm, Atom *types, unsigned long count); static void X11DRV_XDND_SendDropFiles(HWND hwnd); @@ -497,7 +497,7 @@ static void X11DRV_XDND_ResolveProperty(Display *display, Window xwin, Time tm, XGetWindowProperty(display, xwin, x11drv_atom(XdndTarget), 0, 65535, FALSE, AnyPropertyType, &acttype, &actfmt, &icount, &bytesret, &data); - X11DRV_XDND_MapFormat(types[i], data, get_property_size( actfmt, icount )); + X11DRV_XDND_MapFormat(display, xwin, types[i], data, get_property_size( actfmt, icount )); XFree(data); } @@ -554,7 +554,7 @@ static void X11DRV_XDND_InsertXDNDData(int property, int format, void* data, uns * * Map XDND MIME format to windows clipboard format. */ -static void X11DRV_XDND_MapFormat(unsigned int property, unsigned char *data, int len) +static void X11DRV_XDND_MapFormat(Display *display, Window xwin, unsigned int property, unsigned char *data, int len) { void* xdata; @@ -571,6 +571,26 @@ static void X11DRV_XDND_MapFormat(unsigned int property, unsigned char *data, in X11DRV_XDND_DeconstructTextPlain(property, data, len); else if (property == x11drv_atom(text_html)) X11DRV_XDND_DeconstructTextHTML(property, data, len); + else + { + /* use the clipboard import functions for other types */ + HANDLE *contents; + UINT windowsFormat; + contents = X11DRV_CLIPBOARD_ImportSelection(display, property, xwin, x11drv_atom(XdndTarget), &windowsFormat); + if (contents) + { + void *data = HeapAlloc(GetProcessHeap(), 0, GlobalSize(contents)); + if (data) + { + memcpy(data, GlobalLock(contents), GlobalSize(contents)); + GlobalUnlock(contents); + X11DRV_XDND_InsertXDNDData(property, windowsFormat, data, GlobalSize(contents)); + } + else + ERR("out of memory\n"); + GlobalFree(contents); + } + } }

1 0

Bruno Jesus : ws2_32/tests: Initialize a test buffer (valgrind).
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: 79d29e2347b7d1780bc1b71f2dd6c64e564f6e61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79d29e2347b7d1780bc1b71f2… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Jun 12 01:30:38 2014 -0300 ws2_32/tests: Initialize a test buffer (valgrind). --- dlls/ws2_32/tests/sock.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 0bbce27..fb5ee1d 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -6833,6 +6833,7 @@ static void test_completion_port(void) GUID acceptExGuid = WSAID_ACCEPTEX; LPFN_ACCEPTEX pAcceptEx = NULL; + memset(buf, 0, sizeof(buf)); previous_port = CreateIoCompletionPort(INVALID_HANDLE_VALUE, NULL, 0, 0); ok( previous_port != NULL, "Failed to create completion port %u\n", GetLastError());

1 0

Henri Verbeet : ddraw/tests: 64-bit ddraw only has DWORD surface pitch alignment in some cases.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: 7e33bc7a473578dfbf6c53b2f70b993ca20706e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e33bc7a473578dfbf6c53b2f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 12 11:52:27 2014 +0200 ddraw/tests: 64-bit ddraw only has DWORD surface pitch alignment in some cases. --- dlls/ddraw/tests/ddraw1.c | 32 +++++++++++++---------- dlls/ddraw/tests/ddraw2.c | 32 +++++++++++++---------- dlls/ddraw/tests/ddraw4.c | 62 +++++++++++++++++++++++++-------------------- dlls/ddraw/tests/ddraw7.c | 62 +++++++++++++++++++++++++-------------------- 4 files changed, 106 insertions(+), 82 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7e33bc7a473578dfbf6c5…

1 0

Damjan Jovanovic : winex11.drv: Use the global memory functions to allocate the memory for STGMEDIUM' s hGlobal.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: 8e32b5f8870ce9ffa7097c985f328e011513d5e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e32b5f8870ce9ffa7097c985… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue May 27 02:21:53 2014 +0200 winex11.drv: Use the global memory functions to allocate the memory for STGMEDIUM's hGlobal. --- dlls/winex11.drv/xdnd.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index eb98215..4db938f 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -977,10 +977,11 @@ static HRESULT WINAPI XDNDDATAOBJECT_GetData(IDataObject *dataObject, if (current->cf_win == formatEtc->cfFormat) { pMedium->tymed = TYMED_HGLOBAL; - pMedium->u.hGlobal = HeapAlloc(GetProcessHeap(), 0, current->size); + pMedium->u.hGlobal = GlobalAlloc(GMEM_FIXED | GMEM_ZEROINIT, current->size); if (pMedium->u.hGlobal == NULL) return E_OUTOFMEMORY; - memcpy(pMedium->u.hGlobal, current->data, current->size); + memcpy(GlobalLock(pMedium->u.hGlobal), current->data, current->size); + GlobalUnlock(pMedium->u.hGlobal); pMedium->pUnkForRelease = 0; return S_OK; }

1 0

Henri Verbeet : ddraw: Use wined3d_surface_get_pitch() to calculate dwLinearSize for compressed surfaces.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: e2d9cb69ba9a8b7e4e909ab5a26fb40843f71391 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2d9cb69ba9a8b7e4e909ab5a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 12 11:52:30 2014 +0200 ddraw: Use wined3d_surface_get_pitch() to calculate dwLinearSize for compressed surfaces. --- dlls/ddraw/surface.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 21ca19f..4ffad8f 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -6120,10 +6120,7 @@ HRESULT ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, s { desc->dwFlags |= DDSD_LINEARSIZE; desc->dwFlags &= ~DDSD_PITCH; - if (wined3d_desc.format == WINED3DFMT_DXT1) - surface->surface_desc.u1.dwLinearSize = max(4, desc->dwWidth) * max(4, desc->dwHeight) / 2; - else - surface->surface_desc.u1.dwLinearSize = max(4, desc->dwWidth) * max(4, desc->dwHeight); + desc->u1.dwLinearSize = wined3d_surface_get_pitch(wined3d_surface) * ((desc->dwHeight + 3) / 4); } else if (!(desc->dwFlags & DDSD_LPSURFACE)) {

1 0

Henri Verbeet : ddraw: Clear DDSD_LINEARSIZE on uncompressed surfaces.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: 64a5dc11bf20b8a4b8a581657912bea3d713598e URL: http://source.winehq.org/git/wine.git/?a=commit;h=64a5dc11bf20b8a4b8a581657… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 12 11:52:28 2014 +0200 ddraw: Clear DDSD_LINEARSIZE on uncompressed surfaces. --- dlls/ddraw/surface.c | 3 ++- dlls/ddraw/tests/ddraw1.c | 4 +++- dlls/ddraw/tests/ddraw2.c | 4 +++- dlls/ddraw/tests/ddraw4.c | 10 +++++++++- dlls/ddraw/tests/ddraw7.c | 10 +++++++++- 5 files changed, 26 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 3f230a2..a326404 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -6127,6 +6127,7 @@ HRESULT ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, s else if (!(desc->dwFlags & DDSD_LPSURFACE)) { desc->dwFlags |= DDSD_PITCH; + desc->dwFlags &= ~DDSD_LINEARSIZE; desc->u1.lPitch = wined3d_surface_get_pitch(wined3d_surface); } @@ -6147,7 +6148,7 @@ HRESULT ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, s return hr; } - desc->dwFlags &= ~DDSD_LPSURFACE; + desc->dwFlags &= ~(DDSD_LPSURFACE | DDSD_LINEARSIZE); } wined3d_surface_incref(wined3d_surface); diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index df74488..c5198f5 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -4522,12 +4522,14 @@ static void test_create_surface_pitch(void) DDSD_PITCH, 0x100, 0x0fc}, {DDSCAPS_SYSTEMMEMORY, DDSD_PITCH, 0x0f8, DD_OK, DDSD_PITCH, 0x100, 0x0fc}, + {DDSCAPS_SYSTEMMEMORY, DDSD_PITCH | DDSD_LINEARSIZE, 0, DD_OK, + DDSD_PITCH, 0x100, 0x0fc}, {DDSCAPS_SYSTEMMEMORY, DDSD_LPSURFACE, 0, DDERR_INVALIDPARAMS, 0, 0, 0 }, {DDSCAPS_SYSTEMMEMORY, DDSD_LPSURFACE | DDSD_PITCH, 0x100, DDERR_INVALIDPARAMS, 0, 0, 0 }, }; - DWORD flags_mask = DDSD_PITCH | DDSD_LPSURFACE; + DWORD flags_mask = DDSD_PITCH | DDSD_LPSURFACE | DDSD_LINEARSIZE; window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, 0, 0, 640, 480, 0, 0, 0, 0); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 2ca7047..f07a1bd 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -5598,12 +5598,14 @@ static void test_create_surface_pitch(void) DDSD_PITCH, 0x100, 0x0fc}, {DDSCAPS_SYSTEMMEMORY, DDSD_PITCH, 0x0f8, DD_OK, DDSD_PITCH, 0x100, 0x0fc}, + {DDSCAPS_SYSTEMMEMORY, DDSD_PITCH | DDSD_LINEARSIZE, 0, DD_OK, + DDSD_PITCH, 0x100, 0x0fc}, {DDSCAPS_SYSTEMMEMORY, DDSD_LPSURFACE, 0, DDERR_INVALIDPARAMS, 0, 0, 0 }, {DDSCAPS_SYSTEMMEMORY, DDSD_LPSURFACE | DDSD_PITCH, 0x100, DDERR_INVALIDPARAMS, 0, 0, 0 }, }; - DWORD flags_mask = DDSD_PITCH | DDSD_LPSURFACE; + DWORD flags_mask = DDSD_PITCH | DDSD_LPSURFACE | DDSD_LINEARSIZE; window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, 0, 0, 640, 480, 0, 0, 0, 0); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index ec53ae6..b515acc 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -6493,6 +6493,8 @@ static void test_create_surface_pitch(void) DDSD_PITCH, 0x100, 0x0fc}, {DDSCAPS_SYSTEMMEMORY, DDSD_PITCH, 0x0f8, DD_OK, DDSD_PITCH, 0x100, 0x0fc}, + {DDSCAPS_SYSTEMMEMORY, DDSD_PITCH | DDSD_LINEARSIZE, 0, DD_OK, + DDSD_PITCH, 0x100, 0x0fc}, {DDSCAPS_SYSTEMMEMORY, DDSD_LPSURFACE, 0, DDERR_INVALIDPARAMS, 0, 0, 0 }, {DDSCAPS_SYSTEMMEMORY, DDSD_LPSURFACE | DDSD_PITCH, 0x100, DD_OK, @@ -6503,8 +6505,14 @@ static void test_create_surface_pitch(void) DDSD_PITCH, 0x0fc, 0x0fc}, {DDSCAPS_SYSTEMMEMORY, DDSD_LPSURFACE | DDSD_PITCH, 0x0f8, DDERR_INVALIDPARAMS, 0, 0, 0 }, + {DDSCAPS_SYSTEMMEMORY, DDSD_LPSURFACE | DDSD_LINEARSIZE, 0x100, DDERR_INVALIDPARAMS, + 0, 0, 0 }, + {DDSCAPS_SYSTEMMEMORY, DDSD_LPSURFACE | DDSD_LINEARSIZE, 0x3f00, DDERR_INVALIDPARAMS, + 0, 0, 0 }, + {DDSCAPS_SYSTEMMEMORY, DDSD_LPSURFACE | DDSD_PITCH | DDSD_LINEARSIZE, 0x100, DD_OK, + DDSD_PITCH, 0x100, 0x100}, }; - DWORD flags_mask = DDSD_PITCH | DDSD_LPSURFACE; + DWORD flags_mask = DDSD_PITCH | DDSD_LPSURFACE | DDSD_LINEARSIZE; window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, 0, 0, 640, 480, 0, 0, 0, 0); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index c90d89b..7ed2f00 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -6316,6 +6316,8 @@ static void test_create_surface_pitch(void) DDSD_PITCH, 0x100, 0x0fc}, {DDSCAPS_SYSTEMMEMORY, DDSD_PITCH, 0x0f8, DD_OK, DDSD_PITCH, 0x100, 0x0fc}, + {DDSCAPS_SYSTEMMEMORY, DDSD_PITCH | DDSD_LINEARSIZE, 0, DD_OK, + DDSD_PITCH, 0x100, 0x0fc}, {DDSCAPS_SYSTEMMEMORY, DDSD_LPSURFACE, 0, DDERR_INVALIDPARAMS, 0, 0, 0 }, {DDSCAPS_SYSTEMMEMORY, DDSD_LPSURFACE | DDSD_PITCH, 0x100, DD_OK, @@ -6326,8 +6328,14 @@ static void test_create_surface_pitch(void) DDSD_PITCH, 0x0fc, 0x0fc}, {DDSCAPS_SYSTEMMEMORY, DDSD_LPSURFACE | DDSD_PITCH, 0x0f8, DDERR_INVALIDPARAMS, 0, 0, 0 }, + {DDSCAPS_SYSTEMMEMORY, DDSD_LPSURFACE | DDSD_LINEARSIZE, 0x100, DDERR_INVALIDPARAMS, + 0, 0, 0 }, + {DDSCAPS_SYSTEMMEMORY, DDSD_LPSURFACE | DDSD_LINEARSIZE, 0x3f00, DDERR_INVALIDPARAMS, + 0, 0, 0 }, + {DDSCAPS_SYSTEMMEMORY, DDSD_LPSURFACE | DDSD_PITCH | DDSD_LINEARSIZE, 0x100, DD_OK, + DDSD_PITCH, 0x100, 0x100}, }; - DWORD flags_mask = DDSD_PITCH | DDSD_LPSURFACE; + DWORD flags_mask = DDSD_PITCH | DDSD_LPSURFACE | DDSD_LINEARSIZE; window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, 0, 0, 640, 480, 0, 0, 0, 0);

1 0

Shuai Meng : vbscript: Fixed CInt.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: 89dd8401b3d11ec57c087862f710c5ca0594188f URL: http://source.winehq.org/git/wine.git/?a=commit;h=89dd8401b3d11ec57c087862f… Author: Shuai Meng <mengshuaicalendr(a)gmail.com> Date: Mon Jun 2 08:17:54 2014 +0800 vbscript: Fixed CInt. --- dlls/vbscript/global.c | 12 ++++++--- dlls/vbscript/tests/api.vbs | 59 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 1eaf377..294004b 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -398,18 +398,24 @@ static HRESULT Global_CCur(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARI static HRESULT Global_CInt(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - int val; + VARIANT v; HRESULT hres; TRACE("%s\n", debugstr_variant(arg)); assert(args_cnt == 1); - hres = to_int(arg, &val); + V_VT(&v) = VT_EMPTY; + hres = VariantChangeType(&v, arg, 0, VT_I2); if(FAILED(hres)) return hres; - return return_int(res, val); + if(!res) + return DISP_E_BADVARTYPE; + else { + *res = v; + return S_OK; + } } static HRESULT Global_CLng(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 1ba1cb7..2aad761 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -738,4 +738,63 @@ MyObject.myval = 0 Call ok(CLng(MyObject) = 0, "CLng(MyObject) = " & CLng(MyObject)) Call ok(getVT(CLng(MyObject)) = "VT_I4", "getVT(CLng(MyObject)) = " & getVT(CLng(MyObject))) +Sub testCIntError(strings, error_num1, error_num2) + on error resume next + Dim x + + Call Err.clear() + x = CInt(strings) + Call ok(Err.number = error_num1, "Err.number = " & Err.number) + + Call Err.clear() + Call CInt(strings) + Call ok(Err.number = error_num2, "Err.number = " & Err.number) +End Sub + +Call ok(CInt(Empty) = 0, "CInt(Empty) = " & CInt(Empty)) +Call ok(getVT(CInt(Empty)) = "VT_I2", "getVT(CInt(Empty)) = " & getVT(CInt(Empty))) +Call ok(CInt(CByte(0)) = 0, "CInt(CByte(0)) = " & CInt(CByte(0))) +Call ok(getVT(CInt(CByte(0))) = "VT_I2", "getVT(CInt(CByte(0))) = " & getVT(CInt(CByte(0)))) +Call ok(CInt(CCur(0)) = 0, "CInt(CCur(0)) = " & CInt(CCur(0))) +Call ok(getVT(CInt(CCur(0))) = "VT_I2", "getVT(CInt(CCur(0))) = " & getVT(CInt(CCur(0)))) +Call ok(CInt(0.49) = 0, "CInt(0.49) = " & CInt(0.49)) +Call ok(getVT(CInt(0.49)) = "VT_I2", "getVT(CInt(0.49)) = " & getVT(CInt(0.49))) +Call ok(CInt(0.5) = 0, "CInt(0.5) = " & CInt(0.5)) +Call ok(getVT(CInt(0.5)) = "VT_I2", "getVT(CInt(0.5)) = " & getVT(CInt(0.5))) +Call ok(CInt(0.51) = 1, "CInt(0.51) = " & CInt(0.51)) +Call ok(getVT(CInt(0.51)) = "VT_I2", "getVT(CInt(0.51)) = " & getVT(CInt(0.51))) +Call ok(CInt(1.49) = 1, "CInt(0.49) = " & CInt(0.49)) +Call ok(getVT(CInt(0.49)) = "VT_I2", "getVT(CInt(0.49)) = " & getVT(CInt(0.49))) +Call ok(CInt(1.5) = 2, "CInt(1.5) = " & CInt(1.5)) +Call ok(getVT(CInt(1.5)) = "VT_I2", "getVT(CInt(1.5)) = " & getVT(CInt(1.5))) +Call ok(CInt(1.51) = 2, "CInt(1.51) = " & CInt(1.51)) +Call ok(getVT(CInt(1.51)) = "VT_I2", "getVT(CInt(1.51)) = " & getVT(CInt(1.51))) +Call ok(CInt("-1") = -1, "CInt(""-1"") = " & CInt("-1")) +Call ok(getVT(CInt("-1")) = "VT_I2", "getVT(CInt(""-1"")) = " & getVT(CInt("-1"))) +If isEnglishLang Then + Call ok(CInt("-0.5") = 0, "CInt(""-0.5"") = " & CInt("-0.5")) + Call ok(getVT(CInt("-0.5")) = "VT_I2", "getVT(CInt(""-0.5"")) = " & getVT(CInt("-0.5"))) +End If +Call testCIntError("", 13, 13) +Call testCIntError("-1", 0, 458) +Call testCIntError("TRUE", 13, 13) +Call testCIntError("FALSE", 13, 13) +Call testCIntError("#TRue#", 13, 13) +Call testCIntError("#fAlSE#", 13, 13) +Call testCIntError(1, 0, 458) +Call testCIntError(32767.49, 0, 458) +Call testCIntError(32767.5, 6, 6) +Call testCIntError(-32768.5, 0, 458) +Call testCIntError(-32768.51, 6, 6) +Call ok(CInt(True) = -1, "CInt(True) = " & CInt(True)) +Call ok(getVT(CInt(True)) = "VT_I2", "getVT(CInt(True)) = " & getVT(CInt(True))) +Call ok(CInt(False) = 0, "CInt(False) = " & CInt(False)) +Call ok(getVT(CInt(False)) = "VT_I2", "getVT(CInt(False)) = " & getVT(CInt(False))) +MyObject.myval = 2.5 +Call ok(CInt(MyObject) = 2, "CInt(MyObject) = " & CInt(MyObject)) +Call ok(getVT(CInt(MyObject)) = "VT_I2", "getVT(CInt(MyObject)) = " & getVT(CInt(MyObject))) +MyObject.myval = 1.5 +Call ok(CInt(MyObject) = 2, "CInt(MyObject) = " & CInt(MyObject)) +Call ok(getVT(CInt(MyObject)) = "VT_I2", "getVT(CInt(MyObject)) = " & getVT(CInt(MyObject))) + Call reportSuccess()

1 0

Shuai Meng : vbscript: Implemented CLng.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: ded01d657e96599bfbc260427a7687602ca4809d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ded01d657e96599bfbc260427… Author: Shuai Meng <mengshuaicalendr(a)gmail.com> Date: Mon Jun 2 08:16:43 2014 +0800 vbscript: Implemented CLng. --- dlls/vbscript/global.c | 20 ++++++++++++++-- dlls/vbscript/tests/api.vbs | 56 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 68b7638..1eaf377 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -414,8 +414,24 @@ static HRESULT Global_CInt(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARI static HRESULT Global_CLng(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + VARIANT v; + HRESULT hres; + + TRACE("%s\n", debugstr_variant(arg)); + + assert(args_cnt == 1); + + V_VT(&v) = VT_EMPTY; + hres = VariantChangeType(&v, arg, 0, VT_I4); + if(FAILED(hres)) + return hres; + + if(!res) + return DISP_E_BADVARTYPE; + else { + *res = v; + return S_OK; + } } static HRESULT Global_CBool(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index c9ae774..1ba1cb7 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -682,4 +682,60 @@ MyObject.myval = 0 Call ok(CDbl(MyObject) = 0, "CDbl(MyObject) = " & CDbl(MyObject)) Call ok(getVT(CDbl(MyObject)) = "VT_R8", "getVT(CDbl(MyObject)) = " & getVT(CDbl(MyObject))) +Sub testCLngError(strings, error_num1, error_num2) + on error resume next + Dim x + + Call Err.clear() + x = CLng(strings) + Call ok(Err.number = error_num1, "Err.number = " & Err.number) + + Call Err.clear() + Call CLng(strings) + Call ok(Err.number = error_num2, "Err.number = " & Err.number) +End Sub + +Call ok(CLng(Empty) = 0, "CLng(Empty) = " & CLng(Empty)) +Call ok(getVT(CLng(Empty)) = "VT_I4", "getVT(CLng(Empty)) = " & getVT(CLng(Empty))) +Call ok(CLng(CByte(0)) = 0, "CLng(CByte(0)) = " & CLng(CByte(0))) +Call ok(getVT(CLng(CCur(0))) = "VT_I4", "getVT(CLng(CCur(0))) = " & getVT(CLng(CCur(0)))) +Call ok(CLng(CCur(0)) = 0, "CLng(CCur(0)) = " & CLng(CCur(0))) +Call ok(getVT(CLng(CCur(0))) = "VT_I4", "getVT(CLng(CCur(0))) = " & getVT(CLng(CCur(0)))) +Call ok(CLng(0) = 0, "CLng(0) = " & CLng(0)) +Call ok(getVT(CLng(0)) = "VT_I4", "getVT(CLng(0)) = " & getVT(CLng(0))) +Call ok(CLng(0.49) = 0, "CLng(0.49) = " & CLng(0.49)) +Call ok(getVT(CLng(0.49)) = "VT_I4", "getVT(CLng(0.49)) = " & getVT(CLng(0.49))) +Call ok(CLng(0.5) = 0, "CLng(0.5) = " & CLng(0.5)) +Call ok(getVT(CLng(0.5)) = "VT_I4", "getVT(CLng(0.5)) = " & getVT(CLng(0.5))) +Call ok(CLng(0.51) = 1, "CLng(0.51) = " & CLng(0.51)) +Call ok(getVT(CLng(0.51)) = "VT_I4", "getVT(CLng(0.51)) = " & getVT(CLng(0.51))) +Call ok(CLng(1.49) = 1, "CLng(1.49) = " & CLng(1.49)) +Call ok(getVT(CLng(1.49)) = "VT_I4", "getVT(CLng(1.49)) = " & getVT(CLng(1.49))) +Call ok(CLng(1.5) = 2, "CLng(1.5) = " & CLng(1.5)) +Call ok(getVT(CLng(1.5)) = "VT_I4", "getVT(CLng(1.5)) = " & getVT(CLng(1.5))) +Call ok(CLng(1.51) = 2, "CLng(1.51) = " & CLng(1.51)) +Call ok(getVT(CLng(1.51)) = "VT_I4", "getVT(CLng(1.51)) = " & getVT(CLng(1.51))) +Call ok(CLng("-1") = -1, "CLng(""-1"") = " & CLng("-1")) +Call ok(getVT(CLng("-1")) = "VT_I4", "getVT(CLng(""-1"")) = " & getVT(CLng("-1"))) +If isEnglishLang Then + Call ok(CLng("-0.5") = 0, "CLng(""-0.5"") = " & CLng("-0.5")) + Call ok(getVT(CLng("-0.5")) = "VT_I4", "getVT(CLng(""-0.5"")) = " & getVT(CLng("-0.5"))) +End If +Call testCLngError("", 13, 13) +Call testCLngError("TRUE", 13, 13) +Call testCLngError("FALSE", 13, 13) +Call testCLngError("#TRue#", 13, 13) +Call testCLngError("#fAlSE#", 13, 13) +Call testCLngError(1, 0, 458) +Call ok(CLng(True) = -1, "CLng(True) = " & CLng(True)) +Call ok(getVT(CLng(True)) = "VT_I4", "getVT(CLng(True)) = " & getVT(CLng(True))) +Call ok(CLng(False) = 0, "CLng(False) = " & CLng(False)) +Call ok(getVT(CLng(False)) = "VT_I4", "getVT(CLng(False)) = " & getVT(CLng(False))) +MyObject.myval = 1 +Call ok(CLng(MyObject) = 1, "CLng(MyObject) = " & CLng(MyObject)) +Call ok(getVT(CLng(MyObject)) = "VT_I4", "getVT(CLng(MyObject)) = " & getVT(CLng(MyObject))) +MyObject.myval = 0 +Call ok(CLng(MyObject) = 0, "CLng(MyObject) = " & CLng(MyObject)) +Call ok(getVT(CLng(MyObject)) = "VT_I4", "getVT(CLng(MyObject)) = " & getVT(CLng(MyObject))) + Call reportSuccess()

1 0

Damjan Jovanovic : winex11.drv: Don' t bother counting how many XDND selections are converted.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: a8499c0803ccace80b1b753a7d53c5969be9743a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8499c0803ccace80b1b753a7… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue May 27 02:21:44 2014 +0200 winex11.drv: Don't bother counting how many XDND selections are converted. --- dlls/winex11.drv/xdnd.c | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index 5ed0787..eb98215 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -75,9 +75,9 @@ static void X11DRV_XDND_InsertXDNDData(int property, int format, void* data, uns static int X11DRV_XDND_DeconstructTextURIList(int property, void* data, int len); static int X11DRV_XDND_DeconstructTextPlain(int property, void* data, int len); static int X11DRV_XDND_DeconstructTextHTML(int property, void* data, int len); -static int X11DRV_XDND_MapFormat(unsigned int property, unsigned char *data, int len); +static void X11DRV_XDND_MapFormat(unsigned int property, unsigned char *data, int len); static void X11DRV_XDND_ResolveProperty(Display *display, Window xwin, Time tm, - Atom *types, unsigned long *count); + Atom *types, unsigned long count); static void X11DRV_XDND_SendDropFiles(HWND hwnd); static void X11DRV_XDND_FreeDragDropOp(void); static unsigned int X11DRV_XDND_UnixToDos(char** lpdest, char* lpsrc, int len); @@ -257,7 +257,7 @@ void X11DRV_XDND_EnterEvent( HWND hWnd, XClientMessageEvent *event ) /* Do a one-time data read and cache results */ X11DRV_XDND_ResolveProperty(event->display, event->window, - event->data.l[1], xdndtypes, &count); + event->data.l[1], xdndtypes, count); if (event->data.l[1] & 1) XFree(xdndtypes); @@ -454,7 +454,7 @@ void X11DRV_XDND_LeaveEvent( HWND hWnd, XClientMessageEvent *event ) * Resolve all MIME types to windows clipboard formats. All data is cached. */ static void X11DRV_XDND_ResolveProperty(Display *display, Window xwin, Time tm, - Atom *types, unsigned long *count) + Atom *types, unsigned long count) { unsigned int i, j; BOOL res; @@ -462,16 +462,15 @@ static void X11DRV_XDND_ResolveProperty(Display *display, Window xwin, Time tm, Atom acttype; int actfmt; unsigned long bytesret, icount; - int entries = 0; unsigned char* data = NULL; XDNDDATA *current, *next; BOOL haveHDROP = FALSE; - TRACE("count(%ld)\n", *count); + TRACE("count(%ld)\n", count); X11DRV_XDND_FreeDragDropOp(); /* Clear previously cached data */ - for (i = 0; i < *count; i++) + for (i = 0; i < count; i++) { TRACE("requesting atom %ld from xwin %ld\n", types[i], xwin); @@ -498,7 +497,7 @@ static void X11DRV_XDND_ResolveProperty(Display *display, Window xwin, Time tm, XGetWindowProperty(display, xwin, x11drv_atom(XdndTarget), 0, 65535, FALSE, AnyPropertyType, &acttype, &actfmt, &icount, &bytesret, &data); - entries += X11DRV_XDND_MapFormat(types[i], data, get_property_size( actfmt, icount )); + X11DRV_XDND_MapFormat(types[i], data, get_property_size( actfmt, icount )); XFree(data); } @@ -522,12 +521,9 @@ static void X11DRV_XDND_ResolveProperty(Display *display, Window xwin, Time tm, list_remove(&current->entry); HeapFree(GetProcessHeap(), 0, current->data); HeapFree(GetProcessHeap(), 0, current); - --entries; } } } - - *count = entries; } @@ -558,10 +554,9 @@ static void X11DRV_XDND_InsertXDNDData(int property, int format, void* data, uns * * Map XDND MIME format to windows clipboard format. */ -static int X11DRV_XDND_MapFormat(unsigned int property, unsigned char *data, int len) +static void X11DRV_XDND_MapFormat(unsigned int property, unsigned char *data, int len) { void* xdata; - int count = 0; TRACE("%d: %s\n", property, data); @@ -569,16 +564,13 @@ static int X11DRV_XDND_MapFormat(unsigned int property, unsigned char *data, int xdata = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); memcpy(xdata, data, len); X11DRV_XDND_InsertXDNDData(property, property, xdata, len); - count++; if (property == x11drv_atom(text_uri_list)) - count += X11DRV_XDND_DeconstructTextURIList(property, data, len); + X11DRV_XDND_DeconstructTextURIList(property, data, len); else if (property == x11drv_atom(text_plain)) - count += X11DRV_XDND_DeconstructTextPlain(property, data, len); + X11DRV_XDND_DeconstructTextPlain(property, data, len); else if (property == x11drv_atom(text_html)) - count += X11DRV_XDND_DeconstructTextHTML(property, data, len); - - return count; + X11DRV_XDND_DeconstructTextHTML(property, data, len); }

1 0

Zhenbo Li : mshtml: Added IHTMLTableRow::insertCell method implementation.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: 48e41c4dd70243ced8412ae911722fdece37e923 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48e41c4dd70243ced8412ae91… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Mon May 26 22:12:50 2014 +0800 mshtml: Added IHTMLTableRow::insertCell method implementation. --- dlls/mshtml/htmltablerow.c | 23 +++++++++++++++++++++-- dlls/mshtml/tests/dom.c | 12 ++++++++++++ 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmltablerow.c b/dlls/mshtml/htmltablerow.c index 731b403..589a38f 100644 --- a/dlls/mshtml/htmltablerow.c +++ b/dlls/mshtml/htmltablerow.c @@ -308,8 +308,27 @@ static HRESULT WINAPI HTMLTableRow_get_cells(IHTMLTableRow *iface, IHTMLElementC static HRESULT WINAPI HTMLTableRow_insertCell(IHTMLTableRow *iface, LONG index, IDispatch **row) { HTMLTableRow *This = impl_from_IHTMLTableRow(iface); - FIXME("(%p)->(%d %p)\n", This, index, row); - return E_NOTIMPL; + nsIDOMHTMLElement *nselem; + HTMLElement *elem; + nsresult nsres; + HRESULT hres; + + TRACE("(%p)->(%d %p)\n", This, index, row); + nsres = nsIDOMHTMLTableRowElement_InsertCell(This->nsrow, index, &nselem); + if(NS_FAILED(nsres)) { + ERR("Insert Cell at %d failed: %08x\n", index, nsres); + return E_FAIL; + } + + hres = HTMLTableCell_Create(This->element.node.doc, nselem, &elem); + nsIDOMHTMLElement_Release(nselem); + if (FAILED(hres)) { + ERR("Create TableCell failed: %08x\n", hres); + return hres; + } + + *row = (IDispatch *)&elem->IHTMLElement_iface; + return S_OK; } static HRESULT WINAPI HTMLTableRow_deleteCell(IHTMLTableRow *iface, LONG index) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index c16e073..4eb02fc 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5737,10 +5737,22 @@ static void _test_tr_possess(unsigned line, IHTMLElement *elem, static void test_tr_modify(IHTMLElement *elem, IHTMLTableRow *row) { HRESULT hres; + IDispatch *disp; + IUnknown *unk; hres = IHTMLTableRow_deleteCell(row, 0); ok(hres == S_OK, "deleteCell failed: %08x\n", hres); test_tr_possess(elem, row, 1, "td2"); + + hres = IHTMLTableRow_insertCell(row, 0, &disp); + ok(hres == S_OK, "insertCell failed: %08x\n", hres); + ok(disp != NULL, "disp == NULL\n"); + hres = IDispatch_QueryInterface(disp, &IID_IHTMLTableCell, (void **)&unk); + ok(hres == S_OK, "Could not get IID_IHTMLTableCell interface: %08x\n", hres); + if (SUCCEEDED(hres)) + IUnknown_Release(unk); + test_tr_possess(elem, row, 2, "td2"); + IDispatch_Release(disp); } static void test_tr_elem(IHTMLElement *elem)

1 0

Vincent Povirk : ole32: Support storage files larger than 4 GB.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: 81079552738be5291e563186e9acbbb22e50bbcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=81079552738be5291e563186e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue May 20 16:08:09 2014 -0500 ole32: Support storage files larger than 4 GB. --- dlls/ole32/stg_stream.c | 4 +- dlls/ole32/storage32.c | 100 ++++++++++++++++++++++------------------------- dlls/ole32/storage32.h | 1 + 3 files changed, 49 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=81079552738be5291e563…

1 0

Felix Janda : dnsapi: stdio.h needs to be included for sprintf().
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: 12e1ff956a058dc1860126f56bd28c052c1cdadf URL: http://source.winehq.org/git/wine.git/?a=commit;h=12e1ff956a058dc1860126f56… Author: Felix Janda <felix.janda(a)posteo.de> Date: Tue Jun 3 22:33:27 2014 +0200 dnsapi: stdio.h needs to be included for sprintf(). --- dlls/dnsapi/query.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dnsapi/query.c b/dlls/dnsapi/query.c index b1d80dd..578239e 100644 --- a/dlls/dnsapi/query.c +++ b/dlls/dnsapi/query.c @@ -24,6 +24,7 @@ #include <stdarg.h> #include <string.h> +#include <stdio.h> #include <sys/types.h> #ifdef HAVE_NETINET_IN_H

1 0

Felix Janda : server: Add missing includes of poll.h.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: e3faab267ca5f2ff78d42b20e5fce7e8b0681163 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3faab267ca5f2ff78d42b20e… Author: Felix Janda <felix.janda(a)posteo.de> Date: Sun Jun 1 11:00:29 2014 +0200 server: Add missing includes of poll.h. --- server/change.c | 3 +++ server/queue.c | 3 +++ server/sock.c | 3 +++ 3 files changed, 9 insertions(+) diff --git a/server/change.c b/server/change.c index f6d56b0..3ac70a4 100644 --- a/server/change.c +++ b/server/change.c @@ -32,6 +32,9 @@ #include <limits.h> #include <dirent.h> #include <errno.h> +#ifdef HAVE_POLL_H +# include <poll.h> +#endif #include "ntstatus.h" #define WIN32_NO_STATUS diff --git a/server/queue.c b/server/queue.c index 57603e1..601629e 100644 --- a/server/queue.c +++ b/server/queue.c @@ -25,6 +25,9 @@ #include <stdarg.h> #include <stdio.h> #include <stdlib.h> +#ifdef HAVE_POLL_H +# include <poll.h> +#endif #include "ntstatus.h" #define WIN32_NO_STATUS diff --git a/server/sock.c b/server/sock.c index 5ffb1fe..4adad0f 100644 --- a/server/sock.c +++ b/server/sock.c @@ -30,6 +30,9 @@ #include <string.h> #include <stdlib.h> #include <errno.h> +#ifdef HAVE_POLL_H +# include <poll.h> +#endif #include <sys/time.h> #include <sys/types.h> #ifdef HAVE_SYS_SOCKET_H

1 0

Michael Stefaniuc : dmloader: COM cleanup for IDirectMusicContainer.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: 9ab1cfb5e0bf943d9533adc2bb4247e3dfe17f76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ab1cfb5e0bf943d9533adc2b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 4 23:34:20 2014 +0200 dmloader: COM cleanup for IDirectMusicContainer. --- dlls/dmloader/container.c | 139 ++++++++++++++++++++++---------------- dlls/dmloader/dmloader_private.h | 21 ------ 2 files changed, 80 insertions(+), 80 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9ab1cfb5e0bf943d9533a…

1 0

Bruno Jesus : wininet: Use a helper to receive data and take care of EINTR.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: 8a15ea1190e898accf851c7a7ef2bb3d033e7925 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a15ea1190e898accf851c7a7… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Jun 12 02:24:45 2014 -0300 wininet: Use a helper to receive data and take care of EINTR. --- dlls/wininet/ftp.c | 8 ++++---- dlls/wininet/internet.c | 2 +- dlls/wininet/internet.h | 1 + dlls/wininet/netconnection.c | 23 +++++++++++++++++------ 4 files changed, 23 insertions(+), 11 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 5576de9..855aee0 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -1195,7 +1195,7 @@ static DWORD FTPFILE_ReadFile(object_header_t *hdr, void *buffer, DWORD size, DW return ERROR_INTERNET_DISCONNECTED; /* FIXME: FTP should use NETCON_ stuff */ - res = recv(file->nDataSocket, buffer, size, MSG_WAITALL); + res = sock_recv(file->nDataSocket, buffer, size, MSG_WAITALL); *read = res>0 ? res : 0; error = res >= 0 ? ERROR_SUCCESS : INTERNET_ERROR_BASE; /* FIXME */ @@ -1234,7 +1234,7 @@ static void FTP_ReceiveRequestData(ftp_file_t *file, BOOL first_notif) TRACE("%p\n", file); - available = recv(file->nDataSocket, buffer, sizeof(buffer), MSG_PEEK); + available = sock_recv(file->nDataSocket, buffer, sizeof(buffer), MSG_PEEK); if(available != -1) { iar.dwResult = (DWORD_PTR)file->hdr.hInternet; @@ -1277,7 +1277,7 @@ static DWORD FTPFILE_QueryDataAvailable(object_header_t *hdr, DWORD *available, *available = 0; - retval = recv(file->nDataSocket, &byte, 1, MSG_PEEK); + retval = sock_recv(file->nDataSocket, &byte, 1, MSG_PEEK); if(retval > 0) { task_header_t *task; @@ -3368,7 +3368,7 @@ static BOOL FTP_RetrieveFileData(ftp_session_t *lpwfs, INT nDataSocket, HANDLE h while (nRC != -1) { - nRC = recv(nDataSocket, lpszBuffer, DATA_PACKET_SIZE, 0); + nRC = sock_recv(nDataSocket, lpszBuffer, DATA_PACKET_SIZE, 0); if (nRC != -1) { /* other side closed socket. */ diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 4389c98..bb46a43 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -3928,7 +3928,7 @@ LPSTR INTERNET_GetNextLine(INT nSocket, LPDWORD dwLen) { if (poll(&pfd,1, RESPONSE_TIMEOUT * 1000) > 0) { - if (recv(nSocket, &lpszBuffer[nRecv], 1, 0) <= 0) + if (sock_recv(nSocket, &lpszBuffer[nRecv], 1, 0) <= 0) { INTERNET_SetLastError(ERROR_FTP_TRANSFER_IN_PROGRESS); goto lend; diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 87369c6..b823e43 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -458,6 +458,7 @@ int NETCON_GetCipherStrength(netconn_t*) DECLSPEC_HIDDEN; DWORD NETCON_set_timeout(netconn_t *connection, BOOL send, DWORD value) DECLSPEC_HIDDEN; int sock_get_error(int) DECLSPEC_HIDDEN; int sock_send(int fd, const void *msg, size_t len, int flags) DECLSPEC_HIDDEN; +int sock_recv(int fd, void *msg, size_t len, int flags) DECLSPEC_HIDDEN; server_t *get_server(const WCHAR*,INTERNET_PORT,BOOL,BOOL); diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 595dd71..483dba4 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -507,6 +507,17 @@ int sock_send(int fd, const void *msg, size_t len, int flags) return ret; } +int sock_recv(int fd, void *msg, size_t len, int flags) +{ + int ret; + do + { + ret = recv(fd, msg, len, flags); + } + while(ret == -1 && errno == EINTR); + return ret; +} + static void set_socket_blocking(int socket, blocking_mode_t mode) { #if defined(__MINGW32__) || defined (_MSC_VER) @@ -596,7 +607,7 @@ static DWORD netcon_secure_connect_setup(netconn_t *connection, BOOL compat_mode read_buf_size += 1024; } - size = recv(connection->socket, read_buf+in_bufs[0].cbBuffer, read_buf_size-in_bufs[0].cbBuffer, 0); + size = sock_recv(connection->socket, read_buf+in_bufs[0].cbBuffer, read_buf_size-in_bufs[0].cbBuffer, 0); if(size < 1) { WARN("recv error\n"); res = ERROR_INTERNET_SECURITY_CHANNEL_ERROR; @@ -799,7 +810,7 @@ static BOOL read_ssl_chunk(netconn_t *conn, void *buf, SIZE_T buf_size, blocking tmp_mode = buf_len ? BLOCKING_DISALLOW : mode; set_socket_blocking(conn->socket, tmp_mode); - size = recv(conn->socket, conn->ssl_buf+buf_len, ssl_buf_size-buf_len, tmp_mode == BLOCKING_ALLOW ? 0 : WINE_MSG_DONTWAIT); + size = sock_recv(conn->socket, conn->ssl_buf+buf_len, ssl_buf_size-buf_len, tmp_mode == BLOCKING_ALLOW ? 0 : WINE_MSG_DONTWAIT); if(size < 0) { if(!buf_len) { if(errno == EAGAIN || errno == EWOULDBLOCK) { @@ -840,7 +851,7 @@ static BOOL read_ssl_chunk(netconn_t *conn, void *buf, SIZE_T buf_size, blocking assert(buf_len < ssl_buf_size); set_socket_blocking(conn->socket, mode); - size = recv(conn->socket, conn->ssl_buf+buf_len, ssl_buf_size-buf_len, mode == BLOCKING_ALLOW ? 0 : WINE_MSG_DONTWAIT); + size = sock_recv(conn->socket, conn->ssl_buf+buf_len, ssl_buf_size-buf_len, mode == BLOCKING_ALLOW ? 0 : WINE_MSG_DONTWAIT); if(size < 1) { if(size < 0 && (errno == EAGAIN || errno == EWOULDBLOCK)) { TRACE("would block\n"); @@ -924,7 +935,7 @@ DWORD NETCON_recv(netconn_t *connection, void *buf, size_t len, blocking_mode_t } set_socket_blocking(connection->socket, mode); - *recvd = recv(connection->socket, buf, len, flags); + *recvd = sock_recv(connection->socket, buf, len, flags); return *recvd == -1 ? sock_get_error(errno) : ERROR_SUCCESS; } else @@ -1012,7 +1023,7 @@ BOOL NETCON_is_alive(netconn_t *netconn) ssize_t len; BYTE b; - len = recv(netconn->socket, &b, 1, MSG_PEEK|MSG_DONTWAIT); + len = sock_recv(netconn->socket, &b, 1, MSG_PEEK|MSG_DONTWAIT); return len == 1 || (len == -1 && errno == EWOULDBLOCK); #elif defined(__MINGW32__) || defined(_MSC_VER) ULONG mode; @@ -1023,7 +1034,7 @@ BOOL NETCON_is_alive(netconn_t *netconn) if(!ioctlsocket(netconn->socket, FIONBIO, &mode)) return FALSE; - len = recv(netconn->socket, &b, 1, MSG_PEEK); + len = sock_recv(netconn->socket, &b, 1, MSG_PEEK); mode = 0; if(!ioctlsocket(netconn->socket, FIONBIO, &mode))

1 0

Nikolay Sivov : explorerframe: Internally make calls with interface wrappers.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: ad4ccd18216e74cb18f30eed13e2a348fe5046f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad4ccd18216e74cb18f30eed1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 11 08:58:40 2014 +0400 explorerframe: Internally make calls with interface wrappers. --- dlls/explorerframe/nstc.c | 34 +++++++++++++++------------------- dlls/explorerframe/tests/nstc.c | 15 +++++++++++++++ 2 files changed, 30 insertions(+), 19 deletions(-) diff --git a/dlls/explorerframe/nstc.c b/dlls/explorerframe/nstc.c index 04f4ec8..9daee8b 100644 --- a/dlls/explorerframe/nstc.c +++ b/dlls/explorerframe/nstc.c @@ -1056,7 +1056,7 @@ static HRESULT WINAPI NSTC2_fnAppendRoot(INameSpaceTreeControl2* iface, root_count = list_count(&This->roots); - return NSTC2_fnInsertRoot(iface, root_count, psiRoot, grfEnumFlags, grfRootStyle, pif); + return INameSpaceTreeControl2_InsertRoot(iface, root_count, psiRoot, grfEnumFlags, grfRootStyle, pif); } static HRESULT WINAPI NSTC2_fnRemoveRoot(INameSpaceTreeControl2* iface, @@ -1101,19 +1101,16 @@ static HRESULT WINAPI NSTC2_fnRemoveAllRoots(INameSpaceTreeControl2* iface) { NSTC2Impl *This = impl_from_INameSpaceTreeControl2(iface); nstc_root *cur1, *cur2; - UINT removed = 0; + TRACE("%p\n", This); + if (list_empty(&This->roots)) + return E_INVALIDARG; + LIST_FOR_EACH_ENTRY_SAFE(cur1, cur2, &This->roots, nstc_root, entry) - { - NSTC2_fnRemoveRoot(iface, cur1->psi); - removed++; - } + INameSpaceTreeControl2_RemoveRoot(iface, cur1->psi); - if(removed) - return S_OK; - else - return E_INVALIDARG; + return S_OK; } static HRESULT WINAPI NSTC2_fnGetRootItems(INameSpaceTreeControl2* iface, @@ -1253,7 +1250,7 @@ static HRESULT WINAPI NSTC2_fnGetSelectedItems(INameSpaceTreeControl2* iface, { NSTC2Impl *This = impl_from_INameSpaceTreeControl2(iface); IShellItem *psiselected; - HRESULT hr; + TRACE("%p (%p)\n", This, psiaItems); psiselected = get_selected_shellitem(This); @@ -1263,9 +1260,8 @@ static HRESULT WINAPI NSTC2_fnGetSelectedItems(INameSpaceTreeControl2* iface, return E_FAIL; } - hr = SHCreateShellItemArrayFromShellItem(psiselected, &IID_IShellItemArray, + return SHCreateShellItemArrayFromShellItem(psiselected, &IID_IShellItemArray, (void**)psiaItems); - return hr; } static HRESULT WINAPI NSTC2_fnGetItemCustomState(INameSpaceTreeControl2* iface, @@ -1553,22 +1549,19 @@ static const INameSpaceTreeControl2Vtbl vt_INameSpaceTreeControl2 = { static HRESULT WINAPI IOW_fnQueryInterface(IOleWindow *iface, REFIID riid, void **ppvObject) { NSTC2Impl *This = impl_from_IOleWindow(iface); - TRACE("%p\n", This); - return NSTC2_fnQueryInterface(&This->INameSpaceTreeControl2_iface, riid, ppvObject); + return INameSpaceTreeControl2_QueryInterface(&This->INameSpaceTreeControl2_iface, riid, ppvObject); } static ULONG WINAPI IOW_fnAddRef(IOleWindow *iface) { NSTC2Impl *This = impl_from_IOleWindow(iface); - TRACE("%p\n", This); - return NSTC2_fnAddRef(&This->INameSpaceTreeControl2_iface); + return INameSpaceTreeControl2_AddRef(&This->INameSpaceTreeControl2_iface); } static ULONG WINAPI IOW_fnRelease(IOleWindow *iface) { NSTC2Impl *This = impl_from_IOleWindow(iface); - TRACE("%p\n", This); - return NSTC2_fnRelease(&This->INameSpaceTreeControl2_iface); + return INameSpaceTreeControl2_Release(&This->INameSpaceTreeControl2_iface); } static HRESULT WINAPI IOW_fnGetWindow(IOleWindow *iface, HWND *phwnd) @@ -1612,6 +1605,9 @@ HRESULT NamespaceTreeControl_Constructor(IUnknown *pUnkOuter, REFIID riid, void EFRAME_LockModule(); nstc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(NSTC2Impl)); + if (!nstc) + return E_OUTOFMEMORY; + nstc->ref = 1; nstc->INameSpaceTreeControl2_iface.lpVtbl = &vt_INameSpaceTreeControl2; nstc->IOleWindow_iface.lpVtbl = &vt_IOleWindow; diff --git a/dlls/explorerframe/tests/nstc.c b/dlls/explorerframe/tests/nstc.c index 1d0c14c..f8c44b6 100644 --- a/dlls/explorerframe/tests/nstc.c +++ b/dlls/explorerframe/tests/nstc.c @@ -1170,6 +1170,11 @@ static void test_basics(void) hr = INameSpaceTreeControl_InsertRoot(pnstc, 5, psidesktop, 0, 0, NULL); ok(hr == S_OK, "Got 0x%08x\n", hr); + roots[0] = psitestdir2; + roots[1] = psidesktop; + roots[2] = psidesktop2; + roots[3] = psitestdir; + roots[4] = psitestdir2; roots[5] = psidesktop; roots[6] = NULL; verify_root_order(pnstc, roots); @@ -1177,6 +1182,9 @@ static void test_basics(void) hr = INameSpaceTreeControl_InsertRoot(pnstc, 3, psitestdir2, 0, 0, NULL); ok(hr == S_OK, "Got 0x%08x\n", hr); + roots[0] = psitestdir2; + roots[1] = psidesktop; + roots[2] = psidesktop2; roots[3] = psitestdir2; roots[4] = psitestdir; roots[5] = psitestdir2; @@ -1187,6 +1195,13 @@ static void test_basics(void) hr = INameSpaceTreeControl_AppendRoot(pnstc, psitestdir2, 0, 0, NULL); ok(hr == S_OK, "Got 0x%08x\n", hr); + roots[0] = psitestdir2; + roots[1] = psidesktop; + roots[2] = psidesktop2; + roots[3] = psitestdir2; + roots[4] = psitestdir; + roots[5] = psitestdir2; + roots[6] = psidesktop; roots[7] = psitestdir2; roots[8] = NULL; verify_root_order(pnstc, roots);

1 0

Nikolay Sivov : explorerframe/tests: Mark some results as broken.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: 3d691afd9732269e8d9e4cd5e59c59a679092c57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d691afd9732269e8d9e4cd5e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 11 08:28:17 2014 +0400 explorerframe/tests: Mark some results as broken. --- dlls/explorerframe/tests/nstc.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/explorerframe/tests/nstc.c b/dlls/explorerframe/tests/nstc.c index 6eefa93..1d0c14c 100644 --- a/dlls/explorerframe/tests/nstc.c +++ b/dlls/explorerframe/tests/nstc.c @@ -690,14 +690,16 @@ static BOOL test_initialization(void) } /* Some "random" interfaces */ + + /* Next three are supported on Vista/2k8, but not on newer versions */ hr = INameSpaceTreeControl_QueryInterface(pnstc, &IID_IOleInPlaceObject, (void**)&punk); - ok(hr == E_NOINTERFACE || hr == S_OK /* vista, w2k8 */, "Got (0x%08x)\n", hr); + ok(hr == E_NOINTERFACE || broken(hr == S_OK) /* vista, w2k8 */, "Got (0x%08x)\n", hr); if(SUCCEEDED(hr)) IUnknown_Release(punk); hr = INameSpaceTreeControl_QueryInterface(pnstc, &IID_IOleInPlaceActiveObject, (void**)&punk); - ok(hr == E_NOINTERFACE || hr == S_OK /* vista, w2k8 */, "Got (0x%08x)\n", hr); + ok(hr == E_NOINTERFACE || broken(hr == S_OK) /* vista, w2k8 */, "Got (0x%08x)\n", hr); if(SUCCEEDED(hr)) IUnknown_Release(punk); hr = INameSpaceTreeControl_QueryInterface(pnstc, &IID_IOleInPlaceObjectWindowless, (void**)&punk); - ok(hr == E_NOINTERFACE || hr == S_OK /* vista, w2k8 */, "Got (0x%08x)\n", hr); + ok(hr == E_NOINTERFACE || broken(hr == S_OK) /* vista, w2k8 */, "Got (0x%08x)\n", hr); if(SUCCEEDED(hr)) IUnknown_Release(punk); hr = INameSpaceTreeControl_QueryInterface(pnstc, &IID_IOleInPlaceUIWindow, (void**)&punk); @@ -2223,7 +2225,7 @@ static void test_events(void) itemstate = 0xDEADBEEF; hr = INameSpaceTreeControl_GetItemState(pnstc, psidesktop, 0xffff, &itemstate); ok(hr == S_OK, "Got (0x%08x)\n", hr); - ok(itemstate == (NSTCIS_BOLD), "itemstate is 0x%08x\n", itemstate); + ok(itemstate == NSTCIS_BOLD, "itemstate is 0x%08x\n", itemstate); ok_no_events(pnstceimpl); hr = INameSpaceTreeControl_RemoveAllRoots(pnstc); @@ -2406,9 +2408,7 @@ START_TEST(nstc) test_events(); } else - { win_skip("No NamespaceTreeControl (or instantiation failed).\n"); - } destroy_window(); OleUninitialize();

1 0

Nikolay Sivov : explorerframe: Query for more notification callbacks.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: 586c3f2b4678c7e576c9459cc5aba9f72a327561 URL: http://source.winehq.org/git/wine.git/?a=commit;h=586c3f2b4678c7e576c9459cc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 11 08:03:37 2014 +0400 explorerframe: Query for more notification callbacks. --- dlls/explorerframe/nstc.c | 87 ++++++++++++++++++++++----------------- dlls/explorerframe/tests/nstc.c | 32 ++++---------- 2 files changed, 59 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=586c3f2b4678c7e576c94…

1 0

Nikolay Sivov : comctl32/imagelist: Update to IImageList2.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: f109a084e8ec4f0be6704b9128656086ef48a531 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f109a084e8ec4f0be6704b912… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 10 08:21:32 2014 +0400 comctl32/imagelist: Update to IImageList2. --- dlls/comctl32/imagelist.c | 286 ++++++++++++++++++++++++++------------- dlls/comctl32/tests/imagelist.c | 11 ++ 2 files changed, 202 insertions(+), 95 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f109a084e8ec4f0be6704…

1 0

Alexandre Julliard : comctl32/tests: Output message sequences only on failure.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: 6ad2cf9b5350adff859d36e3438be6a4a54c9fe0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ad2cf9b5350adff859d36e34… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 12 10:18:23 2014 +0200 comctl32/tests: Output message sequences only on failure. --- dlls/comctl32/tests/msg.h | 97 +++++++++++++++++++++++++++++++++++++--- dlls/comctl32/tests/syslink.c | 4 -- dlls/comctl32/tests/tab.c | 4 -- dlls/comctl32/tests/toolbar.c | 1 - dlls/comctl32/tests/trackbar.c | 4 -- dlls/comctl32/tests/treeview.c | 1 - dlls/comctl32/tests/updown.c | 6 --- 7 files changed, 91 insertions(+), 26 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6ad2cf9b5350adff859d3…

1 0

Bruno Jesus : rpcrt4: Take care of EINTR on send/recv.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: d4278ce0ed61160fa8941ae825668cfe7a1be503 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4278ce0ed61160fa8941ae82… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Jun 12 01:52:28 2014 -0300 rpcrt4: Take care of EINTR on send/recv. --- dlls/rpcrt4/rpc_transport.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index c073a95..b283301 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -29,6 +29,7 @@ #include <stdio.h> #include <string.h> #include <assert.h> +#include <errno.h> #include <stdlib.h> #include <sys/types.h> @@ -1464,6 +1465,8 @@ static int rpcrt4_conn_tcp_read(RpcConnection *Connection, return -1; else if (r > 0) bytes_read += r; + else if (errno == EINTR) + continue; else if (errno != EAGAIN) { WARN("recv() failed: %s\n", strerror(errno)); @@ -1489,6 +1492,8 @@ static int rpcrt4_conn_tcp_write(RpcConnection *Connection, int r = send(tcpc->sock, (const char *)buffer + bytes_written, count - bytes_written, 0); if (r >= 0) bytes_written += r; + else if (errno == EINTR) + continue; else if (errno != EAGAIN) return -1; else

1 0

Zhenbo Li : mshtml: Added IHTMLDocument2:toString method.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: 4719c438a9cd16c56ed2854de317bc7008aadc1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4719c438a9cd16c56ed2854de… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Sat May 31 19:51:07 2014 +0800 mshtml: Added IHTMLDocument2:toString method. --- dlls/mshtml/htmldoc.c | 13 +++++++++++-- dlls/mshtml/tests/dom.c | 7 +++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index a9db920..6992c93 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1578,8 +1578,17 @@ static HRESULT WINAPI HTMLDocument_get_onerrorupdate(IHTMLDocument2 *iface, VARI static HRESULT WINAPI HTMLDocument_toString(IHTMLDocument2 *iface, BSTR *String) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - FIXME("(%p)->(%p)\n", This, String); - return E_NOTIMPL; + + static const WCHAR objectW[] = {'[','o','b','j','e','c','t',']',0}; + + TRACE("(%p)->(%p)\n", This, String); + + if(!String) + return E_INVALIDARG; + + *String = SysAllocString(objectW); + return *String ? S_OK : E_OUTOFMEMORY; + } static HRESULT WINAPI HTMLDocument_createStyleSheet(IHTMLDocument2 *iface, BSTR bstrHref, diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index cb1e7be..c16e073 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5243,10 +5243,17 @@ static void test_doc_elem(IHTMLDocument2 *doc) IHTMLElement *elem; IHTMLDocument3 *doc3; HRESULT hres; + BSTR bstr; hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument3, (void**)&doc3); ok(hres == S_OK, "QueryInterface(IID_IHTMLDocument3) failed: %08x\n", hres); + hres = IHTMLDocument2_toString(doc, &bstr); + ok(hres == S_OK, "toString failed: %08x\n", hres); + ok(!strcmp_wa(bstr, "[object]"), + "toString returned %s, expected [object]\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + hres = IHTMLDocument3_get_documentElement(doc3, &elem); IHTMLDocument3_Release(doc3); ok(hres == S_OK, "get_documentElement failed: %08x\n", hres);

1 0

Felix Janda : iphlpapi: stdio.h needs to be included for sprintf().
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: 0547c0d236ab197c14b5fec0abfad4c31eade7c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0547c0d236ab197c14b5fec0a… Author: Felix Janda <felix.janda(a)posteo.de> Date: Tue Jun 3 22:33:27 2014 +0200 iphlpapi: stdio.h needs to be included for sprintf(). --- dlls/iphlpapi/iphlpapi_main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index e145386..8c55048 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -22,6 +22,7 @@ #include <stdarg.h> #include <stdlib.h> +#include <stdio.h> #include <sys/types.h> #ifdef HAVE_NETINET_IN_H # include <netinet/in.h>

1 0

Bruno Jesus : winetest: Take care of EINTR on send/recv.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: 49ef87c3143c59e3037b8dd78b083e30643bf775 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49ef87c3143c59e3037b8dd78… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Jun 12 01:45:36 2014 -0300 winetest: Take care of EINTR on send/recv. --- programs/winetest/send.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/programs/winetest/send.c b/programs/winetest/send.c index 7767d25..d04b6e9 100644 --- a/programs/winetest/send.c +++ b/programs/winetest/send.c @@ -92,7 +92,10 @@ send_buf (SOCKET s, const char *buf, size_t length) while (length > 0) { sent = send (s, buf, length, 0); - if (sent == SOCKET_ERROR) return 1; + if (sent == SOCKET_ERROR) { + if (errno == EINTR) continue; + return 1; + } buf += sent; length -= sent; } @@ -200,6 +203,7 @@ send_file_direct (const char *name) total = 0; while ((bytes_read = recv (s, buffer+total, BUFLEN-total, 0))) { if ((signed)bytes_read == SOCKET_ERROR) { + if (errno == EINTR) continue; report (R_WARNING, "Error receiving reply: %d, %d", errno, WSAGetLastError ()); goto abort1;

1 0

Piotr Caban : msvcp90: Fix typo in strstreambuf_freeze.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: ab0513ef67f33a64627792ed3cb9b9a7d1b55c28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab0513ef67f33a64627792ed3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 11 12:50:39 2014 +0200 msvcp90: Fix typo in strstreambuf_freeze. --- dlls/msvcp60/ios.c | 2 +- dlls/msvcp90/ios.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index b223d10..913086a 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -11586,7 +11586,7 @@ void __thiscall strstreambuf_freeze(strstreambuf *this, MSVCP_bool freeze) { TRACE("(%p %d)\n", this, freeze); - if(!freeze == !(this->strmode *STRSTATE_Frozen)) + if(!freeze == !(this->strmode & STRSTATE_Frozen)) return; if(freeze) { diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index d8f1e1c..f7cb232 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -13241,7 +13241,7 @@ void __thiscall strstreambuf_freeze(strstreambuf *this, MSVCP_bool freeze) { TRACE("(%p %d)\n", this, freeze); - if(!freeze == !(this->strmode *STRSTATE_Frozen)) + if(!freeze == !(this->strmode & STRSTATE_Frozen)) return; if(freeze) {

1 0

Francois Gouget : testbot/lib: DBIBackend::LoadItem() must not return objects from the Collection scope.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: tools Branch: master Commit: 2a350500f2075a7da7c0b8337772ede3b94978d6 URL: http://source.winehq.org/git/tools.git/?a=commit;h=2a350500f2075a7da7c0b833… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jun 12 10:14:41 2014 +0200 testbot/lib: DBIBackend::LoadItem() must not return objects from the Collection scope. Such checks belong to the higher levels. Doing them in LoadItem() interferes with Collection::Validate(), causing it to think new items are already present in the database whenever they don't have Sequence keys. --- testbot/lib/ObjectModel/DBIBackEnd.pm | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/testbot/lib/ObjectModel/DBIBackEnd.pm b/testbot/lib/ObjectModel/DBIBackEnd.pm index c89fa64..06b139d 100644 --- a/testbot/lib/ObjectModel/DBIBackEnd.pm +++ b/testbot/lib/ObjectModel/DBIBackEnd.pm @@ -253,14 +253,24 @@ sub LoadCollection $Statement->finish(); } +=pod +=over 12 + +=item C<LoadItem()> + +Loads the specified Item from the database and adds it to the Collection. +By design this method will not check if the Item is already present in the +Collection scope. Such checks belong in the higher levels. This method will +however put the Item in the Collection's scope. + +=back +=cut + sub LoadItem { my $self = shift; my ($Collection, $RequestedKey) = @_; - my $Item = $Collection->GetScopeItem($RequestedKey); - return $Item if (defined $Item); - my $Fields = $self->BuildFieldList($Collection->GetPropertyDescriptors()); my $Where = ""; @@ -283,7 +293,7 @@ sub LoadItem my $Statement = $self->GetDb()->prepare($Query); $Statement->execute(@Data); - $Item = undef; + my $Item; if (my $Row = $Statement->fetchrow_hashref()) { $Item = $Collection->CreateItem();

1 0

Francois Gouget : testbot/lib: Improve Collection::Validate()' s error reporting.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: tools Branch: master Commit: 2fd3c073f6579e1051bcc2bff8cedfe490425183 URL: http://source.winehq.org/git/tools.git/?a=commit;h=2fd3c073f6579e1051bcc2bf… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jun 12 10:15:51 2014 +0200 testbot/lib: Improve Collection::Validate()'s error reporting. The error message contains no information about the Collection so it should mention the guilty Item's full key. --- testbot/lib/ObjectModel/Collection.pm | 5 +++-- testbot/lib/ObjectModel/Item.pm | 3 +-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/testbot/lib/ObjectModel/Collection.pm b/testbot/lib/ObjectModel/Collection.pm index 0070c57..53ad5fe 100644 --- a/testbot/lib/ObjectModel/Collection.pm +++ b/testbot/lib/ObjectModel/Collection.pm @@ -404,7 +404,8 @@ sub Validate (my $ErrProperty, my $ErrMessage) = $Item->Validate(); if (defined($ErrMessage)) { - return ($Item->GetKey(), $ErrProperty, $ErrMessage); + return ($Item->GetKey(), $ErrProperty, "$ErrMessage for " . + $self->GetItemName() . " " . $Item->GetFullKey()); } if ($Item->GetIsNew()) { @@ -424,7 +425,7 @@ sub Validate my $ExistingItem = $self->GetBackEnd()->LoadItem($self, $Item->GetKey()); if (defined($ExistingItem)) { - $ErrMessage = $self->GetItemName() . " " . $ErrMessage . + $ErrMessage = $self->GetItemName() . " " . $Item->GetFullKey() . " already exists"; return ($Item->GetKey(), undef, $ErrMessage); } diff --git a/testbot/lib/ObjectModel/Item.pm b/testbot/lib/ObjectModel/Item.pm index 0cc07ab..2ec69f1 100644 --- a/testbot/lib/ObjectModel/Item.pm +++ b/testbot/lib/ObjectModel/Item.pm @@ -382,8 +382,7 @@ sub Validate my ($ErrKey, $ErrProperty, $ErrMessage) = $Detail->Validate(); if (defined($ErrMessage)) { - return (undef, $ErrMessage . " for " . $Detail->GetItemName() . - $ErrKey); + return (undef, $ErrMessage); } } }

1 0

Francois Gouget : testbot/lib: Improve the Backend methods argument handling.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: tools Branch: master Commit: 4ff885361b38d0cdfe024f6c9325539362872fa2 URL: http://source.winehq.org/git/tools.git/?a=commit;h=4ff885361b38d0cdfe024f6c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jun 12 10:15:14 2014 +0200 testbot/lib: Improve the Backend methods argument handling. This standardizes the way we handle the arguments. Make it so one can readily see the list of arguments the method takes without having to hunt down the implementation of all its ancestors. Because these are methods the added prototypes have no effect whatsoever as far as Perl is concerned. However they do document which arguments are optional. --- testbot/lib/ObjectModel/BackEnd.pm | 8 ++-- testbot/lib/ObjectModel/DBIBackEnd.pm | 82 +++++++++++++-------------------- 2 files changed, 38 insertions(+), 52 deletions(-) diff --git a/testbot/lib/ObjectModel/BackEnd.pm b/testbot/lib/ObjectModel/BackEnd.pm index cf7439e..561bfce 100644 --- a/testbot/lib/ObjectModel/BackEnd.pm +++ b/testbot/lib/ObjectModel/BackEnd.pm @@ -35,17 +35,19 @@ require Exporter; @ISA = qw(Exporter); @EXPORT = qw(%ActiveBackEnds); -sub new +sub new($@) { my $class = shift; + my $self = {}; $self = bless $self, $class; - $self->_initialize(); + $self->_initialize(@_); return $self; } -sub _initialize +sub _initialize($) { + #my ($self) = @_; } 1; diff --git a/testbot/lib/ObjectModel/DBIBackEnd.pm b/testbot/lib/ObjectModel/DBIBackEnd.pm index 06b139d..45bd1f6 100644 --- a/testbot/lib/ObjectModel/DBIBackEnd.pm +++ b/testbot/lib/ObjectModel/DBIBackEnd.pm @@ -40,9 +40,9 @@ require Exporter; @ISA = qw(ObjectModel::BackEnd Exporter); @EXPORT = qw(&UseDBIBackend); -sub GetDb +sub GetDb($) { - my $self = shift; + my ($self) = @_; if (defined $self->{Db} && !$self->{Db}->ping()) { @@ -58,10 +58,9 @@ sub GetDb return $self->{Db}; } -sub ToDb +sub ToDb($$$) { - my $self = shift; - my ($Value, $PropertyDescriptor) = @_; + my ($self, $Value, $PropertyDescriptor) = @_; if ($PropertyDescriptor->GetClass eq "Basic") { @@ -97,10 +96,9 @@ sub ToDb return $Value; } -sub FromDb +sub FromDb($$$) { - my $self = shift; - my ($Value, $PropertyDescriptor) = @_; + my ($self, $Value, $PropertyDescriptor) = @_; if ($PropertyDescriptor->GetClass eq "Basic") { @@ -129,10 +127,9 @@ sub FromDb return $Value; } -sub BuildKeyWhere +sub BuildKeyWhere($$$$) { - my $self = shift; - my ($PropertyDescriptors, $ColPrefix, $Where) = @_; + my ($self, $PropertyDescriptors, $ColPrefix, $Where) = @_; foreach my $PropertyDescriptor (@{$PropertyDescriptors}) { @@ -152,10 +149,9 @@ sub BuildKeyWhere return $Where; } -sub BuildFieldList +sub BuildFieldList($$) { - my $self = shift; - my $PropertyDescriptors = $_[0]; + my ($self, $PropertyDescriptors) = @_; my $Fields = ""; foreach my $PropertyDescriptor (@$PropertyDescriptors) @@ -173,10 +169,9 @@ sub BuildFieldList return $Fields; } -sub LoadCollection +sub LoadCollection($$) { - my $self = shift; - my $Collection = $_[0]; + my ($self, $Collection) = @_; my $Fields = $self->BuildFieldList($Collection->GetPropertyDescriptors()); @@ -266,10 +261,9 @@ however put the Item in the Collection's scope. =back =cut -sub LoadItem +sub LoadItem($$$) { - my $self = shift; - my ($Collection, $RequestedKey) = @_; + my ($self, $Collection, $RequestedKey) = @_; my $Fields = $self->BuildFieldList($Collection->GetPropertyDescriptors()); @@ -314,10 +308,9 @@ sub LoadItem return $Item; } -sub BuildInsertStatement +sub BuildInsertStatement($$$$) { - my $self = shift; - my ($TableName, $PropertyDescriptors, $MasterColNames) = @_; + my ($self, $TableName, $PropertyDescriptors, $MasterColNames) = @_; my $Fields = ""; my $PlaceHolders = ""; @@ -352,11 +345,9 @@ sub BuildInsertStatement return "INSERT INTO $TableName ($Fields) VALUES($PlaceHolders)"; } -sub GetInsertData +sub GetInsertData($$$) { - my $self = shift; - my $MasterColValues = shift; - my $Item = shift; + my ($self, $MasterColValues, $Item) = @_; my @Data; if (defined($MasterColValues)) @@ -376,10 +367,9 @@ sub GetInsertData return \@Data; } -sub BuildUpdateStatement +sub BuildUpdateStatement($$$$) { - my $self = shift; - my ($TableName, $PropertyDescriptors, $MasterColNames) = @_; + my ($self, $TableName, $PropertyDescriptors, $MasterColNames) = @_; my $Fields = ""; foreach my $PropertyDescriptor (@{$PropertyDescriptors}) @@ -407,11 +397,9 @@ sub BuildUpdateStatement return "UPDATE $TableName SET $Fields WHERE $Where"; } -sub GetUpdateData +sub GetUpdateData($$$) { - my $self = shift; - my $MasterColValues = shift; - my $Item = shift; + my ($self, $MasterColValues, $Item) = @_; my @Data; foreach my $PropertyDescriptor (@{$Item->GetPropertyDescriptors()}) @@ -445,10 +433,9 @@ sub GetUpdateData return \@Data; } -sub SaveCollection +sub SaveCollection($$) { - my $self = shift; - my $Collection = shift; + my ($self, $Collection) = @_; my $Db = $self->GetDb(); my ($MasterColNames, $MasterColValues) = $Collection->GetMasterCols(); @@ -500,10 +487,9 @@ sub SaveCollection $UpdateStatement->finish(); } -sub SaveItem +sub SaveItem($$) { - my $self = shift; - my $Item = $_[0]; + my ($self, $Item) = @_; my $Query; my ($MasterColNames, $MasterColValues) = $Item->GetMasterCols(); @@ -528,10 +514,9 @@ sub SaveItem $Statement->finish(); } -sub DeleteItem +sub DeleteItem($$) { - my $self = shift; - my $Item = shift; + my ($self, $Item) = @_; my $Where = ""; my @Data; @@ -554,10 +539,9 @@ sub DeleteItem return undef; } -sub DeleteAll +sub DeleteAll($$) { - my $self = shift; - my $Collection = shift; + my ($self, $Collection) = @_; my $Where = ""; my @Data; @@ -580,9 +564,9 @@ sub DeleteAll return undef; } -sub PrepareForFork +sub PrepareForFork($) { - my $self = shift; + my ($self) = @_; if (defined($self->{Db})) { @@ -591,7 +575,7 @@ sub PrepareForFork } } -sub UseDBIBackEnd +sub UseDBIBackEnd($$@) { my $class = shift; my $DbSelector = shift;

1 0

Francois Gouget : testbot/web: Use the default Domain and Path of our cookies.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: tools Branch: master Commit: 70ebd159c77017701d59d92f391a502e80bea2d3 URL: http://source.winehq.org/git/tools.git/?a=commit;h=70ebd159c77017701d59d92f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jun 9 12:43:28 2014 +0200 testbot/web: Use the default Domain and Path of our cookies. The Path defaults to '/' which is what we want. The Domain is set to the most restrictive value which is good. This also means we're no longer putting the port number in the Domain value which fixes our cookies when the web server is running on a non-standard port or the connection is going through port forwarding. --- testbot/lib/WineTestBot/CGI/PageBase.pm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index bfa44c4..a724507 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -162,8 +162,6 @@ sub SetCookies($) $Cookie = CGI::Cookie->new(-Name => "SessionId", -Value => $Session->Id, -Expires => $Expire, - -Domain => $ENV{"HTTP_HOST"}, - -Path => "/", -Secure => $UseSSL); $Request->err_headers_out->add("Set-Cookie", $Cookie); } @@ -184,8 +182,6 @@ sub SetCookies($) $Cookie = CGI::Cookie->new(-Name => "SessionActive", -Value => $SessionPermanent, -Expires => $Expire, - -Domain => $ENV{"HTTP_HOST"}, - -Path => "/", -Secure => !1); $Request->err_headers_out->add("Set-Cookie", $Cookie); }

1 0

Francois Gouget : testbot/web: Improve argument handling in the web methods.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: tools Branch: master Commit: 95b5ea0176af8ef17e4e262ce7e6cd31b7c80e6e URL: http://source.winehq.org/git/tools.git/?a=commit;h=95b5ea0176af8ef17e4e262c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jun 9 12:29:32 2014 +0200 testbot/web: Improve argument handling in the web methods. This standardizes the way we handle arguments. Make it so one can readily see the list of arguments the method takes without having to hunt down the implementation of all its ancestors. Because these are methods the added prototypes have no effect whatsoever as far as Perl is concerned. However they do document which arguments are optional. --- testbot/web/Feedback.pl | 44 +++++++-------- testbot/web/ForgotPassword.pl | 29 +++++----- testbot/web/GetFile.pl | 2 +- testbot/web/JobDetails.pl | 76 ++++++++++++-------------- testbot/web/Login.pl | 36 ++++++------ testbot/web/Logout.pl | 12 ++-- testbot/web/PatchesList.pl | 41 ++++++-------- testbot/web/Register.pl | 48 ++++++++-------- testbot/web/ResetPassword.pl | 40 +++++++------- testbot/web/Screenshot.pl | 8 +-- testbot/web/Submit.pl | 106 +++++++++++++++++------------------- testbot/web/admin/BranchDetails.pl | 6 +- testbot/web/admin/BranchesList.pl | 11 ++-- testbot/web/admin/UserDetails.pl | 30 +++++----- testbot/web/admin/UsersList.pl | 30 +++++----- testbot/web/admin/VMDetails.pl | 13 ++--- testbot/web/admin/VMsList.pl | 24 ++++---- testbot/web/index.pl | 68 +++++++++++------------ 18 files changed, 299 insertions(+), 325 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=95b5ea0176af8ef17e4e…

1 0

Francois Gouget : testbot: Remove duplicate options from the sample Apache configuration file.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: tools Branch: master Commit: b76db4ff3768eb5e9f5939fb0e0f915875b8dfb6 URL: http://source.winehq.org/git/tools.git/?a=commit;h=b76db4ff3768eb5e9f5939fb… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jun 9 12:47:53 2014 +0200 testbot: Remove duplicate options from the sample Apache configuration file. --- testbot/doc/vhost_winetestbot.conf | 2 -- 1 file changed, 2 deletions(-) diff --git a/testbot/doc/vhost_winetestbot.conf b/testbot/doc/vhost_winetestbot.conf index 3219bcd..5953317 100644 --- a/testbot/doc/vhost_winetestbot.conf +++ b/testbot/doc/vhost_winetestbot.conf @@ -22,8 +22,6 @@ PerlResponseHandler ModPerl::Registry PerlOptions +ParseHeaders Options +ExecCGI - PerlOptions +ParseHeaders - Options +ExecCGI DirectoryIndex index.pl # Access control the Apache 2.2 way

1 0

Francois Gouget : testbot/lib: Simplify and optimize Collection::Validate( ).
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: tools Branch: master Commit: f65fa587273a3130ec69f04a26f3ce1d17fe503d URL: http://source.winehq.org/git/tools.git/?a=commit;h=f65fa587273a3130ec69f04a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jun 12 10:15:45 2014 +0200 testbot/lib: Simplify and optimize Collection::Validate(). --- testbot/lib/ObjectModel/Collection.pm | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/testbot/lib/ObjectModel/Collection.pm b/testbot/lib/ObjectModel/Collection.pm index 7dbcf63..0070c57 100644 --- a/testbot/lib/ObjectModel/Collection.pm +++ b/testbot/lib/ObjectModel/Collection.pm @@ -409,18 +409,14 @@ sub Validate if ($Item->GetIsNew()) { my $HasSequenceKey = !1; - my $ErrProperty, my $ErrMessage; foreach my $PropertyDescriptor (@{$self->{PropertyDescriptors}}) { - if ($PropertyDescriptor->GetIsKey()) + if ($PropertyDescriptor->GetIsKey() && + $PropertyDescriptor->GetClass() eq "Basic" && + $PropertyDescriptor->GetType() eq "S") { - $ErrProperty = $PropertyDescriptor->GetName(); - $ErrMessage = $Item->$ErrProperty; - if ($PropertyDescriptor->GetClass() eq "Basic" && - $PropertyDescriptor->GetType() eq "S") - { - $HasSequenceKey = 1; - } + $HasSequenceKey = 1; + last; } } if (! $HasSequenceKey)

1 0

Francois Gouget : testbot: Update the SSL Apache configuration section to match the regular one.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: tools Branch: master Commit: bc4d58b448be3d2fbdb6cd5c180ac74467ae5af0 URL: http://source.winehq.org/git/tools.git/?a=commit;h=bc4d58b448be3d2fbdb6cd5c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jun 9 12:48:03 2014 +0200 testbot: Update the SSL Apache configuration section to match the regular one. --- testbot/doc/vhost_winetestbot.conf | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/testbot/doc/vhost_winetestbot.conf b/testbot/doc/vhost_winetestbot.conf index 5953317..7b84564 100644 --- a/testbot/doc/vhost_winetestbot.conf +++ b/testbot/doc/vhost_winetestbot.conf @@ -32,7 +32,7 @@ </Directory> </VirtualHost> -<VirtualHost 192.168.0.1:443> +<VirtualHost *:443> DocumentRoot /home/winehq/tools/testbot/web/ ServerName winetestbot.example.com @@ -42,8 +42,18 @@ SSLCertificateFile /etc/apache2/ssl.crt/winetestbot.example.com.crt SSLCertificateKeyFile /etc/apache2/ssl.key/winetestbot.example.com.key - PerlRequire /home/winehq/tools/testbot/lib/startup.pl PerlSwitches -Tw + <Perl> + use strict; + BEGIN + { + $::RootDir = "/home/winehq/tools/testbot"; + unshift @INC, "$::RootDir/lib"; + } + use ObjectModel::CGI::Page; + use WineTestBot::CGI::PageBase; + SetPageBaseCreator(\&CreatePageBase); + </Perl> <Directory /home/winehq/tools/testbot/web> AddHandler perl-script .pl @@ -52,7 +62,10 @@ Options +ExecCGI DirectoryIndex index.pl + # Access control the Apache 2.2 way Order allow,deny Allow from all + # And the Apache 2.4 way + Require all granted </Directory> </VirtualHost>

1 0

Francois Gouget : testbot/CGI: The Page constructor must pass the full extra arguments list to the _initialize () method.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: tools Branch: master Commit: 6613e1526b41a50068c08147f4a65a144db37b19 URL: http://source.winehq.org/git/tools.git/?a=commit;h=6613e1526b41a50068c08147… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jun 9 12:28:31 2014 +0200 testbot/CGI: The Page constructor must pass the full extra arguments list to the _initialize() method. --- testbot/lib/ObjectModel/CGI/Page.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/ObjectModel/CGI/Page.pm b/testbot/lib/ObjectModel/CGI/Page.pm index 8bbd1ae..6b2276d 100644 --- a/testbot/lib/ObjectModel/CGI/Page.pm +++ b/testbot/lib/ObjectModel/CGI/Page.pm @@ -45,7 +45,7 @@ sub new ErrField => undef}; $self = bless $self, $class; $self->{PageBase} = &$PageBaseCreator($self, @_); - $self->_initialize($Request, $RequiredRole); + $self->_initialize(@_); return $self; }

1 0

Francois Gouget : testbot/bin: Standardize handling of the function arguments and add prototypes.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: tools Branch: master Commit: 7533b8452fb45c9c0fe94ff145c5afd0e8d0d94a URL: http://source.winehq.org/git/tools.git/?a=commit;h=7533b8452fb45c9c0fe94ff1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jun 9 10:56:23 2014 +0200 testbot/bin: Standardize handling of the function arguments and add prototypes. The prototypes let Perl detect when the wrong number of parameters is passed to these functions. They also document which arguments are optional. --- testbot/bin/CheckForWinetestUpdate.pl | 4 ++-- testbot/bin/RevertVM.pl | 2 +- testbot/bin/WineSendLog.pl | 21 +++++++++++---------- testbot/bin/build/Build.pl | 10 +++++----- testbot/bin/build/Reconfig.pl | 14 +++++++------- 5 files changed, 26 insertions(+), 25 deletions(-) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index 4eb2555..17b75d0 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -60,7 +60,7 @@ my %WineTestUrls = ( ); -sub AddJob +sub AddJob($$$) { my ($BaseJob, $LatestBaseName, $Bits) = @_; @@ -140,7 +140,7 @@ sub AddJob return 1; } -sub AddReconfigJob +sub AddReconfigJob() { # First create a new job my $Jobs = CreateJobs(); diff --git a/testbot/bin/RevertVM.pl b/testbot/bin/RevertVM.pl index b2ae902..3712c4d 100755 --- a/testbot/bin/RevertVM.pl +++ b/testbot/bin/RevertVM.pl @@ -42,7 +42,7 @@ use WineTestBot::Config; use WineTestBot::Log; use WineTestBot::VMs; -sub FatalError +sub FatalError($$) { my ($ErrMessage, $VM) = @_; diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 5f4f1b1..c0a5057 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -43,9 +43,9 @@ use WineTestBot::Log; use WineTestBot::StepsTasks; -sub IsBotFailure +sub IsBotFailure($) { - my $ErrLine = $_[0]; + my ($ErrLine) = @_; return ($ErrLine =~ m/Can't set VM status to running/ || $ErrLine =~ m/Can't copy exe to VM/ || @@ -53,9 +53,9 @@ sub IsBotFailure $ErrLine =~ m/Can't copy generated executable from VM/); } -sub CheckErrLog +sub CheckErrLog($) { - my $ErrLogFileName = $_[0]; + my ($ErrLogFileName) = @_; my $BotFailure = !1; my $Messages = ""; @@ -82,7 +82,7 @@ sub CheckErrLog return ($BotFailure, $Messages); } -sub ReadLog +sub ReadLog($$$) { my ($LogName, $BaseName, $TestSet) = @_; @@ -127,16 +127,16 @@ sub ReadLog return \@Messages; } -sub GetLineKey +sub GetLineKey($) { - my $Line = $_[0]; + my ($Line) = @_; $Line =~ s/^([\w_.]+:)\d+(:.*)$/$1$2/; return $Line; } -sub CompareLogs +sub CompareLogs($$$$) { my ($SuiteLog, $TaskLog, $BaseName, $TestSet) = @_; @@ -166,9 +166,10 @@ sub CompareLogs return $Messages; } -sub SendLog +sub SendLog($) { - my $Job = shift; + my ($Job) = @_; + my $To = $WinePatchToOverride || $Job->GetEMailRecipient(); if (! defined($To)) { diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index ef3fece..f94b87e 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -40,7 +40,7 @@ sub BEGIN use WineTestBot::Config; -sub InfoMsg +sub InfoMsg(@) { my $oldumask = umask(002); if (open LOGFILE, ">>$LogDir/Build.log") @@ -51,7 +51,7 @@ sub InfoMsg umask($oldumask); } -sub LogMsg +sub LogMsg(@) { my $oldumask = umask(002); if (open LOGFILE, ">>$LogDir/Build.log") @@ -62,14 +62,14 @@ sub LogMsg umask($oldumask); } -sub FatalError +sub FatalError(@) { LogMsg @_; exit 1; } -sub ApplyPatch +sub ApplyPatch($$$) { my ($PatchFile, $PatchType, $BaseName) = @_; @@ -169,7 +169,7 @@ sub CountCPUs() $ncpus ||= 1; } -sub BuildTestExecutable +sub BuildTestExecutable($$$$$$$$) { my ($BaseName, $PatchType, $Bits, $NeedConfigure, $NeedMakefile, $NeedMakeInclude, $NeedBuildDeps, $NeedImplib) = @_; diff --git a/testbot/bin/build/Reconfig.pl b/testbot/bin/build/Reconfig.pl index a82d879..f5ffcab 100755 --- a/testbot/bin/build/Reconfig.pl +++ b/testbot/bin/build/Reconfig.pl @@ -40,7 +40,7 @@ sub BEGIN use WineTestBot::Config; -sub LogMsg +sub LogMsg(@) { my $oldumask = umask(002); if (open LOGFILE, ">>$LogDir/Reconfig.log") @@ -51,14 +51,14 @@ sub LogMsg umask($oldumask); } -sub FatalError +sub FatalError(@) { LogMsg @_; exit 1; } -sub GitPull +sub GitPull() { system("cd $DataDir/wine && git pull >> $LogDir/Reconfig.log 2>&1"); if ($? != 0) @@ -82,7 +82,7 @@ sub CountCPUs() $ncpus ||= 1; } -sub BuildTestAgentd +sub BuildTestAgentd() { # If testagentd already exists it's likely already running # so don't rebuild it. @@ -110,7 +110,7 @@ sub BuildTestAgentd return 1; } -sub BuildNative +sub BuildNative() { mkdir "$DataDir/build-native" if (! -d "$DataDir/build-native"); system("( cd $DataDir/build-native && set -x && " . @@ -129,9 +129,9 @@ sub BuildNative return 1; } -sub BuildCross +sub BuildCross($) { - my $Bits = $_[0]; + my ($Bits) = @_; my $Host = ($Bits == 64 ? "x86_64-w64-mingw32" : "i686-w64-mingw32"); mkdir "$DataDir/build-mingw$Bits" if (! -d "$DataDir/build-mingw$Bits");

1 0

Francois Gouget : testbot/CGI: Improve the CGI methods argument handling.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: tools Branch: master Commit: 0e4eb3a13f794ad8c4f51947519c2af74a69e4a6 URL: http://source.winehq.org/git/tools.git/?a=commit;h=0e4eb3a13f794ad8c4f51947… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jun 9 12:29:04 2014 +0200 testbot/CGI: Improve the CGI methods argument handling. This standardizes the way we handle the arguments. Make it so one can readily see the list of arguments the method takes without having to hunt down the implementation of all its ancestors. Because these are methods the added prototypes have no effect whatsoever as far as Perl is concerned. However they do document which arguments are optional. --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 171 ++++++++++---------- .../lib/ObjectModel/CGI/CollectionBlockForPage.pm | 68 ++++---- testbot/lib/ObjectModel/CGI/CollectionPage.pm | 121 ++++++-------- testbot/lib/ObjectModel/CGI/FormPage.pm | 104 ++++++------ testbot/lib/ObjectModel/CGI/ItemPage.pm | 45 +++--- testbot/lib/ObjectModel/CGI/Page.pm | 105 ++++++------ testbot/lib/WineTestBot/CGI/PageBase.pm | 75 ++++----- testbot/lib/WineTestBot/CGI/Sessions.pm | 15 +- 8 files changed, 338 insertions(+), 366 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=0e4eb3a13f794ad8c4f5…

1 0

Huw Davies : gdi32: CLIP_DFA_DISABLE should disable the font association mechanism.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 80a29e2d31d3e1245cf1261f99c70a0fc3e26c3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=80a29e2d31d3e1245cf1261f9… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jun 10 09:48:38 2014 +0100 gdi32: CLIP_DFA_DISABLE should disable the font association mechanism. --- dlls/gdi32/font.c | 9 ++++++--- dlls/gdi32/tests/font.c | 16 ++++++++++++++++ 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 66072af..af3ea5b 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -653,12 +653,15 @@ static DWORD get_associated_charset_info(void) return associated_charset; } -static void update_font_code_page( DC *dc ) +static void update_font_code_page( DC *dc, HANDLE font ) { CHARSETINFO csi; int charset = GetTextCharsetInfo( dc->hSelf, NULL, 0 ); + LOGFONTW lf; + + GetObjectW( font, sizeof(lf), &lf ); - if (charset == ANSI_CHARSET && + if (charset == ANSI_CHARSET && !(lf.lfClipPrecision & CLIP_DFA_DISABLE) && get_associated_charset_info() & ASSOC_CHARSET_ANSI) charset = DEFAULT_CHARSET; @@ -725,7 +728,7 @@ static HGDIOBJ FONT_SelectObject( HGDIOBJ handle, HDC hdc ) ret = dc->hFont; dc->hFont = handle; dc->aa_flags = aa_flags ? aa_flags : GGO_BITMAP; - update_font_code_page( dc ); + update_font_code_page( dc, handle ); GDI_dec_ref_count( ret ); } else GDI_dec_ref_count( handle ); diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index e978166..dd63297 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -2570,6 +2570,22 @@ static void test_GdiGetCodePage(void) hfont = SelectObject(hdc, hfont); DeleteObject(hfont); + + /* CLIP_DFA_DISABLE turns off the font association */ + lf.lfClipPrecision = CLIP_DFA_DISABLE; + hfont = CreateFontIndirectA(&lf); + ok(hfont != 0, "CreateFontIndirectA error %u\n", GetLastError()); + + hfont = SelectObject(hdc, hfont); + charset = GetTextCharset(hdc); + codepage = pGdiGetCodePage(hdc); + trace("acp=%d, lfFaceName=%s, lfCharSet=%d, GetTextCharset=%d, GdiGetCodePage=%d\n", + acp, lf.lfFaceName, lf.lfCharSet, charset, codepage); + ok(codepage == 1252, "GdiGetCodePage returned %d\n", codepage); + + hfont = SelectObject(hdc, hfont); + DeleteObject(hfont); + ReleaseDC(NULL, hdc); } }

1 0

Piotr Caban : msvcrt: Handle negative file->_cnt value in fwrite.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: b0424313fd16efea4a08732f4ed530df30d350cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0424313fd16efea4a08732f4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jun 9 14:24:14 2014 +0200 msvcrt: Handle negative file->_cnt value in fwrite. --- dlls/msvcrt/file.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 77a0fed..7ebf6d2 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3691,7 +3691,11 @@ MSVCRT_size_t CDECL MSVCRT_fwrite(const void *ptr, MSVCRT_size_t size, MSVCRT_si MSVCRT__lock_file(file); while(wrcnt) { - if(file->_cnt) { + if(file->_cnt < 0) { + WARN("negative file->_cnt value in %p\n", file); + file->_flag |= MSVCRT__IOERR; + break; + } else if(file->_cnt) { int pcnt=(file->_cnt>wrcnt)? wrcnt: file->_cnt; memcpy(file->_ptr, ptr, pcnt); file->_cnt -= pcnt;

1 0

Michael Stefaniuc : dmcompos: Move a struct definition to the .c file that uses it.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 1aae7b0fa7be667601317b9d336023c1e37126b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1aae7b0fa7be667601317b9d3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 9 13:28:51 2014 +0200 dmcompos: Move a struct definition to the .c file that uses it. --- dlls/dmcompos/chordmap.c | 7 +++++++ dlls/dmcompos/dmcompos_private.h | 15 --------------- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/dlls/dmcompos/chordmap.c b/dlls/dmcompos/chordmap.c index 9d2d8a9..c3483cd 100644 --- a/dlls/dmcompos/chordmap.c +++ b/dlls/dmcompos/chordmap.c @@ -25,6 +25,13 @@ WINE_DECLARE_DEBUG_CHANNEL(dmfile); /***************************************************************************** * IDirectMusicChordMapImpl implementation */ +typedef struct IDirectMusicChordMapImpl { + IDirectMusicChordMap IDirectMusicChordMap_iface; + const IDirectMusicObjectVtbl *ObjectVtbl; + const IPersistStreamVtbl *PersistStreamVtbl; + LONG ref; + DMUS_OBJECTDESC *pDesc; +} IDirectMusicChordMapImpl; /* IDirectMusicChordMapImpl IDirectMusicChordMap part: */ static inline IDirectMusicChordMapImpl *impl_from_IDirectMusicChordMap(IDirectMusicChordMap *iface) diff --git a/dlls/dmcompos/dmcompos_private.h b/dlls/dmcompos/dmcompos_private.h index d7113e5..6a80445 100644 --- a/dlls/dmcompos/dmcompos_private.h +++ b/dlls/dmcompos/dmcompos_private.h @@ -45,7 +45,6 @@ /***************************************************************************** * Interfaces */ -typedef struct IDirectMusicChordMapImpl IDirectMusicChordMapImpl; typedef struct IDirectMusicChordMapTrack IDirectMusicChordMapTrack; typedef struct IDirectMusicSignPostTrack IDirectMusicSignPostTrack; @@ -58,20 +57,6 @@ extern HRESULT WINAPI create_dmchordmaptrack(REFIID riid, void **ret_iface) DECL extern HRESULT WINAPI create_dmsignposttrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; /***************************************************************************** - * IDirectMusicChordMapImpl implementation structure - */ -struct IDirectMusicChordMapImpl { - IDirectMusicChordMap IDirectMusicChordMap_iface; - const IDirectMusicObjectVtbl *ObjectVtbl; - const IPersistStreamVtbl *PersistStreamVtbl; - LONG ref; - - /* IDirectMusicChordMapImpl fields */ - LPDMUS_OBJECTDESC pDesc; - -}; - -/***************************************************************************** * IDirectMusicChordMapTrack implementation structure */ struct IDirectMusicChordMapTrack {

1 0

Michael Stefaniuc : dmband: Move struct definitions to the .c files that uses them.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: c3e753c20be1b6e5d2cddb6333fc8959d5b699ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3e753c20be1b6e5d2cddb633… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 9 13:28:01 2014 +0200 dmband: Move struct definitions to the .c files that uses them. --- dlls/dmband/band.c | 9 +++++++++ dlls/dmband/bandtrack.c | 11 ++++++++++- dlls/dmband/dmband_private.h | 40 ---------------------------------------- 3 files changed, 19 insertions(+), 41 deletions(-) diff --git a/dlls/dmband/band.c b/dlls/dmband/band.c index 97e7c30..0ab7df7 100644 --- a/dlls/dmband/band.c +++ b/dlls/dmband/band.c @@ -26,6 +26,15 @@ WINE_DECLARE_DEBUG_CHANNEL(dmfile); /***************************************************************************** * IDirectMusicBandImpl implementation */ +typedef struct IDirectMusicBandImpl { + IDirectMusicBand IDirectMusicBand_iface; + const IDirectMusicObjectVtbl *ObjectVtbl; + const IPersistStreamVtbl *PersistStreamVtbl; + LONG ref; + DMUS_OBJECTDESC *pDesc; + struct list Instruments; +} IDirectMusicBandImpl; + static inline IDirectMusicBandImpl *impl_from_IDirectMusicBand(IDirectMusicBand *iface) { return CONTAINING_RECORD(iface, IDirectMusicBandImpl, IDirectMusicBand_iface); diff --git a/dlls/dmband/bandtrack.c b/dlls/dmband/bandtrack.c index 459c158..14e368d 100644 --- a/dlls/dmband/bandtrack.c +++ b/dlls/dmband/bandtrack.c @@ -25,7 +25,16 @@ WINE_DECLARE_DEBUG_CHANNEL(dmfile); /***************************************************************************** * IDirectMusicBandTrack implementation */ -/* IDirectMusicBandTrack IUnknown part: */ +typedef struct IDirectMusicBandTrack { + const IUnknownVtbl *UnknownVtbl; + const IDirectMusicTrack8Vtbl *TrackVtbl; + const IPersistStreamVtbl *PersistStreamVtbl; + LONG ref; + DMUS_OBJECTDESC *pDesc; + DMUS_IO_BAND_TRACK_HEADER header; + struct list Bands; +} IDirectMusicBandTrack; + static HRESULT WINAPI IDirectMusicBandTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicBandTrack, UnknownVtbl, iface); TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); diff --git a/dlls/dmband/dmband_private.h b/dlls/dmband/dmband_private.h index 6be6ae8..4c8fa0b 100644 --- a/dlls/dmband/dmband_private.h +++ b/dlls/dmband/dmband_private.h @@ -43,13 +43,6 @@ #include "dmusics.h" /***************************************************************************** - * Interfaces - */ -typedef struct IDirectMusicBandImpl IDirectMusicBandImpl; - -typedef struct IDirectMusicBandTrack IDirectMusicBandTrack; - -/***************************************************************************** * ClassFactory */ extern HRESULT WINAPI create_dmband(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; @@ -82,39 +75,6 @@ typedef struct _DMUS_PRIVATE_BAND { } DMUS_PRIVATE_BAND, *LPDMUS_PRIVATE_BAND; -/***************************************************************************** - * IDirectMusicBandImpl implementation structure - */ -struct IDirectMusicBandImpl { - IDirectMusicBand IDirectMusicBand_iface; - const IDirectMusicObjectVtbl *ObjectVtbl; - const IPersistStreamVtbl *PersistStreamVtbl; - LONG ref; - - /* IDirectMusicBandImpl fields */ - LPDMUS_OBJECTDESC pDesc; - /* data */ - struct list Instruments; -}; - -/***************************************************************************** - * IDirectMusicBandTrack implementation structure - */ -struct IDirectMusicBandTrack { - /* IUnknown fields */ - const IUnknownVtbl *UnknownVtbl; - const IDirectMusicTrack8Vtbl *TrackVtbl; - const IPersistStreamVtbl *PersistStreamVtbl; - LONG ref; - - /* IDirectMusicBandTrack fields */ - LPDMUS_OBJECTDESC pDesc; - DMUS_IO_BAND_TRACK_HEADER header; - - /* data */ - struct list Bands; -}; - /********************************************************************** * Dll lifetime tracking declaration for dmband.dll */

1 0

Nikolay Sivov : comctl32/treeview: Send TVN_KEYDOWN in response of WM_KEYDOWN.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: a7fb6c89b3535368faaad06b1bd49253ed3c1430 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7fb6c89b3535368faaad06b1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 4 00:46:31 2014 +0400 comctl32/treeview: Send TVN_KEYDOWN in response of WM_KEYDOWN. --- dlls/comctl32/tests/treeview.c | 4 ++-- dlls/comctl32/treeview.c | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 3b70e6c..24a63d8 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -206,7 +206,7 @@ static const struct message parent_expand_seq[] = { }; static const struct message parent_expand_kb_seq[] = { - { WM_NOTIFY, sent|id|optional, 0, 0, TVN_KEYDOWN }, + { WM_NOTIFY, sent|id, 0, 0, TVN_KEYDOWN }, { WM_NOTIFY, sent|id, 0, 0, TVN_ITEMEXPANDINGA }, { WM_NOTIFY, sent|id, 0, 0, TVN_ITEMEXPANDEDA }, { WM_CHANGEUISTATE, sent|optional }, @@ -221,7 +221,7 @@ static const struct message parent_collapse_2nd_kb_seq[] = { }; static const struct message parent_expand_empty_kb_seq[] = { - { WM_NOTIFY, sent|id|optional, 0, 0, TVN_KEYDOWN }, + { WM_NOTIFY, sent|id, 0, 0, TVN_KEYDOWN }, { WM_CHANGEUISTATE, sent|optional }, { 0 } }; diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index c26513f..4067323 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -5201,11 +5201,15 @@ TREEVIEW_KeyDown(TREEVIEW_INFO *infoPtr, WPARAM wParam) { /* If it is non-NULL and different, it will be selected and visible. */ TREEVIEW_ITEM *newSelection = NULL; - TREEVIEW_ITEM *prevItem = infoPtr->selectedItem; + NMTVKEYDOWN nmkeydown; TRACE("%lx\n", wParam); + nmkeydown.wVKey = wParam; + nmkeydown.flags = 0; + TREEVIEW_SendRealNotify(infoPtr, TVN_KEYDOWN, &nmkeydown.hdr); + if (prevItem == NULL) return FALSE;

1 0

Michael Stefaniuc : dmstyle: Move a struct definition to the .c file that uses it.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: e22458c224b6ff83c020888868b9fa25a9318bd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e22458c224b6ff83c02088886… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 9 13:29:47 2014 +0200 dmstyle: Move a struct definition to the .c file that uses it. --- dlls/dmstyle/dmstyle_private.h | 20 -------------------- dlls/dmstyle/style.c | 11 +++++++++++ 2 files changed, 11 insertions(+), 20 deletions(-) diff --git a/dlls/dmstyle/dmstyle_private.h b/dlls/dmstyle/dmstyle_private.h index bae61a0..95ad92f 100644 --- a/dlls/dmstyle/dmstyle_private.h +++ b/dlls/dmstyle/dmstyle_private.h @@ -45,8 +45,6 @@ /***************************************************************************** * Interfaces */ -typedef struct IDirectMusicStyle8Impl IDirectMusicStyle8Impl; - typedef struct IDirectMusicAuditionTrack IDirectMusicAuditionTrack; typedef struct IDirectMusicChordTrack IDirectMusicChordTrack; typedef struct IDirectMusicCommandTrack IDirectMusicCommandTrack; @@ -100,24 +98,6 @@ typedef struct _DMUS_PRIVATE_STYLE_ITEM { /***************************************************************************** - * IDirectMusicStyle8Impl implementation structure - */ -struct IDirectMusicStyle8Impl { - IDirectMusicStyle8 IDirectMusicStyle8_iface; - const IDirectMusicObjectVtbl *ObjectVtbl; - const IPersistStreamVtbl *PersistStreamVtbl; - LONG ref; - - /* IDirectMusicStyle8Impl fields */ - LPDMUS_OBJECTDESC pDesc; - DMUS_IO_STYLE style; - - /* data */ - struct list Motifs; - struct list Bands; -}; - -/***************************************************************************** * IDirectMusicAuditionTrack implementation structure */ struct IDirectMusicAuditionTrack { diff --git a/dlls/dmstyle/style.c b/dlls/dmstyle/style.c index 2945e5d..ed40791 100644 --- a/dlls/dmstyle/style.c +++ b/dlls/dmstyle/style.c @@ -26,6 +26,17 @@ WINE_DECLARE_DEBUG_CHANNEL(dmfile); /***************************************************************************** * IDirectMusicStyleImpl implementation */ +typedef struct IDirectMusicStyle8Impl { + IDirectMusicStyle8 IDirectMusicStyle8_iface; + const IDirectMusicObjectVtbl *ObjectVtbl; + const IPersistStreamVtbl *PersistStreamVtbl; + LONG ref; + DMUS_OBJECTDESC *pDesc; + DMUS_IO_STYLE style; + struct list Motifs; + struct list Bands; +} IDirectMusicStyle8Impl; + static inline IDirectMusicStyle8Impl *impl_from_IDirectMusicStyle8(IDirectMusicStyle8 *iface) { return CONTAINING_RECORD(iface, IDirectMusicStyle8Impl, IDirectMusicStyle8_iface);

1 0