August 2016 - Wine-Commits - list.winehq.org

Jacek Caban : winemac.drv: Added ThreadDetach entry point and use it instead of DllMain.
by Alexandre Julliard Aug. 29, 2016

Aug. 29, 2016

Module: wine Branch: master Commit: 8f0557940a5e21c307020850e7ec7a3f15406adf URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f0557940a5e21c307020850e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 25 14:36:54 2016 +0200 winemac.drv: Added ThreadDetach entry point and use it instead of DllMain. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/macdrv_main.c | 8 +++----- dlls/winemac.drv/winemac.drv.spec | 1 + 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index 2ce78d1..3b11751 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -290,9 +290,9 @@ static BOOL process_attach(void) /*********************************************************************** - * thread_detach + * ThreadDetach (MACDRV.@) */ -static void thread_detach(void) +void CDECL macdrv_ThreadDetach(void) { struct macdrv_thread_data *data = macdrv_thread_data(); @@ -382,12 +382,10 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID reserved) switch(reason) { case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( hinst ); macdrv_module = hinst; ret = process_attach(); break; - case DLL_THREAD_DETACH: - thread_detach(); - break; } return ret; } diff --git a/dlls/winemac.drv/winemac.drv.spec b/dlls/winemac.drv/winemac.drv.spec index aed05d9..2e29722 100644 --- a/dlls/winemac.drv/winemac.drv.spec +++ b/dlls/winemac.drv/winemac.drv.spec @@ -42,6 +42,7 @@ @ cdecl ShowWindow(long long ptr long) macdrv_ShowWindow @ cdecl SysCommand(long long long) macdrv_SysCommand @ cdecl SystemParametersInfo(long long ptr long) macdrv_SystemParametersInfo +@ cdecl ThreadDetach() macdrv_ThreadDetach @ cdecl ToUnicodeEx(long long ptr ptr long long long) macdrv_ToUnicodeEx @ cdecl UnregisterHotKey(long long long) macdrv_UnregisterHotKey @ cdecl UpdateLayeredWindow(long ptr ptr) macdrv_UpdateLayeredWindow

1 0

Jacek Caban : user32: Introduced ThreadDetach driver entry point.
by Alexandre Julliard Aug. 29, 2016

Aug. 29, 2016

Module: wine Branch: master Commit: f0e7bd248e7e2a2f2d49dde0ccc332e6b6d97306 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0e7bd248e7e2a2f2d49dde0c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 25 14:33:45 2016 +0200 user32: Introduced ThreadDetach driver entry point. The problem was diagnosed by Ken Thomases. Currently drivers use DllMain(DLL_THREAD_DETACH) to release thread data. The problem is that DLLs (like native urlmon.dll, esp. reproducible in IE8) may still do user32 calls after driver detaches thread. Loader ensures that since user32.dll was loaded before dependent DLLs, user32's DllMain will be called in the right moment. Due to lazy loading of drivers, we have no control over them. We may use a new entry point to make sure that we detach user32 and driver at the same time. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/driver.c | 13 +++++++++++-- dlls/user32/user_main.c | 1 + dlls/user32/user_private.h | 2 ++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 201988c..32acf28 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -155,6 +155,7 @@ static const USER_DRIVER *load_driver(void) GET_USER_FUNC(WindowPosChanging); GET_USER_FUNC(WindowPosChanged); GET_USER_FUNC(SystemParametersInfo); + GET_USER_FUNC(ThreadDetach); #undef GET_USER_FUNC } @@ -512,6 +513,10 @@ static BOOL CDECL nulldrv_SystemParametersInfo( UINT action, UINT int_param, voi return FALSE; } +static void CDECL nulldrv_ThreadDetach( void ) +{ +} + static USER_DRIVER null_driver = { /* keyboard functions */ @@ -572,7 +577,9 @@ static USER_DRIVER null_driver = nulldrv_WindowPosChanging, nulldrv_WindowPosChanged, /* system parameters */ - nulldrv_SystemParametersInfo + nulldrv_SystemParametersInfo, + /* thread management */ + nulldrv_ThreadDetach }; @@ -827,5 +834,7 @@ static USER_DRIVER lazy_load_driver = nulldrv_WindowPosChanging, nulldrv_WindowPosChanged, /* system parameters */ - nulldrv_SystemParametersInfo + nulldrv_SystemParametersInfo, + /* thread management */ + nulldrv_ThreadDetach }; diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index 45aea81..74a7617 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -303,6 +303,7 @@ static void thread_detach(void) exiting_thread_id = GetCurrentThreadId(); WDML_NotifyThreadDetach(); + USER_Driver->pThreadDetach(); if (thread_info->top_window) WIN_DestroyThreadWindows( thread_info->top_window ); if (thread_info->msg_window) WIN_DestroyThreadWindows( thread_info->msg_window ); diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index e4a2ed1..efad519 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -117,6 +117,8 @@ typedef struct tagUSER_DRIVER { void (CDECL *pWindowPosChanged)(HWND,HWND,UINT,const RECT *,const RECT *,const RECT *,const RECT *,struct window_surface*); /* system parameters */ BOOL (CDECL *pSystemParametersInfo)(UINT,UINT,void*,UINT); + /* thread management */ + void (CDECL *pThreadDetach)(void); } USER_DRIVER; extern const USER_DRIVER *USER_Driver DECLSPEC_HIDDEN;

1 0

Jacek Caban : kernel32: Fixed handling LOCALE_NAME_USER_DEFAULT in GetLocaleInfoEx.
by Alexandre Julliard Aug. 29, 2016

Aug. 29, 2016

Module: wine Branch: master Commit: 505406fc83b65dd1f9ebcbaabb582f0fabec1b0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=505406fc83b65dd1f9ebcbaab… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 26 22:13:17 2016 +0200 kernel32: Fixed handling LOCALE_NAME_USER_DEFAULT in GetLocaleInfoEx. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 2 +- dlls/kernel32/tests/locale.c | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index fefa373..b04d190 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -1726,7 +1726,7 @@ INT WINAPI GetLocaleInfoEx(LPCWSTR locale, LCTYPE info, LPWSTR buffer, INT len) if (!lcid) return 0; /* special handling for neutral locale names */ - if (info == LOCALE_SNAME && strlenW(locale) == 2) + if (info == LOCALE_SNAME && locale && strlenW(locale) == 2) { if (len && len < 3) { diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 7cb7859..701f8d7 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -4283,7 +4283,7 @@ static void test_IdnToUnicode(void) static void test_GetLocaleInfoEx(void) { static const WCHAR enW[] = {'e','n',0}; - WCHAR bufferW[80]; + WCHAR bufferW[80], buffer2[80]; INT ret; if (!pGetLocaleInfoEx) @@ -4354,6 +4354,12 @@ static void test_GetLocaleInfoEx(void) ok(!lstrcmpW(bufferW, ptr->name), "%s: got wrong LOCALE_SNAME %s\n", wine_dbgstr_w(ptr->name), wine_dbgstr_w(bufferW)); ptr++; } + + ret = pGetLocaleInfoEx(LOCALE_NAME_USER_DEFAULT, LOCALE_SNAME, bufferW, sizeof(bufferW)/sizeof(WCHAR)); + ok(ret && ret == lstrlenW(bufferW)+1, "got ret value %d\n", ret); + ret = GetLocaleInfoW(GetUserDefaultLCID(), LOCALE_SNAME, buffer2, sizeof(buffer2)/sizeof(WCHAR)); + ok(ret && ret == lstrlenW(buffer2)+1, "got ret value %d\n", ret); + ok(!lstrcmpW(bufferW, buffer2), "LOCALE_SNAMEs don't match %s %s\n", wine_dbgstr_w(bufferW), wine_dbgstr_w(buffer2)); } }

1 0

Vincent Povirk : gdiplus: Copy remap tables when cloning an ImageAttributes.
by Alexandre Julliard Aug. 29, 2016

Aug. 29, 2016

Module: wine Branch: master Commit: d26c0ca214cdb20b103f7c1875c6ea4f2bb1f2a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d26c0ca214cdb20b103f7c187… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Aug 26 15:14:10 2016 -0500 gdiplus: Copy remap tables when cloning an ImageAttributes. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/imageattributes.c | 38 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/imageattributes.c b/dlls/gdiplus/imageattributes.c index a76fe3b..2050706 100644 --- a/dlls/gdiplus/imageattributes.c +++ b/dlls/gdiplus/imageattributes.c @@ -30,18 +30,52 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); GpStatus WINGDIPAPI GdipCloneImageAttributes(GDIPCONST GpImageAttributes *imageattr, GpImageAttributes **cloneImageattr) { - GpStatus stat; + GpStatus stat = Ok; + struct color_remap_table remap_tables[ColorAdjustTypeCount] = {{0}}; + int i; TRACE("(%p, %p)\n", imageattr, cloneImageattr); if(!imageattr || !cloneImageattr) return InvalidParameter; - stat = GdipCreateImageAttributes(cloneImageattr); + for (i=0; i<ColorAdjustTypeCount; i++) + { + if (imageattr->colorremaptables[i].enabled) + { + remap_tables[i].enabled = TRUE; + remap_tables[i].mapsize = imageattr->colorremaptables[i].mapsize; + remap_tables[i].colormap = heap_alloc(sizeof(ColorMap) * remap_tables[i].mapsize); + + if (remap_tables[i].colormap) + { + memcpy(remap_tables[i].colormap, imageattr->colorremaptables[i].colormap, + sizeof(ColorMap) * remap_tables[i].mapsize); + } + else + { + stat = OutOfMemory; + break; + } + } + } + + if (stat == Ok) + stat = GdipCreateImageAttributes(cloneImageattr); if (stat == Ok) + { **cloneImageattr = *imageattr; + memcpy((*cloneImageattr)->colorremaptables, remap_tables, sizeof(remap_tables)); + } + + if (stat != Ok) + { + for (i=0; i<ColorAdjustTypeCount; i++) + heap_free(remap_tables[i].colormap); + } + return stat; }

1 0

Henri Verbeet : d3d8: Use wined3d_resource_unmap() in d3d8_indexbuffer_Unlock().
by Alexandre Julliard Aug. 29, 2016

Aug. 29, 2016

Module: wine Branch: master Commit: 743a47d3c4f5a809fc5de9f72a4a93d663e3171a URL: http://source.winehq.org/git/wine.git/?a=commit;h=743a47d3c4f5a809fc5de9f72… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 29 10:49:05 2016 +0200 d3d8: Use wined3d_resource_unmap() in d3d8_indexbuffer_Unlock(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/buffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d8/buffer.c b/dlls/d3d8/buffer.c index 2404506..8116c1b 100644 --- a/dlls/d3d8/buffer.c +++ b/dlls/d3d8/buffer.c @@ -490,7 +490,7 @@ static HRESULT WINAPI d3d8_indexbuffer_Unlock(IDirect3DIndexBuffer8 *iface) TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - wined3d_buffer_unmap(buffer->wined3d_buffer); + wined3d_resource_unmap(wined3d_buffer_get_resource(buffer->wined3d_buffer), 0); wined3d_mutex_unlock(); return D3D_OK;

1 0

Akihiro Sagawa : winex11: Fix log message in process_events().
by Alexandre Julliard Aug. 29, 2016

Aug. 29, 2016

Module: wine Branch: master Commit: 030e1f4f5f8d28a9ba77e7a929c3b43ad8420d45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=030e1f4f5f8d28a9ba77e7a92… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Aug 28 23:30:41 2016 +0900 winex11: Fix log message in process_events(). Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/event.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index d81ff2e..94b70f7 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -468,7 +468,7 @@ static int process_events( Display *display, Bool (*filter)(Display*, XEvent*,XP if (prev_event.type) queued |= call_event_handler( display, &prev_event ); free_event_data( &prev_event ); XFlush( gdi_display ); - if (count) TRACE( "%s %d events\n", queued ? "processed" : "ignored", count ); + if (count) TRACE( "processed %d events, returning %d\n", count, queued ); return queued; }

1 0

Nikolay Sivov : msdaps: Added AddRefAccessor() proxy/stub.
by Alexandre Julliard Aug. 29, 2016

Aug. 29, 2016

Module: wine Branch: master Commit: 1dcf2ae5a8ccb441219bb95e9c5b49150e62e890 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1dcf2ae5a8ccb441219bb95e9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Aug 27 13:29:14 2016 +0300 msdaps: Added AddRefAccessor() proxy/stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdaps/usrmarshal.c | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index 5f3be4f..43e3aae 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -645,17 +645,40 @@ HRESULT __RPC_STUB ICreateRow_CreateRow_Stub(ICreateRow* This, IUnknown *pUnkOut return hr; } -HRESULT CALLBACK IAccessor_AddRefAccessor_Proxy(IAccessor* This, HACCESSOR hAccessor, DBREFCOUNT *pcRefCount) +HRESULT CALLBACK IAccessor_AddRefAccessor_Proxy(IAccessor* This, HACCESSOR hAccessor, DBREFCOUNT *refcount) { - FIXME("(%p)->(%08lx, %p): stub\n", This, hAccessor, pcRefCount); - return E_NOTIMPL; + IErrorInfo *errorinfo; + DBREFCOUNT ref; + HRESULT hr; + + TRACE("(%p)->(%08lx, %p)\n", This, hAccessor, refcount); + + if (!refcount) + refcount = &ref; + + errorinfo = NULL; + hr = IAccessor_RemoteAddRefAccessor_Proxy(This, hAccessor, refcount, &errorinfo); + if (errorinfo) + { + SetErrorInfo(0, errorinfo); + IErrorInfo_Release(errorinfo); + } + + return hr; } HRESULT __RPC_STUB IAccessor_AddRefAccessor_Stub(IAccessor* This, HACCESSOR hAccessor, DBREFCOUNT *pcRefCount, IErrorInfo **ppErrorInfoRem) { - FIXME("(%p)->(%08lx, %p, %p): stub\n", This, hAccessor, pcRefCount, ppErrorInfoRem); - return E_NOTIMPL; + HRESULT hr; + + TRACE("(%p)->(%08lx, %p, %p)\n", This, hAccessor, pcRefCount, ppErrorInfoRem); + + hr = IAccessor_AddRefAccessor(This, hAccessor, pcRefCount); + if (FAILED(hr)) + GetErrorInfo(0, ppErrorInfoRem); + + return hr; } HRESULT CALLBACK IAccessor_CreateAccessor_Proxy(IAccessor* This, DBACCESSORFLAGS dwAccessorFlags, DBCOUNTITEM cBindings,

1 0

Huw Davies : crypt32/tests: Win 10 accepts carriage returns within a base64 four character block.
by Alexandre Julliard Aug. 26, 2016

Aug. 26, 2016

Module: wine Branch: master Commit: 30cdd1fb8cea410cb9e363b16278528669e2c19a URL: http://source.winehq.org/git/wine.git/?a=commit;h=30cdd1fb8cea410cb9e363b16… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Aug 26 15:03:00 2016 +0100 crypt32/tests: Win 10 accepts carriage returns within a base64 four character block. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/base64.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/crypt32/tests/base64.c b/dlls/crypt32/tests/base64.c index 335b9b7..48494b5 100644 --- a/dlls/crypt32/tests/base64.c +++ b/dlls/crypt32/tests/base64.c @@ -306,9 +306,6 @@ struct BadString }; static const struct BadString badStrings[] = { - { "A\r\nA\r\n=\r\n=\r\n", CRYPT_STRING_BASE64 }, - { "AA\r\n=\r\n=\r\n", CRYPT_STRING_BASE64 }, - { "AA=\r\n=\r\n", CRYPT_STRING_BASE64 }, { "-----BEGIN X509 CRL-----\r\nAA==\r\n", CRYPT_STRING_BASE64X509CRLHEADER }, }; @@ -340,7 +337,7 @@ static void testStringToBinaryA(void) ret = pCryptStringToBinaryA(badStrings[i].str, 0, badStrings[i].format, NULL, &bufLen, NULL, NULL); ok(!ret && GetLastError() == ERROR_INVALID_DATA, - "Expected ERROR_INVALID_DATA, got ret=%d le=%u\n", ret, GetLastError()); + "%d: Expected ERROR_INVALID_DATA, got ret=%d le=%u\n", i, ret, GetLastError()); } /* Good strings */ for (i = 0; i < sizeof(tests) / sizeof(tests[0]); i++)

1 0

Henri Verbeet : wined3d: Use wined3d_format_calculate_pitch() in wined3d_surface_upload_data().
by Alexandre Julliard Aug. 26, 2016

Aug. 26, 2016

Module: wine Branch: master Commit: 09b09b307a0c909bbc185dcb9348603d84a3b479 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09b09b307a0c909bbc185dcb9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 26 13:51:19 2016 +0200 wined3d: Use wined3d_format_calculate_pitch() in wined3d_surface_upload_data(). Mostly because wined3d_format_calculate_size() will need to handle WINED3DFMT_FLAG_BROKEN_PITCH, but it also makes more sense conceptually. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index efdea87..522874b 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -973,8 +973,7 @@ void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct w if (format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED) { - UINT row_length = wined3d_format_calculate_size(format, 1, update_w, 1, 1); - UINT row_count = (update_h + format->block_height - 1) / format->block_height; + unsigned int dst_row_pitch, dst_slice_pitch; const BYTE *addr = data->addr; GLenum internal; @@ -989,28 +988,31 @@ void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct w else internal = format->glInternal; + wined3d_format_calculate_pitch(format, 1, update_w, update_h, &dst_row_pitch, &dst_slice_pitch); + TRACE("Uploading compressed data, target %#x, level %u, layer %u, x %d, y %d, w %u, h %u, " "format %#x, image_size %#x, addr %p.\n", surface->texture_target, surface->texture_level, surface->texture_layer, - dst_point->x, dst_point->y, update_w, update_h, internal, row_count * row_length, addr); + dst_point->x, dst_point->y, update_w, update_h, internal, dst_slice_pitch, addr); - if (row_length == src_pitch) + if (dst_row_pitch == src_pitch) { if (surface->texture_target == GL_TEXTURE_2D_ARRAY) { GL_EXTCALL(glCompressedTexSubImage3D(surface->texture_target, surface->texture_level, dst_point->x, dst_point->y, surface->texture_layer, update_w, update_h, 1, - internal, row_count * row_length, addr)); + internal, dst_slice_pitch, addr)); } else { GL_EXTCALL(glCompressedTexSubImage2D(surface->texture_target, surface->texture_level, dst_point->x, dst_point->y, update_w, update_h, - internal, row_count * row_length, addr)); + internal, dst_slice_pitch, addr)); } } else { + UINT row_count = (update_h + format->block_height - 1) / format->block_height; UINT row, y; /* glCompressedTexSubImage2D() ignores pixel store state, so we @@ -1021,12 +1023,12 @@ void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct w { GL_EXTCALL(glCompressedTexSubImage3D(surface->texture_target, surface->texture_level, dst_point->x, y, surface->texture_layer, update_w, format->block_height, 1, - internal, row_length, addr)); + internal, dst_row_pitch, addr)); } else { GL_EXTCALL(glCompressedTexSubImage2D(surface->texture_target, surface->texture_level, - dst_point->x, y, update_w, format->block_height, internal, row_length, addr)); + dst_point->x, y, update_w, format->block_height, internal, dst_row_pitch, addr)); } y += format->block_height;

1 0

Henri Verbeet : wined3d: Send resource preloads through the command stream.
by Alexandre Julliard Aug. 26, 2016

Aug. 26, 2016

Module: wine Branch: master Commit: b2666a6316c68abc183eb7a351c6caaab797f608 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2666a6316c68abc183eb7a35… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 26 13:51:18 2016 +0200 wined3d: Send resource preloads through the command stream. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 30 ++++++++++++++++++++++++++++++ dlls/wined3d/resource.c | 2 +- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 32 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index c9d728c..05487e4 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -55,6 +55,7 @@ enum wined3d_cs_op WINED3D_CS_OP_RESET_STATE, WINED3D_CS_OP_DESTROY_OBJECT, WINED3D_CS_OP_QUERY_ISSUE, + WINED3D_CS_OP_PRELOAD_RESOURCE, WINED3D_CS_OP_UNLOAD_RESOURCE, }; @@ -276,6 +277,12 @@ struct wined3d_cs_query_issue DWORD flags; }; +struct wined3d_cs_preload_resource +{ + enum wined3d_cs_op opcode; + struct wined3d_resource *resource; +}; + struct wined3d_cs_unload_resource { enum wined3d_cs_op opcode; @@ -1250,6 +1257,28 @@ void wined3d_cs_emit_query_issue(struct wined3d_cs *cs, struct wined3d_query *qu cs->ops->submit(cs); } +static void wined3d_cs_exec_preload_resource(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_preload_resource *op = data; + struct wined3d_resource *resource = op->resource; + + resource->resource_ops->resource_preload(resource); + wined3d_resource_release(resource); +} + +void wined3d_cs_emit_preload_resource(struct wined3d_cs *cs, struct wined3d_resource *resource) +{ + struct wined3d_cs_preload_resource *op; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_PRELOAD_RESOURCE; + op->resource = resource; + + wined3d_resource_acquire(resource); + + cs->ops->submit(cs); +} + static void wined3d_cs_exec_unload_resource(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_unload_resource *op = data; @@ -1303,6 +1332,7 @@ static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void /* WINED3D_CS_OP_RESET_STATE */ wined3d_cs_exec_reset_state, /* WINED3D_CS_OP_DESTROY_OBJECT */ wined3d_cs_exec_destroy_object, /* WINED3D_CS_OP_QUERY_ISSUE */ wined3d_cs_exec_query_issue, + /* WINED3D_CS_OP_PRELOAD_RESOURCE */ wined3d_cs_exec_preload_resource, /* WINED3D_CS_OP_UNLOAD_RESOURCE */ wined3d_cs_exec_unload_resource, }; diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index f0695ef..70474c6 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -329,7 +329,7 @@ HRESULT CDECL wined3d_resource_unmap(struct wined3d_resource *resource, unsigned void CDECL wined3d_resource_preload(struct wined3d_resource *resource) { - resource->resource_ops->resource_preload(resource); + wined3d_cs_emit_preload_resource(resource->device->cs, resource); } BOOL wined3d_resource_allocate_sysmem(struct wined3d_resource *resource) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index fc8c397..e329962 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3048,6 +3048,7 @@ void wined3d_cs_emit_destroy_object(struct wined3d_cs *cs, void (*callback)(void *object), void *object) DECLSPEC_HIDDEN; void wined3d_cs_emit_draw(struct wined3d_cs *cs, int base_vertex_idx, unsigned int start_idx, unsigned int index_count, unsigned int start_instance, unsigned int instance_count, BOOL indexed) DECLSPEC_HIDDEN; +void wined3d_cs_emit_preload_resource(struct wined3d_cs *cs, struct wined3d_resource *resource) DECLSPEC_HIDDEN; void wined3d_cs_emit_present(struct wined3d_cs *cs, struct wined3d_swapchain *swapchain, const RECT *src_rect, const RECT *dst_rect, HWND dst_window_override, DWORD flags) DECLSPEC_HIDDEN; void wined3d_cs_emit_query_issue(struct wined3d_cs *cs, struct wined3d_query *query, DWORD flags) DECLSPEC_HIDDEN;

1 0