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

Alexandre Julliard : newdev: Build with msvcrt.
by Alexandre Julliard 14 Jun '19

14 Jun '19

Module: wine Branch: master Commit: e97ec06022640c8e747fc4e7bf3346902fa3cc43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e97ec06022640c8e747fc4e7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 14 09:22:56 2019 +0200 newdev: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/newdev/Makefile.in | 2 ++ dlls/newdev/main.c | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/newdev/Makefile.in b/dlls/newdev/Makefile.in index c447a38..85086f1 100644 --- a/dlls/newdev/Makefile.in +++ b/dlls/newdev/Makefile.in @@ -2,4 +2,6 @@ MODULE = newdev.dll IMPORTLIB = newdev IMPORTS = setupapi +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = main.c diff --git a/dlls/newdev/main.c b/dlls/newdev/main.c index 108aec0..72e7cbc 100644 --- a/dlls/newdev/main.c +++ b/dlls/newdev/main.c @@ -23,6 +23,7 @@ #include "windef.h" #include "winerror.h" #include "winbase.h" +#include "winnls.h" #include "winuser.h" #include "winreg.h" #include "cfgmgr32.h" @@ -30,7 +31,6 @@ #include "wine/debug.h" #include "wine/heap.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(setupapi); @@ -71,9 +71,9 @@ static BOOL hardware_id_matches(const WCHAR *id, const WCHAR *device_ids) { while (*device_ids) { - if (!strcmpW(id, device_ids)) + if (!wcscmp(id, device_ids)) return TRUE; - device_ids += strlenW(device_ids) + 1; + device_ids += lstrlenW(device_ids) + 1; } return FALSE; } @@ -128,7 +128,7 @@ BOOL WINAPI UpdateDriverForPlugAndPlayDevicesW(HWND parent, const WCHAR *hardwar if (!SetupDiGetDeviceInstallParamsW(set, &device, &params)) continue; - strcpyW(params.DriverPath, inf_path); + lstrcpyW(params.DriverPath, inf_path); params.Flags |= DI_ENUMSINGLEINF; if (!SetupDiSetDeviceInstallParamsW(set, &device, &params)) continue;

1 0

Gabriel Ivăncescu : comctl32/listbox: Fix mouse wheel scrolling for multi-column listboxes.
by Alexandre Julliard 14 Jun '19

14 Jun '19

Module: wine Branch: master Commit: 1f3787519463bd99994a34a8648b7b9797bca985 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f3787519463bd99994a34a8… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Jun 5 14:38:57 2019 +0300 comctl32/listbox: Fix mouse wheel scrolling for multi-column listboxes. Multi-column listboxes scroll horizontally, so each wheel tick must go an entire page at a time instead of an item at a time. But we have to limit the amount of scrolling in this case to avoid "jumping over" columns, if the window is too small. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=22253 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listbox.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 8fd556c..ab4c481 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -2068,7 +2068,7 @@ static LRESULT LISTBOX_HandleHScroll( LB_DESCR *descr, WORD scrollReq, WORD pos static LRESULT LISTBOX_HandleMouseWheel(LB_DESCR *descr, SHORT delta ) { - UINT pulScrollLines = 3; + INT pulScrollLines = 3; SystemParametersInfoW(SPI_GETWHEELSCROLLLINES,0, &pulScrollLines, 0); @@ -2082,9 +2082,20 @@ static LRESULT LISTBOX_HandleMouseWheel(LB_DESCR *descr, SHORT delta ) if (descr->wheel_remain && pulScrollLines) { int cLineScroll; - pulScrollLines = min((UINT) descr->page_size, pulScrollLines); - cLineScroll = pulScrollLines * (float)descr->wheel_remain / WHEEL_DELTA; - descr->wheel_remain -= WHEEL_DELTA * cLineScroll / (int)pulScrollLines; + if (descr->style & LBS_MULTICOLUMN) + { + pulScrollLines = min(descr->width / descr->column_width, pulScrollLines); + pulScrollLines = max(1, pulScrollLines); + cLineScroll = pulScrollLines * descr->wheel_remain / WHEEL_DELTA; + descr->wheel_remain -= WHEEL_DELTA * cLineScroll / pulScrollLines; + cLineScroll *= descr->page_size; + } + else + { + pulScrollLines = min(descr->page_size, pulScrollLines); + cLineScroll = pulScrollLines * descr->wheel_remain / WHEEL_DELTA; + descr->wheel_remain -= WHEEL_DELTA * cLineScroll / pulScrollLines; + } LISTBOX_SetTopItem( descr, descr->top_item - cLineScroll, TRUE ); } return 0;

1 0

Gabriel Ivăncescu : user32/listbox: Fix mouse wheel scrolling for multi-column listboxes.
by Alexandre Julliard 14 Jun '19

14 Jun '19

Module: wine Branch: master Commit: b95bc8427322d1fdcb79937aa16ef7e31f95f556 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b95bc8427322d1fdcb79937a… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Jun 5 14:38:58 2019 +0300 user32/listbox: Fix mouse wheel scrolling for multi-column listboxes. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=22253 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/listbox.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 52f01a7..3949610 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -2083,7 +2083,7 @@ static LRESULT LISTBOX_HandleHScroll( LB_DESCR *descr, WORD scrollReq, WORD pos static LRESULT LISTBOX_HandleMouseWheel(LB_DESCR *descr, SHORT delta ) { - UINT pulScrollLines = 3; + INT pulScrollLines = 3; SystemParametersInfoW(SPI_GETWHEELSCROLLLINES,0, &pulScrollLines, 0); @@ -2097,9 +2097,20 @@ static LRESULT LISTBOX_HandleMouseWheel(LB_DESCR *descr, SHORT delta ) if (descr->wheel_remain && pulScrollLines) { int cLineScroll; - pulScrollLines = min((UINT) descr->page_size, pulScrollLines); - cLineScroll = pulScrollLines * (float)descr->wheel_remain / WHEEL_DELTA; - descr->wheel_remain -= WHEEL_DELTA * cLineScroll / (int)pulScrollLines; + if (descr->style & LBS_MULTICOLUMN) + { + pulScrollLines = min(descr->width / descr->column_width, pulScrollLines); + pulScrollLines = max(1, pulScrollLines); + cLineScroll = pulScrollLines * descr->wheel_remain / WHEEL_DELTA; + descr->wheel_remain -= WHEEL_DELTA * cLineScroll / pulScrollLines; + cLineScroll *= descr->page_size; + } + else + { + pulScrollLines = min(descr->page_size, pulScrollLines); + cLineScroll = pulScrollLines * descr->wheel_remain / WHEEL_DELTA; + descr->wheel_remain -= WHEEL_DELTA * cLineScroll / pulScrollLines; + } LISTBOX_SetTopItem( descr, descr->top_item - cLineScroll, TRUE ); } return 0;

1 0

Gabriel Ivăncescu : comctl32/edit: Get rid of useless casts.
by Alexandre Julliard 14 Jun '19

14 Jun '19

Module: wine Branch: master Commit: f3cfb66cf7a9384ae21b3bfef5d4f94aea4feddf URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3cfb66cf7a9384ae21b3bfe… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Jun 5 14:38:59 2019 +0300 comctl32/edit: Get rid of useless casts. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/edit.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index e64e260..bdd3b72 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -5017,7 +5017,7 @@ static LRESULT CALLBACK EDIT_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR case WM_MOUSEWHEEL: { int wheelDelta; - UINT pulScrollLines = 3; + INT pulScrollLines = 3; SystemParametersInfoW(SPI_GETWHEELSCROLLLINES,0, &pulScrollLines, 0); if (wParam & (MK_SHIFT | MK_CONTROL)) @@ -5037,9 +5037,9 @@ static LRESULT CALLBACK EDIT_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR if (es->wheelDeltaRemainder && pulScrollLines) { int cLineScroll; - pulScrollLines = (int) min((UINT) es->line_count, pulScrollLines); - cLineScroll = pulScrollLines * (float)es->wheelDeltaRemainder / WHEEL_DELTA; - es->wheelDeltaRemainder -= WHEEL_DELTA * cLineScroll / (int)pulScrollLines; + pulScrollLines = min(es->line_count, pulScrollLines); + cLineScroll = pulScrollLines * es->wheelDeltaRemainder / WHEEL_DELTA; + es->wheelDeltaRemainder -= WHEEL_DELTA * cLineScroll / pulScrollLines; result = EDIT_EM_LineScroll(es, 0, -cLineScroll); } break;

1 0

Gabriel Ivăncescu : user32/edit: Get rid of useless casts.
by Alexandre Julliard 14 Jun '19

14 Jun '19

Module: wine Branch: master Commit: 501778aa0873faa24632cee2390c15f79c49a943 URL: https://source.winehq.org/git/wine.git/?a=commit;h=501778aa0873faa24632cee2… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Jun 5 14:39:00 2019 +0300 user32/edit: Get rid of useless casts. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/edit.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 3c5331f..00900e6 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -5158,7 +5158,7 @@ LRESULT EditWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, B case WM_MOUSEWHEEL: { int wheelDelta; - UINT pulScrollLines = 3; + INT pulScrollLines = 3; SystemParametersInfoW(SPI_GETWHEELSCROLLLINES,0, &pulScrollLines, 0); if (wParam & (MK_SHIFT | MK_CONTROL)) { @@ -5175,9 +5175,9 @@ LRESULT EditWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, B if (es->wheelDeltaRemainder && pulScrollLines) { int cLineScroll; - pulScrollLines = (int) min((UINT) es->line_count, pulScrollLines); - cLineScroll = pulScrollLines * (float)es->wheelDeltaRemainder / WHEEL_DELTA; - es->wheelDeltaRemainder -= WHEEL_DELTA * cLineScroll / (int)pulScrollLines; + pulScrollLines = min(es->line_count, pulScrollLines); + cLineScroll = pulScrollLines * es->wheelDeltaRemainder / WHEEL_DELTA; + es->wheelDeltaRemainder -= WHEEL_DELTA * cLineScroll / pulScrollLines; result = EDIT_EM_LineScroll(es, 0, -cLineScroll); } }

1 0

Gabriel Ivăncescu : comctl32/listview: Get rid of useless casts.
by Alexandre Julliard 14 Jun '19

14 Jun '19

Module: wine Branch: master Commit: a0a3d6161c6ea23b5f7ac43e107bfed3dd423c9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0a3d6161c6ea23b5f7ac43e… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Jun 5 14:39:01 2019 +0300 comctl32/listview: Get rid of useless casts. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listview.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 4ecff20..2717812 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -9909,7 +9909,7 @@ static LRESULT LISTVIEW_HScroll(LISTVIEW_INFO *infoPtr, INT nScrollCode, static LRESULT LISTVIEW_MouseWheel(LISTVIEW_INFO *infoPtr, INT wheelDelta) { - UINT pulScrollLines = 3; + INT pulScrollLines = 3; TRACE("(wheelDelta=%d)\n", wheelDelta); @@ -9938,8 +9938,8 @@ static LRESULT LISTVIEW_MouseWheel(LISTVIEW_INFO *infoPtr, INT wheelDelta) { int cLineScroll; pulScrollLines = min((UINT)LISTVIEW_GetCountPerColumn(infoPtr), pulScrollLines); - cLineScroll = pulScrollLines * (float)infoPtr->cWheelRemainder / WHEEL_DELTA; - infoPtr->cWheelRemainder -= WHEEL_DELTA * cLineScroll / (int)pulScrollLines; + cLineScroll = pulScrollLines * infoPtr->cWheelRemainder / WHEEL_DELTA; + infoPtr->cWheelRemainder -= WHEEL_DELTA * cLineScroll / pulScrollLines; LISTVIEW_VScroll(infoPtr, SB_INTERNAL, -cLineScroll); } break;

1 0

Gabriel Ivăncescu : comctl32/treeview: Get rid of useless casts.
by Alexandre Julliard 14 Jun '19

14 Jun '19

Module: wine Branch: master Commit: 3e1d8ab501ed68e7648cec5f8039a05e8fa13db3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e1d8ab501ed68e7648cec5f… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Jun 5 14:39:02 2019 +0300 comctl32/treeview: Get rid of useless casts. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/treeview.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 6854b0c..3c73964 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -5027,7 +5027,7 @@ static LRESULT TREEVIEW_MouseWheel(TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam) { short wheelDelta; - UINT pulScrollLines = 3; + INT pulScrollLines = 3; if (wParam & (MK_SHIFT | MK_CONTROL)) return DefWindowProcW(infoPtr->hwnd, WM_MOUSEWHEEL, wParam, lParam); @@ -5051,8 +5051,8 @@ TREEVIEW_MouseWheel(TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam) int maxDy; int lineScroll; - lineScroll = pulScrollLines * (float)infoPtr->wheelRemainder / WHEEL_DELTA; - infoPtr->wheelRemainder -= WHEEL_DELTA * lineScroll / (int)pulScrollLines; + lineScroll = pulScrollLines * infoPtr->wheelRemainder / WHEEL_DELTA; + infoPtr->wheelRemainder -= WHEEL_DELTA * lineScroll / pulScrollLines; newDy = infoPtr->firstVisible->visibleOrder - lineScroll; maxDy = infoPtr->maxVisibleOrder;

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to context_attach_depth_stencil_fbo() .
by Alexandre Julliard 14 Jun '19

14 Jun '19

Module: wine Branch: master Commit: 5a143e5a29adda807160d0bd77f8900abc60c24c URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a143e5a29adda807160d0bd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 14 16:05:19 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_attach_depth_stencil_fbo(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index be34614..d195469 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -173,12 +173,11 @@ static void wined3d_context_gl_attach_gl_texture_fbo(struct wined3d_context_gl * } /* Context activation is done by the caller. */ -static void context_attach_depth_stencil_fbo(struct wined3d_context *context, +static void wined3d_context_gl_attach_depth_stencil_fbo(struct wined3d_context_gl *context_gl, GLenum fbo_target, const struct wined3d_fbo_resource *resource, BOOL rb_namespace, - DWORD flags) + uint32_t flags) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; if (resource->object) { @@ -740,8 +739,8 @@ static void wined3d_context_gl_apply_fbo_entry(struct wined3d_context_gl *contex entry->key.rb_namespace & (1 << (i + 1))); } - context_attach_depth_stencil_fbo(&context_gl->c, target, &entry->key.objects[0], - entry->key.rb_namespace & 0x1, entry->flags); + wined3d_context_gl_attach_depth_stencil_fbo(context_gl, target, + &entry->key.objects[0], entry->key.rb_namespace & 0x1, entry->flags); /* Set valid read and draw buffer bindings to satisfy pedantic pre-ES2_compatibility * GL contexts requirements. */

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to context_attach_surface_fbo().
by Alexandre Julliard 14 Jun '19

14 Jun '19

Module: wine Branch: master Commit: 6c1bd3a067700fa983086164b791db8894e023fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c1bd3a067700fa983086164… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 14 16:05:20 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_attach_surface_fbo(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index d195469..2ed1e48 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -213,10 +213,9 @@ static void wined3d_context_gl_attach_depth_stencil_fbo(struct wined3d_context_g } /* Context activation is done by the caller. */ -static void context_attach_surface_fbo(struct wined3d_context *context, - GLenum fbo_target, DWORD idx, const struct wined3d_fbo_resource *resource, BOOL rb_namespace) +static void wined3d_context_gl_attach_surface_fbo(struct wined3d_context_gl *context_gl, + GLenum fbo_target, unsigned int idx, const struct wined3d_fbo_resource *resource, BOOL rb_namespace) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; TRACE("Attach GL object %u to %u.\n", resource->object, idx); @@ -735,8 +734,8 @@ static void wined3d_context_gl_apply_fbo_entry(struct wined3d_context_gl *contex /* Apply render targets */ for (i = 0; i < gl_info->limits.buffers; ++i) { - context_attach_surface_fbo(&context_gl->c, target, i, &entry->key.objects[i + 1], - entry->key.rb_namespace & (1 << (i + 1))); + wined3d_context_gl_attach_surface_fbo(context_gl, target, i, + &entry->key.objects[i + 1], entry->key.rb_namespace & (1 << (i + 1))); } wined3d_context_gl_attach_depth_stencil_fbo(context_gl, target,

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to context_set_fbo_key_for_render_target ().
by Alexandre Julliard 14 Jun '19

14 Jun '19

Module: wine Branch: master Commit: b5ecad008b2bf545cf67d2a9ee3f05b61edda8ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5ecad008b2bf545cf67d2a9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 14 16:05:21 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_set_fbo_key_for_render_target(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 2ed1e48..15ee031 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -428,7 +428,7 @@ static inline DWORD context_generate_rt_mask_from_resource(struct wined3d_resour return (1u << 31) | wined3d_texture_get_gl_buffer(texture_from_resource(resource)); } -static inline void context_set_fbo_key_for_render_target(const struct wined3d_context *context, +static inline void wined3d_context_gl_set_fbo_key_for_render_target(const struct wined3d_context_gl *context_gl, struct wined3d_fbo_entry_key *key, unsigned int idx, const struct wined3d_rendertarget_info *render_target, DWORD location) { @@ -475,11 +475,11 @@ static inline void context_set_fbo_key_for_render_target(const struct wined3d_co switch (location) { case WINED3D_LOCATION_TEXTURE_RGB: - key->objects[idx].object = wined3d_texture_gl_get_texture_name(texture_gl, context, FALSE); + key->objects[idx].object = wined3d_texture_gl_get_texture_name(texture_gl, &context_gl->c, FALSE); break; case WINED3D_LOCATION_TEXTURE_SRGB: - key->objects[idx].object = wined3d_texture_gl_get_texture_name(texture_gl, context, TRUE); + key->objects[idx].object = wined3d_texture_gl_get_texture_name(texture_gl, &context_gl->c, TRUE); break; case WINED3D_LOCATION_RB_MULTISAMPLE: @@ -502,14 +502,15 @@ static void context_generate_fbo_key(const struct wined3d_context *context, struct wined3d_fbo_entry_key *key, const struct wined3d_rendertarget_info *render_targets, const struct wined3d_rendertarget_info *depth_stencil, DWORD color_location, DWORD ds_location) { + const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); unsigned int buffers = context->gl_info->limits.buffers; unsigned int i; key->rb_namespace = 0; - context_set_fbo_key_for_render_target(context, key, 0, depth_stencil, ds_location); + wined3d_context_gl_set_fbo_key_for_render_target(context_gl, key, 0, depth_stencil, ds_location); for (i = 0; i < buffers; ++i) - context_set_fbo_key_for_render_target(context, key, i + 1, &render_targets[i], color_location); + wined3d_context_gl_set_fbo_key_for_render_target(context_gl, key, i + 1, &render_targets[i], color_location); memset(&key->objects[buffers + 1], 0, (ARRAY_SIZE(key->objects) - buffers - 1) * sizeof(*key->objects)); }

1 0