wine-commits November 2015

wine-commits@winehq.org

2 participants
623 discussions

Alexandre Julliard : winex11: Flush the output of a flushed surface right away.
by Alexandre Julliard 27 Nov '15

27 Nov '15

Module: wine Branch: master Commit: c7c1fb5eabbe12ea2e7a105845fed5308191984f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7c1fb5eabbe12ea2e7a10584… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 27 18:47:01 2015 +0900 winex11: Flush the output of a flushed surface right away. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/bitblt.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 2fc7c94..8d61a4b 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1937,6 +1937,7 @@ static void x11drv_surface_flush( struct window_surface *window_surface ) surface->header.rect.top + coords.visrect.top, coords.visrect.right - coords.visrect.left, coords.visrect.bottom - coords.visrect.top ); + XFlush( gdi_display ); } reset_bounds( &surface->bounds ); window_surface->funcs->unlock( window_surface );

1 0

Alexandre Julliard : gdi32: Periodically flush a window surface if the app is continuously painting.
by Alexandre Julliard 27 Nov '15

27 Nov '15

Module: wine Branch: master Commit: 89f12fc1016ef3a0fcf98dfcbe7c41102b7df5e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89f12fc1016ef3a0fcf98dfcb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 27 18:46:43 2015 +0900 gdi32: Periodically flush a window surface if the app is continuously painting. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dibdrv/dc.c | 120 ++++++++++++++++++++++++++----------------------- 1 file changed, 63 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=89f12fc1016ef3a0fcf98…

1 0

Sergey Isakov : tapi32: Simplify the logic in an if condition.
by Alexandre Julliard 27 Nov '15

27 Nov '15

Module: wine Branch: master Commit: 3557870302b8256bffc67d578d4c36b7cfefb349 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3557870302b8256bffc67d578… Author: Sergey Isakov <isakov-sl(a)bk.ru> Date: Fri Nov 27 07:12:30 2015 +0300 tapi32: Simplify the logic in an if condition. Signed-off-by: Sergey Isakov <isakov-sl(a)bk.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/tapi32/assisted.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/tapi32/assisted.c b/dlls/tapi32/assisted.c index 9e68a5c..0d707db 100644 --- a/dlls/tapi32/assisted.c +++ b/dlls/tapi32/assisted.c @@ -60,7 +60,7 @@ DWORD WINAPI tapiGetLocationInfoW(LPWSTR countrycode, LPWSTR citycode) 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', 'T','e','l','e','p','h','o','n','y','\\','L','o','c','a','t','i','o','n','s',0}; - if(!RegOpenKeyW(HKEY_LOCAL_MACHINE, locations_keyW, &hkey) != ERROR_SUCCESS) { + if(RegOpenKeyW(HKEY_LOCAL_MACHINE, locations_keyW, &hkey) == ERROR_SUCCESS) { valsize = sizeof( DWORD); if(!RegQueryValueExW(hkey, currentidW, 0, &type, (LPBYTE) &currid, &valsize) && type == REG_DWORD) {

1 0

Sergey Isakov : msi/tests: Simplify the logic in an if condition.
by Alexandre Julliard 27 Nov '15

27 Nov '15

Module: wine Branch: master Commit: 88a96478c38f3ec7acb4dfd0195d5ba1419aaaa0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88a96478c38f3ec7acb4dfd01… Author: Sergey Isakov <isakov-sl(a)bk.ru> Date: Fri Nov 27 07:11:59 2015 +0300 msi/tests: Simplify the logic in an if condition. Signed-off-by: Sergey Isakov <isakov-sl(a)bk.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/automation.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index a1df3f1..d02e9a2 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -878,7 +878,7 @@ static HRESULT invoke(IDispatch *pDispatch, LPCSTR szName, WORD wFlags, DISPPARA hr = IDispatch_GetIDsOfNames(pDispatch, &IID_NULL, &name, 1, LOCALE_USER_DEFAULT, &dispid); HeapFree(GetProcessHeap(), 0, name); ok(hr == S_OK, "IDispatch::GetIDsOfNames returned 0x%08x\n", hr); - if (!hr == S_OK) return hr; + if (hr != S_OK) return hr; memset(&excepinfo, 0, sizeof(excepinfo)); hr = IDispatch_Invoke(pDispatch, dispid, &IID_NULL, LOCALE_NEUTRAL, wFlags, pDispParams, pVarResult, &excepinfo, NULL);

1 0

Andrey Gusev : progman: Fix GROUP_AddGroup() declaration.
by Alexandre Julliard 27 Nov '15

27 Nov '15

Module: wine Branch: master Commit: 95baccdf7e6c2bca247a8c67855d0481aac50392 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95baccdf7e6c2bca247a8c678… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Nov 27 01:00:59 2015 +0200 progman: Fix GROUP_AddGroup() declaration. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/progman/progman.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/progman/progman.h b/programs/progman/progman.h index ca42d77..8fd823a 100644 --- a/programs/progman/progman.h +++ b/programs/progman/progman.h @@ -145,10 +145,10 @@ HLOCAL GRPFILE_ReadGroupFile(const char* path); BOOL GRPFILE_WriteGroupFile(HLOCAL hGroup); ATOM GROUP_RegisterGroupWinClass(void); -HLOCAL GROUP_AddGroup(LPCSTR lpszName, LPCSTR lpszGrpFile, INT showcmd, - INT x, INT y, INT width, INT heiht, +HLOCAL GROUP_AddGroup(LPCSTR lpszName, LPCSTR lpszGrpFile, INT nCmdShow, + INT x, INT y, INT width, INT height, INT iconx, INT icony, - BOOL bModifiedFileName, BOOL bOverwriteFileOk, + BOOL bFileNameModified, BOOL bOverwriteFileOk, /* FIXME shouldn't be necessary */ BOOL bSuppressShowWindow); VOID GROUP_NewGroup(void);

1 0

Andrey Gusev : Assorted typos fixes.
by Alexandre Julliard 27 Nov '15

27 Nov '15

Module: wine Branch: master Commit: 8bfc9bd2ee2c2d3de8469e2dc1bb016547998945 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bfc9bd2ee2c2d3de8469e2dc… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Nov 27 00:23:09 2015 +0200 Assorted typos fixes. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/appwiz.cpl/addons.c | 2 +- dlls/d3d11/device.c | 2 +- dlls/ddraw/ddraw.c | 2 +- dlls/kernel32/tests/file.c | 4 ++-- dlls/msvcrt/tests/scanf.c | 2 +- dlls/ole32/defaulthandler.c | 2 +- dlls/oleaut32/olepicture.c | 2 +- dlls/urlmon/tests/misc.c | 4 ++-- dlls/urlmon/tests/protocol.c | 6 +++--- dlls/user32/tests/combo.c | 8 ++++---- 10 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 48cd062..193fe90 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -403,7 +403,7 @@ static enum install_res install_from_cache(void) return INSTALL_NEXT; if(!sha_check(cache_file_name)) { - WARN("could not validate check sum\n"); + WARN("could not validate checksum\n"); DeleteFileW(cache_file_name); heap_free(cache_file_name); return INSTALL_NEXT; diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index b1f56c3..8fc6cb1 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2103,7 +2103,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDomainShader(ID3D11Device *i static HRESULT STDMETHODCALLTYPE d3d11_device_CreateComputeShader(ID3D11Device *iface, const void *byte_code, SIZE_T byte_code_length, ID3D11ClassLinkage *class_linkage, ID3D11ComputeShader **shader) { - FIXME("iface %p, byte_code %p, byte_code_lenghth %lu, class_linkage %p, shader %p stub!\n", + FIXME("iface %p, byte_code %p, byte_code_length %lu, class_linkage %p, shader %p stub!\n", iface, byte_code, byte_code_length, class_linkage, shader); return E_NOTIMPL; diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 41048fa..e521734 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -991,7 +991,7 @@ static HRESULT ddraw_set_cooperative_level(struct ddraw *ddraw, HWND window, ddraw->cooperative_level = cooplevel; ddraw->dest_window = window; - TRACE("SetCooperativeLevel retuning DD_OK\n"); + TRACE("SetCooperativeLevel returning DD_OK\n"); hr = DD_OK; done: ddraw->flags &= ~DDRAW_SCL_RECURSIVE; diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 4ad1da8..53dc04b 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -3956,8 +3956,8 @@ static void test_GetFileInformationByHandleEx(void) ret = pGetFileInformationByHandleEx(file, FileStandardInfo, buffer, sizeof(buffer)); ok(ret, "GetFileInformationByHandleEx: failed to get FileStandardInfo, %u\n", GetLastError()); standardInfo = (FILE_STANDARD_INFO *)buffer; - ok(standardInfo->NumberOfLinks == 1, "GetFileInformationByHandleEx: Unexpcted number of links\n"); - ok(standardInfo->DeletePending == FALSE, "GetFileInformationByHandleEx: Unexpcted pending delete\n"); + ok(standardInfo->NumberOfLinks == 1, "GetFileInformationByHandleEx: Unexpected number of links\n"); + ok(standardInfo->DeletePending == FALSE, "GetFileInformationByHandleEx: Unexpected pending delete\n"); ok(standardInfo->Directory == FALSE, "GetFileInformationByHandleEx: Incorrect directory flag\n"); /* Test FileNameInfo */ diff --git a/dlls/msvcrt/tests/scanf.c b/dlls/msvcrt/tests/scanf.c index 97b8074..3c5a05e 100644 --- a/dlls/msvcrt/tests/scanf.c +++ b/dlls/msvcrt/tests/scanf.c @@ -165,7 +165,7 @@ static void test_sscanf( void ) ret = sscanf(buffer, "%lld", &result64); ok(ret == 1, "Wrong number of arguments read: %d\n", ret); ret = sprintf(buffer1, "%lld", result64); - ok(ret==14 || broken(ret==10), "sprintf retuned %d\n", ret); + ok(ret==14 || broken(ret==10), "sprintf returned %d\n", ret); if(ret == 14) ok(!strcmp(buffer, buffer1), "got %s, expected %s\n", buffer1, buffer); diff --git a/dlls/ole32/defaulthandler.c b/dlls/ole32/defaulthandler.c index 3200f4b..e6c52cd 100644 --- a/dlls/ole32/defaulthandler.c +++ b/dlls/ole32/defaulthandler.c @@ -253,7 +253,7 @@ static HRESULT WINAPI DefaultHandler_NDIUnknown_QueryInterface( /* Check that we obtained an interface. */ if (*ppvObject == NULL) { - WARN( "() : asking for un supported interface %s\n", debugstr_guid(riid)); + WARN( "() : asking for unsupported interface %s\n", debugstr_guid(riid)); return E_NOINTERFACE; } diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 5ce83e0..44157de 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -472,7 +472,7 @@ static HRESULT WINAPI OLEPictureImpl_QueryInterface( if (!*ppvObject) { - FIXME("() : asking for un supported interface %s\n",debugstr_guid(riid)); + FIXME("() : asking for unsupported interface %s\n",debugstr_guid(riid)); return E_NOINTERFACE; } diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index ebfef2b..d63f1fe 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -1305,14 +1305,14 @@ static void test_CopyBindInfo(void) memset(src, 0, sizeof(BINDINFO[2])); memset(dest, 0xde, sizeof(BINDINFO[2])); hres = pCopyBindInfo(src, dest); - ok(hres == E_INVALIDARG, "CopyBindInfo retuned: %08x, expected E_INVALIDARG\n", hres); + ok(hres == E_INVALIDARG, "CopyBindInfo returned: %08x, expected E_INVALIDARG\n", hres); memset(src, 0, sizeof(BINDINFO[2])); memset(dest, 0xde, sizeof(BINDINFO[2])); src[0].cbSize = sizeof(BINDINFO); dest[0].cbSize = 0; hres = pCopyBindInfo(src, dest); - ok(hres == E_INVALIDARG, "CopyBindInfo retuned: %08x, expected E_INVALIDARG\n", hres); + ok(hres == E_INVALIDARG, "CopyBindInfo returned: %08x, expected E_INVALIDARG\n", hres); memset(src, 0, sizeof(BINDINFO[2])); memset(dest, 0xde, sizeof(BINDINFO[2])); diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 01d52ea..a55db96 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -1371,7 +1371,7 @@ static HRESULT WINAPI BindInfo_GetBindString(IInternetBindInfo *iface, ULONG ulS CHECK_EXPECT(GetBindString_USER_AGENT); ok(cEl == 1, "cEl=%d, expected 1\n", cEl); if(pcElFetched) { - ok(*pcElFetched == 0, "*pcElFetch=%d, expectd 0\n", *pcElFetched); + ok(*pcElFetched == 0, "*pcElFetch=%d, expected 0\n", *pcElFetched); *pcElFetched = 1; } if(ppwzStr) { @@ -1383,14 +1383,14 @@ static HRESULT WINAPI BindInfo_GetBindString(IInternetBindInfo *iface, ULONG ulS CHECK_EXPECT(GetBindString_POST_COOKIE); ok(cEl == 1, "cEl=%d, expected 1\n", cEl); if(pcElFetched) - ok(*pcElFetched == 0, "*pcElFetch=%d, expectd 0\n", *pcElFetched); + ok(*pcElFetched == 0, "*pcElFetch=%d, expected 0\n", *pcElFetched); return S_OK; case BINDSTRING_URL: { DWORD size; CHECK_EXPECT(GetBindString_URL); ok(cEl == 1, "cEl=%d, expected 1\n", cEl); - ok(*pcElFetched == 0, "*pcElFetch=%d, expectd 0\n", *pcElFetched); + ok(*pcElFetched == 0, "*pcElFetch=%d, expected 0\n", *pcElFetched); *pcElFetched = 1; size = (lstrlenW(binding_urls[tested_protocol])+1)*sizeof(WCHAR); diff --git a/dlls/user32/tests/combo.c b/dlls/user32/tests/combo.c index b6d5ef6..0d22fa5 100644 --- a/dlls/user32/tests/combo.c +++ b/dlls/user32/tests/combo.c @@ -378,12 +378,12 @@ static void test_changesize( DWORD style) /* first make it slightly smaller */ MoveWindow( hCombo, 10, 10, clwidth - 2, clheight - 2, TRUE); GetClientRect( hCombo, &rc); - ok( rc.right - rc.left == clwidth - 2, "clientrect witdh is %d vs %d\n", + ok( rc.right - rc.left == clwidth - 2, "clientrect width is %d vs %d\n", rc.right - rc.left, clwidth - 2); ok( rc.bottom - rc.top == clheight, "clientrect height is %d vs %d\n", rc.bottom - rc.top, clheight); SendMessageA(hCombo, CB_GETDROPPEDCONTROLRECT, 0, (LPARAM)&rc); - ok( rc.right - rc.left == clwidth - 2, "drop-down rect witdh is %d vs %d\n", + ok( rc.right - rc.left == clwidth - 2, "drop-down rect width is %d vs %d\n", rc.right - rc.left, clwidth - 2); ok( rc.bottom - rc.top == ddheight, "drop-down rect height is %d vs %d\n", rc.bottom - rc.top, ddheight); @@ -392,12 +392,12 @@ static void test_changesize( DWORD style) /* new cx, cy is slightly bigger than the initial values */ MoveWindow( hCombo, 10, 10, clwidth + 2, clheight + 2, TRUE); GetClientRect( hCombo, &rc); - ok( rc.right - rc.left == clwidth + 2, "clientrect witdh is %d vs %d\n", + ok( rc.right - rc.left == clwidth + 2, "clientrect width is %d vs %d\n", rc.right - rc.left, clwidth + 2); ok( rc.bottom - rc.top == clheight, "clientrect height is %d vs %d\n", rc.bottom - rc.top, clheight); SendMessageA(hCombo, CB_GETDROPPEDCONTROLRECT, 0, (LPARAM)&rc); - ok( rc.right - rc.left == clwidth + 2, "drop-down rect witdh is %d vs %d\n", + ok( rc.right - rc.left == clwidth + 2, "drop-down rect width is %d vs %d\n", rc.right - rc.left, clwidth + 2); todo_wine { ok( rc.bottom - rc.top == clheight + 2, "drop-down rect height is %d vs %d\n",

1 0

André Hentschel : ws2_32/tests: Don' t test function directly when reporting WSAGetLastError().
by Alexandre Julliard 27 Nov '15

27 Nov '15

Module: wine Branch: master Commit: 3701d7714eddc81013b98822a97eb65aa355effd URL: http://source.winehq.org/git/wine.git/?a=commit;h=3701d7714eddc81013b98822a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Nov 26 23:04:53 2015 +0100 ws2_32/tests: Don't test function directly when reporting WSAGetLastError(). Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index f483197..00fac77 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -6575,8 +6575,8 @@ static void test_WSAPoll(void) ok(POLL_ISSET(fdRead, POLLWRNORM), "fdRead socket events incorrect\n"); len = sizeof(id); id = 0xdeadbeef; - ok(!getsockopt(fdWrite, SOL_SOCKET, SO_ERROR, (char*)&id, &len), - "getsockopt failed with %d\n",WSAGetLastError()); + err = getsockopt(fdWrite, SOL_SOCKET, SO_ERROR, (char*)&id, &len); + ok(!err, "getsockopt failed with %d\n", WSAGetLastError()); ok(id == 0, "expected 0, got %d\n", id); /* Test data receiving notifications */ @@ -6655,8 +6655,8 @@ static void test_WSAPoll(void) ok(ret == 0, "expected 0, got %d\n", ret); len = sizeof(id); id = 0xdeadbeef; - ok(!getsockopt(fdWrite, SOL_SOCKET, SO_ERROR, (char*)&id, &len), - "getsockopt failed with %d\n", WSAGetLastError()); + err = getsockopt(fdWrite, SOL_SOCKET, SO_ERROR, (char*)&id, &len); + ok(!err, "getsockopt failed with %d\n", WSAGetLastError()); ok(id == WSAECONNREFUSED, "expected 10061, got %d\n", id); closesocket(fdWrite);

1 0

Thomas Faber : gdiplus/tests: Fix build with MSVC.
by Alexandre Julliard 27 Nov '15

27 Nov '15

Module: wine Branch: master Commit: 9b82368c3659e360f12b3dd557abaa65d45486ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b82368c3659e360f12b3dd55… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Thu Nov 26 17:34:49 2015 +0100 gdiplus/tests: Fix build with MSVC. VC 2010 can't initialize a structure with a structure. Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/image.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index d3e7202..6be4a5b 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -4699,10 +4699,10 @@ static void test_createeffect(void) CGpEffect *effect; HMODULE mod = GetModuleHandleA("gdiplus.dll"); int i; - const GUID effectlist[] = - {BlurEffectGuid, SharpenEffectGuid, ColorMatrixEffectGuid, ColorLUTEffectGuid, - BrightnessContrastEffectGuid, HueSaturationLightnessEffectGuid, LevelsEffectGuid, - TintEffectGuid, ColorBalanceEffectGuid, RedEyeCorrectionEffectGuid, ColorCurveEffectGuid}; + const GUID * const effectlist[] = + {&BlurEffectGuid, &SharpenEffectGuid, &ColorMatrixEffectGuid, &ColorLUTEffectGuid, + &BrightnessContrastEffectGuid, &HueSaturationLightnessEffectGuid, &LevelsEffectGuid, + &TintEffectGuid, &ColorBalanceEffectGuid, &RedEyeCorrectionEffectGuid, &ColorCurveEffectGuid}; pGdipCreateEffect = (void*)GetProcAddress( mod, "GdipCreateEffect"); pGdipDeleteEffect = (void*)GetProcAddress( mod, "GdipDeleteEffect"); @@ -4719,9 +4719,9 @@ static void test_createeffect(void) stat = pGdipCreateEffect(noneffect, &effect); todo_wine expect(Win32Error, stat); - for(i=0; i < sizeof(effectlist) / sizeof(GUID); i++) + for(i=0; i < sizeof(effectlist) / sizeof(effectlist[0]); i++) { - stat = pGdipCreateEffect(effectlist[i], &effect); + stat = pGdipCreateEffect(*effectlist[i], &effect); todo_wine expect(Ok, stat); if(stat == Ok) {

1 0

Thomas Faber : ntdll/tests: Fix build with PSDK headers.
by Alexandre Julliard 27 Nov '15

27 Nov '15

Module: wine Branch: master Commit: 429fcf3a9de63b3e88632b66aa33e672ad80ff8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=429fcf3a9de63b3e88632b66a… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Tue Nov 24 17:52:28 2015 +0100 ntdll/tests: Fix build with PSDK headers. CRITICAL_SECTION is distinct from RTL_CRITICAL_SECTION in PSDK. Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/rtl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 0f79f7d..94a22ac 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -96,8 +96,8 @@ static NTSTATUS (WINAPI *pRtlGetCompressionWorkSpaceSize)(USHORT, PULONG, PULON static NTSTATUS (WINAPI *pRtlDecompressBuffer)(USHORT, PUCHAR, ULONG, const UCHAR*, ULONG, PULONG); static NTSTATUS (WINAPI *pRtlDecompressFragment)(USHORT, PUCHAR, ULONG, const UCHAR*, ULONG, ULONG, PULONG, PVOID); static NTSTATUS (WINAPI *pRtlCompressBuffer)(USHORT, const UCHAR*, ULONG, PUCHAR, ULONG, ULONG, PULONG, PVOID); -static BOOL (WINAPI *pRtlIsCriticalSectionLocked)(RTL_CRITICAL_SECTION *); -static BOOL (WINAPI *pRtlIsCriticalSectionLockedByThread)(RTL_CRITICAL_SECTION *); +static BOOL (WINAPI *pRtlIsCriticalSectionLocked)(CRITICAL_SECTION *); +static BOOL (WINAPI *pRtlIsCriticalSectionLockedByThread)(CRITICAL_SECTION *); static HMODULE hkernel32 = 0; static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL);

1 0

Dmitry Timoshkov : oleaut32: Grow the marshalling buffer exponentially.
by Alexandre Julliard 26 Nov '15

26 Nov '15

Module: wine Branch: master Commit: 4a315cd78a3c97d76ae06e3185ab01a70eb9a1a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a315cd78a3c97d76ae06e318… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Nov 26 14:52:03 2015 +0800 oleaut32: Grow the marshalling buffer exponentially. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tmarshal.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index f4ce311..5fd1fdd 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -79,12 +79,14 @@ xbuf_resize(marshal_state *buf, DWORD newsize) if(buf->base) { + newsize = max(newsize, buf->size * 2); buf->base = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, buf->base, newsize); if(!buf->base) return E_OUTOFMEMORY; } else { + newsize = max(newsize, 256); buf->base = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, newsize); if(!buf->base) return E_OUTOFMEMORY; @@ -100,7 +102,7 @@ xbuf_add(marshal_state *buf, const BYTE *stuff, DWORD size) if(buf->size - buf->curoff < size) { - hr = xbuf_resize(buf, buf->size + size + 100); + hr = xbuf_resize(buf, buf->size + size); if(FAILED(hr)) return hr; } memcpy(buf->base+buf->curoff,stuff,size);

1 0

← Newer
1
2
3
4
5
6
7
8
...
63
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2015