November 2013 - Wine-Commits

Hans Leidekker : mlang: Improve IMLangLineBreakConsole:: BreakLineA for the ASCII codepage.
by Alexandre Julliard Nov. 27, 2013

Nov. 27, 2013

Module: wine Branch: master Commit: 8c08faba490d821c61033eaec606e8862fe0964b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c08faba490d821c61033eaec… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 27 10:59:23 2013 +0100 mlang: Improve IMLangLineBreakConsole::BreakLineA for the ASCII codepage. --- dlls/mlang/mlang.c | 25 +++++++++++++++++++++---- 1 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 96ccbf7..f4a689c 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -36,6 +36,7 @@ #include "objbase.h" #include "rpcproxy.h" #include "mlang.h" +#include "mimeole.h" #include "wine/unicode.h" #include "wine/debug.h" @@ -44,8 +45,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mlang); #include "initguid.h" -#define CP_UNICODE 1200 - static HRESULT MultiLanguage_create(IUnknown *pUnkOuter, LPVOID *ppObj); static HRESULT MLangConvertCharset_create(IUnknown *outer, void **obj); static HRESULT EnumRfc1766_create(LANGID LangId, IEnumRfc1766 **ppEnum); @@ -3484,10 +3483,28 @@ static HRESULT WINAPI fnIMLangLineBreakConsole_BreakLineA( LONG* pcchLine, LONG* pcchSkip) { + LONG i, line = cchSrc, skip = 0; + FIXME("(%p)->%i %i %s %i %i %p %p\n", iface, locale, uCodePage, debugstr_an(pszSrc,cchSrc), cchSrc, cMaxColumns, pcchLine, pcchSkip); - *pcchLine = cchSrc; - *pcchSkip = 0; + if (uCodePage == CP_USASCII && cchSrc > cMaxColumns) + { + for (line = cMaxColumns, i = cMaxColumns - 1; i >= 0; i--) + { + if (pszSrc[i] == ' ') + { + while (i >= 0 && pszSrc[i] == ' ') + { + i--; + line--; + skip++; + } + break; + } + } + } + *pcchLine = line; + *pcchSkip = skip; return S_OK; }

1 0

Frédéric Delanoy : wintab32: Use BOOL type where appropriate.
by Alexandre Julliard Nov. 27, 2013

Nov. 27, 2013

Module: wine Branch: master Commit: c76cc4a555b4ea06768bbf474a6e251251fb256c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c76cc4a555b4ea06768bbf474… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Nov 27 08:52:01 2013 +0100 wintab32: Use BOOL type where appropriate. --- dlls/wintab32/context.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/wintab32/context.c b/dlls/wintab32/context.c index c8940b3..7278373 100644 --- a/dlls/wintab32/context.c +++ b/dlls/wintab32/context.c @@ -624,7 +624,7 @@ BOOL WINAPI WTPacket(HCTX hCtx, UINT wSerial, LPVOID lpPkt) TRACE("(%p, %d, %p)\n", hCtx, wSerial, lpPkt); if (!hCtx) - return 0; + return FALSE; EnterCriticalSection(&csTablet); @@ -632,7 +632,7 @@ BOOL WINAPI WTPacket(HCTX hCtx, UINT wSerial, LPVOID lpPkt) if (!context) { LeaveCriticalSection(&csTablet); - return 0; + return FALSE; } rc = TABLET_FindPacket(context ,wSerial, &wtp); @@ -671,7 +671,7 @@ BOOL WINAPI WTEnable(HCTX hCtx, BOOL fEnable) if (!context) { LeaveCriticalSection(&csTablet); - return 0; + return FALSE; } /* if we want to enable and it is not enabled then */ @@ -770,14 +770,14 @@ BOOL WINAPI WTGetA(HCTX hCtx, LPLOGCONTEXTA lpLogCtx) TRACE("(%p, %p)\n", hCtx, lpLogCtx); - if (!hCtx) return 0; + if (!hCtx) return FALSE; EnterCriticalSection(&csTablet); context = TABLET_FindOpenContext(hCtx); if (!context) { LeaveCriticalSection(&csTablet); - return 0; + return FALSE; } LOGCONTEXTWtoA(&context->context, lpLogCtx); @@ -795,14 +795,14 @@ BOOL WINAPI WTGetW(HCTX hCtx, LPLOGCONTEXTW lpLogCtx) TRACE("(%p, %p)\n", hCtx, lpLogCtx); - if (!hCtx) return 0; + if (!hCtx) return FALSE; EnterCriticalSection(&csTablet); context = TABLET_FindOpenContext(hCtx); if (!context) { LeaveCriticalSection(&csTablet); - return 0; + return FALSE; } memmove(lpLogCtx,&context->context,sizeof(LOGCONTEXTW)); @@ -1066,7 +1066,7 @@ BOOL WINAPI WTQueuePacketsEx(HCTX hCtx, UINT *lpOld, UINT *lpNew) TRACE("(%p, %p, %p)\n", hCtx, lpOld, lpNew); - if (!hCtx) return 0; + if (!hCtx) return FALSE; EnterCriticalSection(&csTablet); @@ -1117,7 +1117,7 @@ BOOL WINAPI WTQueueSizeSet(HCTX hCtx, int nPkts) TRACE("(%p, %d)\n", hCtx, nPkts); - if (!hCtx) return 0; + if (!hCtx) return FALSE; EnterCriticalSection(&csTablet); @@ -1125,7 +1125,7 @@ BOOL WINAPI WTQueueSizeSet(HCTX hCtx, int nPkts) if (!context) { LeaveCriticalSection(&csTablet); - return 0; + return FALSE; } context->PacketQueue = HeapReAlloc(GetProcessHeap(), 0,

1 0

Frédéric Delanoy : winmm: Use BOOL type where appropriate.
by Alexandre Julliard Nov. 27, 2013

Nov. 27, 2013

Module: wine Branch: master Commit: 576102e9aa1cb3039ac559b812d1c7b2c3ab15aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=576102e9aa1cb3039ac559b81… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Nov 27 08:52:00 2013 +0100 winmm: Use BOOL type where appropriate. --- dlls/winmm/lolvldrv.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/lolvldrv.c b/dlls/winmm/lolvldrv.c index f387323..c3b3674 100644 --- a/dlls/winmm/lolvldrv.c +++ b/dlls/winmm/lolvldrv.c @@ -64,7 +64,8 @@ static WINE_LLTYPE llTypes[MMDRV_MAX] = { { "WaveOut", 0, 0, -1 } }; -static int drivers_loaded, MMDrvsHi; +static BOOL drivers_loaded; +static int MMDrvsHi; static WINE_MM_DRIVER MMDrvs[8]; static LPWINE_MLD MM_MLDrvs[40]; #define MAX_MM_MLDRVS (sizeof(MM_MLDrvs) / sizeof(MM_MLDrvs[0])) @@ -73,7 +74,7 @@ static void MMDRV_Init(void); static void MMDRV_InitSingleType(UINT type) { if (!drivers_loaded) { - drivers_loaded = 1; + drivers_loaded = TRUE; MMDRV_Init(); } }

1 0

André Hentschel : ddrawex/tests: Don' t crash when IDirectDraw4 query fails.
by Alexandre Julliard Nov. 27, 2013

Nov. 27, 2013

Module: wine Branch: master Commit: ef6cc1a282ae378009b944792b11aca66bd37122 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef6cc1a282ae378009b944792… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Nov 26 23:49:03 2013 +0100 ddrawex/tests: Don't crash when IDirectDraw4 query fails. --- dlls/ddrawex/tests/ddrawex.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/ddrawex/tests/ddrawex.c b/dlls/ddrawex/tests/ddrawex.c index aa31b2f..7134a04 100644 --- a/dlls/ddrawex/tests/ddrawex.c +++ b/dlls/ddrawex/tests/ddrawex.c @@ -50,6 +50,7 @@ static void RefCountTest(void) IDirectDraw2 *dd2; IDirectDraw3 *dd3; IDirectDraw4 *dd4; + HRESULT hr; ULONG ref; ref = get_ref((IUnknown *) dd1); @@ -76,7 +77,15 @@ static void RefCountTest(void) ref = get_ref((IUnknown *) dd3); ok(ref == 3, "IDirectDraw3 refcount is %u, expected 3\n", ref); - IDirectDraw_QueryInterface(dd1, &IID_IDirectDraw4, (void **) &dd4); + hr = IDirectDraw_QueryInterface(dd1, &IID_IDirectDraw4, (void **) &dd4); + if (FAILED(hr)) + { + win_skip("Failed to query IDirectDraw4\n"); + IDirectDraw_Release(dd1); + IDirectDraw2_Release(dd2); + IDirectDraw3_Release(dd3); + return; + } ref = get_ref((IUnknown *) dd4); ok(ref == 4, "IDirectDraw4 refcount is %u, expected 4\n", ref);

1 0

André Hentschel : ole32/tests: Don' t crash when StgOpenStorage fails.
by Alexandre Julliard Nov. 27, 2013

Nov. 27, 2013

Module: wine Branch: master Commit: 04f5160c93af4fbb509993f955482a909940fd44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04f5160c93af4fbb509993f95… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Nov 26 23:48:59 2013 +0100 ole32/tests: Don't crash when StgOpenStorage fails. --- dlls/ole32/tests/storage32.c | 22 ++++++++++++---------- 1 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 61744a9..06d2fa4 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -3082,19 +3082,21 @@ if (hr == S_OK) { /* writer mode */ hr = StgOpenStorage(fileW, NULL, STGM_DIRECT_SWMR | STGM_READWRITE | STGM_SHARE_DENY_WRITE, NULL, 0, &stg); ok(hr == S_OK, "got %08x\n", hr); + if(hr == S_OK) + { + ref = IStorage_AddRef(stg); + IStorage_Release(stg); - ref = IStorage_AddRef(stg); - IStorage_Release(stg); - - hr = IStorage_QueryInterface(stg, &IID_IDirectWriterLock, (void**)&dwlock); - ok(hr == S_OK, "got %08x\n", hr); + hr = IStorage_QueryInterface(stg, &IID_IDirectWriterLock, (void**)&dwlock); + ok(hr == S_OK, "got %08x\n", hr); - ref2 = IStorage_AddRef(stg); - IStorage_Release(stg); - ok(ref2 == ref + 1, "got %u\n", ref2); + ref2 = IStorage_AddRef(stg); + IStorage_Release(stg); + ok(ref2 == ref + 1, "got %u\n", ref2); - IDirectWriterLock_Release(dwlock); - IStorage_Release(stg); + IDirectWriterLock_Release(dwlock); + IStorage_Release(stg); + } DeleteFileW(fileW); }

1 0

Frédéric Delanoy : wininet/tests: Use BOOL type where appropriate.
by Alexandre Julliard Nov. 27, 2013

Nov. 27, 2013

Module: wine Branch: master Commit: 0940037301b2abdf308e147fdc8d065cefbd9f07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0940037301b2abdf308e147fd… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Nov 27 08:51:59 2013 +0100 wininet/tests: Use BOOL type where appropriate. --- dlls/wininet/tests/http.c | 128 ++++++++++++++++++++++---------------------- 1 files changed, 64 insertions(+), 64 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0940037301b2abdf308e1…

1 0

Frédéric Delanoy : wininet: Use BOOL type where appropriate.
by Alexandre Julliard Nov. 27, 2013

Nov. 27, 2013

Module: wine Branch: master Commit: 21618deb400f1eb1ce5ba0fd866fe0312c843407 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21618deb400f1eb1ce5ba0fd8… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Nov 27 08:51:58 2013 +0100 wininet: Use BOOL type where appropriate. --- dlls/wininet/internet.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 73fdfe4..a49026c 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -4631,7 +4631,7 @@ BOOL WINAPI ResumeSuspendedDownload( HINTERNET hInternet, DWORD dwError ) BOOL WINAPI InternetQueryFortezzaStatus(DWORD *a, DWORD_PTR b) { FIXME("(%p, %08lx) stub\n", a, b); - return 0; + return FALSE; } DWORD WINAPI ShowClientAuthCerts(HWND parent)

1 0

Frédéric Delanoy : winhttp/tests: Use BOOL type where appropriate.
by Alexandre Julliard Nov. 27, 2013

Nov. 27, 2013

Module: wine Branch: master Commit: 4bb0d0eac9650dd0bfea79c510628d1df6693803 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bb0d0eac9650dd0bfea79c51… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Nov 27 08:51:57 2013 +0100 winhttp/tests: Use BOOL type where appropriate. --- dlls/winhttp/tests/notification.c | 64 ++++++++++++++++++------------------ 1 files changed, 32 insertions(+), 32 deletions(-) diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index 4643193..9fcc64c 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -44,9 +44,9 @@ struct notification { enum api function; /* api responsible for notification */ unsigned int status; /* status received */ - int todo; - int ignore; - int skipped_for_proxy; + BOOL todo; + BOOL ignore; + BOOL skipped_for_proxy; }; struct info @@ -132,9 +132,9 @@ static const struct notification cache_test[] = { winhttp_send_request, WINHTTP_CALLBACK_STATUS_REQUEST_SENT }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CLOSING_CONNECTION, 0, 1 }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CONNECTION_CLOSED, 0, 1 }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, 0, 1 }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CLOSING_CONNECTION, FALSE, TRUE }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CONNECTION_CLOSED, FALSE, TRUE }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, FALSE, TRUE }, { winhttp_open_request, WINHTTP_CALLBACK_STATUS_HANDLE_CREATED }, { winhttp_send_request, WINHTTP_CALLBACK_STATUS_CONNECTING_TO_SERVER }, { winhttp_send_request, WINHTTP_CALLBACK_STATUS_CONNECTED_TO_SERVER }, @@ -142,11 +142,11 @@ static const struct notification cache_test[] = { winhttp_send_request, WINHTTP_CALLBACK_STATUS_REQUEST_SENT }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CLOSING_CONNECTION, 0, 1 }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CONNECTION_CLOSED, 0, 1 }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, 0, 1 }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, 1, 1 }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, 1, 1 } + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CLOSING_CONNECTION, FALSE, TRUE }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CONNECTION_CLOSED, FALSE, TRUE }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, FALSE, TRUE }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, TRUE, TRUE }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, TRUE, TRUE } }; static void setup_test( struct info *info, enum api function, unsigned int line ) @@ -309,19 +309,19 @@ static const struct notification redirect_test[] = { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_REDIRECT }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RESOLVING_NAME, 0, 0, 1 }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_NAME_RESOLVED, 0, 0, 1 }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_CONNECTING_TO_SERVER, 0, 0, 1 }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_CONNECTED_TO_SERVER, 0, 0, 1 }, + { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RESOLVING_NAME, FALSE, FALSE, TRUE }, + { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_NAME_RESOLVED, FALSE, FALSE, TRUE }, + { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_CONNECTING_TO_SERVER, FALSE, FALSE, TRUE }, + { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_CONNECTED_TO_SERVER, FALSE, FALSE, TRUE }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_SENDING_REQUEST }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_REQUEST_SENT }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CLOSING_CONNECTION, 0, 1 }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CONNECTION_CLOSED, 0, 1 }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, 0, 1 }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, 1, 1 }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, 1, 1 } + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CLOSING_CONNECTION, FALSE, TRUE }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CONNECTION_CLOSED, FALSE, TRUE }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, FALSE, TRUE }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, TRUE, TRUE }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, TRUE, TRUE } }; static void test_redirect( void ) @@ -387,24 +387,24 @@ static const struct notification async_test[] = { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_REDIRECT }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RESOLVING_NAME, 0, 0, 1 }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_NAME_RESOLVED, 0, 0, 1 }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_CONNECTING_TO_SERVER, 0, 0, 1 }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_CONNECTED_TO_SERVER, 0, 0, 1 }, + { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RESOLVING_NAME, FALSE, FALSE, TRUE }, + { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_NAME_RESOLVED, FALSE, FALSE, TRUE }, + { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_CONNECTING_TO_SERVER, FALSE, FALSE, TRUE }, + { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_CONNECTED_TO_SERVER, FALSE, FALSE, TRUE }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_SENDING_REQUEST }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_REQUEST_SENT }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_HEADERS_AVAILABLE }, { winhttp_query_data, WINHTTP_CALLBACK_STATUS_DATA_AVAILABLE }, - { winhttp_read_data, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE, 0, 1 }, - { winhttp_read_data, WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED, 0, 1 }, - { winhttp_read_data, WINHTTP_CALLBACK_STATUS_READ_COMPLETE, 0, 1 }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CLOSING_CONNECTION, 0, 1 }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CONNECTION_CLOSED, 0, 1 }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, 0, 1 }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, 1, 1 }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, 1, 1 } + { winhttp_read_data, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE, FALSE, TRUE }, + { winhttp_read_data, WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED, FALSE, TRUE }, + { winhttp_read_data, WINHTTP_CALLBACK_STATUS_READ_COMPLETE, FALSE, TRUE }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CLOSING_CONNECTION, FALSE, TRUE }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CONNECTION_CLOSED, FALSE, TRUE }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, FALSE, TRUE }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, TRUE, TRUE }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, TRUE, TRUE } }; static void test_async( void )

1 0

Stefan Dösinger : wined3d: Use the pointer returned by map in wined3d_surface_getdc.
by Alexandre Julliard Nov. 26, 2013

Nov. 26, 2013

Module: wine Branch: master Commit: eb446e8640c694bb737ef0a38d127eeb3f186bf8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb446e8640c694bb737ef0a38… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Nov 25 23:41:12 2013 +0100 wined3d: Use the pointer returned by map in wined3d_surface_getdc. --- dlls/wined3d/surface.c | 13 ++++++------- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 50bc6e7..dcb8ebf 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3324,11 +3324,10 @@ HRESULT CDECL wined3d_surface_getdc(struct wined3d_surface *surface, HDC *dc) ERR("Map failed, hr %#x.\n", hr); return hr; } + surface->getdc_map_mem = map.data; - /* Sync the DIB with the PBO. This can't be done earlier because Map() - * activates the allocatedMemory. */ - if (surface->flags & (SFLAG_PBO | SFLAG_PIN_SYSMEM)) - memcpy(surface->dib.bitmap_data, surface->resource.allocatedMemory, surface->resource.size); + if (surface->dib.bitmap_data != surface->getdc_map_mem) + memcpy(surface->dib.bitmap_data, surface->getdc_map_mem, surface->resource.size); if (surface->resource.format->id == WINED3DFMT_P8_UINT || surface->resource.format->id == WINED3DFMT_P8_UINT_A8_UNORM) @@ -3389,11 +3388,11 @@ HRESULT CDECL wined3d_surface_releasedc(struct wined3d_surface *surface, HDC dc) return WINEDDERR_NODC; } - /* Copy the contents of the DIB over to the PBO. */ - if ((surface->flags & (SFLAG_PBO | SFLAG_PIN_SYSMEM)) && surface->resource.allocatedMemory) - memcpy(surface->resource.allocatedMemory, surface->dib.bitmap_data, surface->resource.size); + if (surface->dib.bitmap_data != surface->getdc_map_mem) + memcpy(surface->getdc_map_mem, surface->dib.bitmap_data, surface->resource.size); /* We locked first, so unlock now. */ + surface->getdc_map_mem = NULL; wined3d_surface_unmap(surface); surface->flags &= ~SFLAG_DCINUSE; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d7e1c5f..5b5d01a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2204,6 +2204,7 @@ struct wined3d_surface /* For GetDC */ struct wined3d_surface_dib dib; HDC hDC; + void *getdc_map_mem; /* Color keys for DDraw */ struct wined3d_color_key dst_blt_color_key;

1 0

Stefan Dösinger : wined3d: Don' t set SFLAG_INSYSMEM in surface_download_data.
by Alexandre Julliard Nov. 26, 2013

Nov. 26, 2013

Module: wine Branch: master Commit: 038e45c6624443be1c594d280a5f3831994d96e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=038e45c6624443be1c594d280… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Nov 25 23:41:11 2013 +0100 wined3d: Don't set SFLAG_INSYSMEM in surface_download_data. surface_load_location takes care of this. --- dlls/wined3d/surface.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 5256eb8..50bc6e7 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1671,9 +1671,6 @@ static void surface_download_data(struct wined3d_surface *surface, const struct HeapFree(GetProcessHeap(), 0, mem); } } - - /* Surface has now been downloaded */ - surface->flags |= SFLAG_INSYSMEM; } /* This call just uploads data, the caller is responsible for binding the

1 0