October 2013 - Wine-Commits

Alexandre Julliard : libwine: Add JNI initialisation support to start Wine from an Android activity.
by Alexandre Julliard Oct. 1, 2013

Oct. 1, 2013

Module: wine Branch: master Commit: c30923f25b8db32c25ffaf8279c9d61b70887d44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c30923f25b8db32c25ffaf827… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 1 13:47:40 2013 +0200 libwine: Add JNI initialisation support to start Wine from an Android activity. --- libs/wine/loader.c | 103 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 103 insertions(+), 0 deletions(-) diff --git a/libs/wine/loader.c b/libs/wine/loader.c index 5891a20..f59942d 100644 --- a/libs/wine/loader.c +++ b/libs/wine/loader.c @@ -53,6 +53,10 @@ extern char **environ; #endif +#ifdef __ANDROID__ +#include <jni.h> +#endif + #define NONAMELESSUNION #define NONAMELESSSTRUCT #include "windef.h" @@ -803,6 +807,105 @@ static void apple_main_thread( void (*init_func)(void) ) #endif +#ifdef __ANDROID__ + +#ifndef WINE_JAVA_CLASS +#define WINE_JAVA_CLASS "org/winehq/wine/WineActivity" +#endif + +static JavaVM *java_vm; +static jobject java_object; + +/* return the Java VM that was used for JNI initialisation */ +JavaVM *wine_get_java_vm(void) +{ + return java_vm; +} + +/* return the Java object that called the wine_init method */ +jobject wine_get_java_object(void) +{ + return java_object; +} + +/* main Wine initialisation */ +static jstring wine_init_jni( JNIEnv *env, jobject obj, jobjectArray cmdline, jobjectArray environment ) +{ + char **argv; + char *str; + char error[1024]; + int i, argc, length; + + /* get the command line array */ + + argc = (*env)->GetArrayLength( env, cmdline ); + for (i = length = 0; i < argc; i++) + { + jobject str_obj = (*env)->GetObjectArrayElement( env, cmdline, i ); + length += (*env)->GetStringUTFLength( env, str_obj ) + 1; + } + + argv = malloc( (argc + 1) * sizeof(*argv) + length ); + str = (char *)(argv + argc + 1); + for (i = 0; i < argc; i++) + { + jobject str_obj = (*env)->GetObjectArrayElement( env, cmdline, i ); + length = (*env)->GetStringUTFLength( env, str_obj ); + (*env)->GetStringUTFRegion( env, str_obj, 0, length, str ); + argv[i] = str; + str[length] = 0; + str += length + 1; + } + argv[argc] = NULL; + + /* set the environment variables */ + + if (environment) + { + int count = (*env)->GetArrayLength( env, environment ); + for (i = 0; i < count - 1; i += 2) + { + jobject var_obj = (*env)->GetObjectArrayElement( env, environment, i ); + jobject val_obj = (*env)->GetObjectArrayElement( env, environment, i + 1 ); + const char *var = (*env)->GetStringUTFChars( env, var_obj, NULL ); + + if (val_obj) + { + const char *val = (*env)->GetStringUTFChars( env, val_obj, NULL ); + setenv( var, val, 1 ); + (*env)->ReleaseStringUTFChars( env, val_obj, val ); + } + else unsetenv( var ); + + (*env)->ReleaseStringUTFChars( env, var_obj, var ); + } + } + + java_object = (*env)->NewGlobalRef( env, obj ); + + wine_init( argc, argv, error, sizeof(error) ); + return (*env)->NewStringUTF( env, error ); +} + +jint JNI_OnLoad( JavaVM *vm, void *reserved ) +{ + static const JNINativeMethod method = + { + "wine_init", "([Ljava/lang/String;[Ljava/lang/String;)Ljava/lang/String;", wine_init_jni + }; + + JNIEnv *env; + jclass class; + + java_vm = vm; + if ((*vm)->AttachCurrentThread( vm, &env, NULL ) != JNI_OK) return JNI_ERR; + if (!(class = (*env)->FindClass( env, WINE_JAVA_CLASS ))) return JNI_ERR; + (*env)->RegisterNatives( env, class, &method, 1 ); + return JNI_VERSION_1_6; +} + +#endif /* __ANDROID__ */ + /*********************************************************************** * wine_init *

1 0

Jacek Caban : urlmon: Include values from 'Post Platform' registry key in user agent string.
by Alexandre Julliard Oct. 1, 2013

Oct. 1, 2013

Module: wine Branch: master Commit: 7226c490980803fd98224c531e5f30dfd7fa2119 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7226c490980803fd98224c531… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 1 13:21:00 2013 +0200 urlmon: Include values from 'Post Platform' registry key in user agent string. --- dlls/urlmon/session.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 55 insertions(+), 3 deletions(-) diff --git a/dlls/urlmon/session.c b/dlls/urlmon/session.c index ce6ab4e..bb41c31 100644 --- a/dlls/urlmon/session.c +++ b/dlls/urlmon/session.c @@ -534,15 +534,26 @@ static void ensure_useragent(void) { OSVERSIONINFOW info = {sizeof(info)}; const WCHAR *os_type, *is_nt; - WCHAR buf[512]; + WCHAR buf[512], *ret, *tmp; + DWORD res, idx=0; + size_t len, size; BOOL is_wow; + HKEY key; static const WCHAR formatW[] = {'M','o','z','i','l','l','a','/','4','.','0', ' ','(','c','o','m','p','a','t','i','b','l','e',';', ' ','M','S','I','E',' ','8','.','0',';', ' ','W','i','n','d','o','w','s',' ','%','s','%','d','.','%','d',';', - ' ','%','s',';',' ','T','r','i','d','e','n','t','/','5','.','0',')',0}; + ' ','%','s',';',' ','T','r','i','d','e','n','t','/','5','.','0',0}; + static const WCHAR post_platform_keyW[] = + {'S','O','F','T','W','A','R','E', + '\\','M','i','c','r','o','s','o','f','t', + '\\','W','i','n','d','o','w','s', + '\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n', + '\\','I','n','t','e','r','n','e','t',' ','S','e','t','t','i','n','g','s', + '\\','5','.','0','\\','U','s','e','r',' ','A','g','e','n','t', + '\\','P','o','s','t',' ','P','l','a','t','f','o','r','m',0}; static const WCHAR ntW[] = {'N','T',' ',0}; static const WCHAR win32W[] = {'W','i','n','3','2',0}; static const WCHAR win64W[] = {'W','i','n','6','4',0}; @@ -563,7 +574,48 @@ static void ensure_useragent(void) os_type = win32W; sprintfW(buf, formatW, is_nt, info.dwMajorVersion, info.dwMinorVersion, os_type); - user_agent = heap_strdupW(buf); + len = strlenW(buf); + + size = len+40; + ret = heap_alloc(size * sizeof(WCHAR)); + if(!ret) + return; + + memcpy(ret, buf, len*sizeof(WCHAR)); + + res = RegOpenKeyW(HKEY_LOCAL_MACHINE, post_platform_keyW, &key); + if(res == ERROR_SUCCESS) { + DWORD value_len; + + while(1) { + value_len = sizeof(buf)/sizeof(WCHAR); + res = RegEnumValueW(key, idx, buf, &value_len, NULL, NULL, NULL, NULL); + if(res != ERROR_SUCCESS) + break; + idx++; + + if(len + value_len + 2 /* strlen("; ") */ + 1 /* trailing ')' */ >= size) { + tmp = heap_realloc(ret, (size*2+value_len)*sizeof(WCHAR)); + if(!tmp) + break; + ret = tmp; + size = size*2+value_len; + } + + ret[len++] = ';'; + ret[len++] = ' '; + memcpy(ret+len, buf, value_len*sizeof(WCHAR)); + len += value_len; + } + + RegCloseKey(key); + } + + ret[len++] = ')'; + ret[len++] = 0; + + user_agent = ret; + TRACE("Using user agent %s\n", debugstr_w(user_agent)); } LPWSTR get_useragent(void)

1 0

Stefan Dösinger : wined3d: Don' t invert blits from offscreen surfaces.
by Alexandre Julliard Oct. 1, 2013

Oct. 1, 2013

Module: wine Branch: master Commit: 723e518312fa7a030b444e714c118c335ad57699 URL: http://source.winehq.org/git/wine.git/?a=commit;h=723e518312fa7a030b444e714… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Oct 1 13:05:39 2013 +0200 wined3d: Don't invert blits from offscreen surfaces. --- dlls/wined3d/arb_program_shader.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 282c2d0..e1d2faa 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7460,7 +7460,8 @@ HRESULT arbfp_blit_surface(struct wined3d_device *device, DWORD filter, /* Now load the surface */ if (wined3d_settings.offscreen_rendering_mode != ORM_FBO - && (src_surface->flags & (SFLAG_INTEXTURE | SFLAG_INDRAWABLE)) == SFLAG_INDRAWABLE) + && (src_surface->flags & (SFLAG_INTEXTURE | SFLAG_INDRAWABLE)) == SFLAG_INDRAWABLE + && !surface_is_offscreen(src_surface)) { /* Without FBO blits transferring from the drawable to the texture is * expensive, because we have to flip the data in sysmem. Since we can

1 0

Piotr Caban : msvcrt: Don't forward bsearch to ntdll.
by Alexandre Julliard Oct. 1, 2013

Oct. 1, 2013

Module: wine Branch: master Commit: 5fce0724ed53b78fb8fc93c69e1db783db91387a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fce0724ed53b78fb8fc93c69… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 1 11:28:54 2013 +0200 msvcrt: Don't forward bsearch to ntdll. --- dlls/msvcrt/misc.c | 14 ++++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- 2 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/misc.c b/dlls/msvcrt/misc.c index 75e75e6..effca2b 100644 --- a/dlls/msvcrt/misc.c +++ b/dlls/msvcrt/misc.c @@ -151,6 +151,20 @@ void* CDECL MSVCRT_bsearch_s(const void *key, const void *base, return NULL; } +static int CDECL compare_wrapper(void *ctx, const void *e1, const void *e2) +{ + int (__cdecl *compare)(const void *, const void *) = ctx; + return compare(e1, e2); +} + +/********************************************************************* + * bsearch (msvcrt.@) + */ +void* CDECL MSVCRT_bsearch(const void *key, const void *base, MSVCRT_size_t nmemb, + MSVCRT_size_t size, int (__cdecl *compar)(const void *, const void *)) +{ + return MSVCRT_bsearch_s(key, base, nmemb, size, compare_wrapper, compar); +} /********************************************************************* * _chkesp (MSVCRT.@) * diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index acf53aa..63e4f4c 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1257,7 +1257,7 @@ @ cdecl atof(str) MSVCRT_atof @ cdecl atoi(str) MSVCRT_atoi @ cdecl atol(str) ntdll.atol -@ cdecl bsearch(ptr ptr long long ptr) ntdll.bsearch +@ cdecl bsearch(ptr ptr long long ptr) MSVCRT_bsearch @ cdecl bsearch_s(ptr ptr long long ptr ptr) MSVCRT_bsearch_s @ cdecl btowc(long) MSVCRT_btowc @ cdecl calloc(long long) MSVCRT_calloc

1 0

Henri Verbeet : d3dcompiler: Get rid of the BWRITERSHADER_INSTRUCTION_OPCODE_TYPE typedef.
by Alexandre Julliard Oct. 1, 2013

Oct. 1, 2013

Module: wine Branch: master Commit: a8aa199c363cbb850cd05f386339e3767ed62481 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8aa199c363cbb850cd05f386… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 1 10:38:32 2013 +0200 d3dcompiler: Get rid of the BWRITERSHADER_INSTRUCTION_OPCODE_TYPE typedef. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 3489162..a6ee6b5 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -365,11 +365,10 @@ const char *debug_print_opcode(DWORD opcode) DECLSPEC_HIDDEN; /* Used to signal an incorrect swizzle/writemask */ #define SWIZZLE_ERR ~0U -/* - Enumerations and defines used in the bytecode writer - intermediate representation -*/ -typedef enum _BWRITERSHADER_INSTRUCTION_OPCODE_TYPE { +/* Enumerations and defines used in the bytecode writer intermediate + * representation. */ +enum bwritershader_instruction_opcode_type +{ BWRITERSIO_NOP, BWRITERSIO_MOV, BWRITERSIO_ADD, @@ -458,7 +457,7 @@ typedef enum _BWRITERSHADER_INSTRUCTION_OPCODE_TYPE { BWRITERSIO_PHASE, BWRITERSIO_COMMENT, BWRITERSIO_END, -} BWRITERSHADER_INSTRUCTION_OPCODE_TYPE; +}; typedef enum _BWRITERSHADER_PARAM_REGISTER_TYPE { BWRITERSPR_TEMP,

1 0

Piotr Caban : msvcrt: Don't forward _itoa to ntdll.
by Alexandre Julliard Oct. 1, 2013

Oct. 1, 2013

Module: wine Branch: master Commit: d99090aff87b603b1d55b570629d7fc5bc56cff4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d99090aff87b603b1d55b5706… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 1 11:28:09 2013 +0200 msvcrt: Don't forward _itoa to ntdll. --- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/string.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 6089656..7cfc370 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -646,7 +646,7 @@ # stub _iswupper_l(long ptr) # stub _iswxdigit_l(long ptr) @ cdecl _isxdigit_l(long ptr) MSVCRT__isxdigit_l -@ cdecl _itoa(long ptr long) ntdll._itoa +@ cdecl _itoa(long ptr long) @ cdecl _itoa_s(long ptr long long) @ cdecl _itow(long ptr long) ntdll._itow @ cdecl _itow_s(long ptr long long) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 5678a89..a6b328b 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -1139,6 +1139,14 @@ int CDECL _itoa_s(int value, char *str, MSVCRT_size_t size, int radix) } /********************************************************************* + * _itoa (MSVCRT.@) + */ +char* CDECL _itoa(int value, char *str, int radix) +{ + return _itoa_s(value, str, MSVCRT_SIZE_MAX, radix) ? NULL : str; +} + +/********************************************************************* * _itow_s (MSVCRT.@) */ int CDECL _itow_s(int value, MSVCRT_wchar_t *str, MSVCRT_size_t size, int radix)

1 0

Alistair Leslie-Hughes : oledb32: Implement IDataSourceLocator get/put hWnd .
by Alexandre Julliard Oct. 1, 2013

Oct. 1, 2013

Module: wine Branch: master Commit: 05a807af49e027422afb8f9c8e39bb5e4c09494d URL: http://source.winehq.org/git/wine.git/?a=commit;h=05a807af49e027422afb8f9c8… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Sep 30 14:05:01 2013 +1000 oledb32: Implement IDataSourceLocator get/put hWnd. --- dlls/oledb32/dslocator.c | 14 ++++++++--- dlls/oledb32/tests/database.c | 48 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 4 deletions(-) diff --git a/dlls/oledb32/dslocator.c b/dlls/oledb32/dslocator.c index f8a98f5..4af4ab4 100644 --- a/dlls/oledb32/dslocator.c +++ b/dlls/oledb32/dslocator.c @@ -42,6 +42,7 @@ typedef struct DSLocatorImpl IDataSourceLocator IDataSourceLocator_iface; LONG ref; + HWND hwnd; } DSLocatorImpl; static inline DSLocatorImpl *impl_from_IDataSourceLocator( IDataSourceLocator *iface ) @@ -139,18 +140,22 @@ static HRESULT WINAPI dslocator_get_hWnd(IDataSourceLocator *iface, COMPATIBLE_L { DSLocatorImpl *This = impl_from_IDataSourceLocator(iface); - FIXME("(%p)->(%p)\n",This, phwndParent); + TRACE("(%p)->(%p)\n",This, phwndParent); - return E_NOTIMPL; + *phwndParent = (COMPATIBLE_LONG)This->hwnd; + + return S_OK; } static HRESULT WINAPI dslocator_put_hWnd(IDataSourceLocator *iface, COMPATIBLE_LONG hwndParent) { DSLocatorImpl *This = impl_from_IDataSourceLocator(iface); - FIXME("(%p)->(%p)\n",This, (HWND)hwndParent); + TRACE("(%p)->(%p)\n",This, (HWND)hwndParent); - return E_NOTIMPL; + This->hwnd = (HWND)hwndParent; + + return S_OK; } static HRESULT WINAPI dslocator_PromptNew(IDataSourceLocator *iface, IDispatch **ppADOConnection) @@ -201,6 +206,7 @@ HRESULT create_dslocator(IUnknown *outer, void **obj) This->IDataSourceLocator_iface.lpVtbl = &DSLocatorVtbl; This->ref = 1; + This->hwnd = 0; *obj = &This->IDataSourceLocator_iface; diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index d0eb9ff..13637c1 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -547,6 +547,53 @@ static void test_rowpos_setrowposition(void) IRowPosition_Release(rowpos); } +static void test_dslocator(void) +{ + IDataSourceLocator *dslocator = NULL; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_DataLinks, NULL, CLSCTX_INPROC_SERVER, &IID_IDataSourceLocator,(void**)&dslocator); + ok(hr == S_OK, "got %08x\n", hr); + if(SUCCEEDED(hr)) + { + COMPATIBLE_LONG hwnd = 0; + + /* Crashes under Window 7 + hr = IDataSourceLocator_get_hWnd(dslocator, NULL); + ok(hr == E_INVALIDARG, "got %08x\n", hr); + */ + + hr = IDataSourceLocator_get_hWnd(dslocator, &hwnd); + ok(hr == S_OK, "got %08x\n", hr); + ok(hwnd == 0, "got %p\n", (HWND)hwnd); + + hwnd = 0xDEADBEEF; + hr = IDataSourceLocator_get_hWnd(dslocator, &hwnd); + ok(hr == S_OK, "got %08x\n", hr); + ok(hwnd == 0, "got %p\n", (HWND)hwnd); + + hwnd = 0xDEADBEEF; + hr = IDataSourceLocator_put_hWnd(dslocator, hwnd); + ok(hr == S_OK, "got %08x\n", hr); + + hwnd = 0xDEADBEEF; + hr = IDataSourceLocator_get_hWnd(dslocator, &hwnd); + ok(hr == S_OK, "got %08x\n", hr); + ok(hwnd == 0xDEADBEEF, "got %p\n", (HWND)hwnd); + + hwnd = 0; + hr = IDataSourceLocator_put_hWnd(dslocator, hwnd); + ok(hr == S_OK, "got %08x\n", hr); + + hwnd = 0xDEADBEEF; + hr = IDataSourceLocator_get_hWnd(dslocator, &hwnd); + ok(hr == S_OK, "got %08x\n", hr); + ok(hwnd == 0, "got %p\n", (HWND)hwnd); + + IDataSourceLocator_Release(dslocator); + } +} + START_TEST(database) { OleInitialize(NULL); @@ -554,6 +601,7 @@ START_TEST(database) test_database(); test_errorinfo(); test_initializationstring(); + test_dslocator(); /* row position */ test_rowposition();

1 0

Henri Verbeet : wined3d: Send render target binding updates through the command stream.
by Alexandre Julliard Oct. 1, 2013

Oct. 1, 2013

Module: wine Branch: master Commit: 438b672660753f9d84c25e8b31be97a2f5487ef0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=438b672660753f9d84c25e8b3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 1 10:38:29 2013 +0200 wined3d: Send render target binding updates through the command stream. --- dlls/wined3d/cs.c | 30 ++++++++++++++++++++++++++++++ dlls/wined3d/device.c | 3 +-- dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 33 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index b9f2929..b182912 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -30,6 +30,7 @@ enum wined3d_cs_op WINED3D_CS_OP_DRAW, WINED3D_CS_OP_SET_VIEWPORT, WINED3D_CS_OP_SET_SCISSOR_RECT, + WINED3D_CS_OP_SET_RENDER_TARGET, }; struct wined3d_cs_present @@ -76,6 +77,13 @@ struct wined3d_cs_set_scissor_rect const RECT *rect; }; +struct wined3d_cs_set_render_target +{ + enum wined3d_cs_op opcode; + UINT render_target_idx; + struct wined3d_surface *render_target; +}; + static void wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_present *op = data; @@ -198,6 +206,27 @@ void wined3d_cs_emit_set_scissor_rect(struct wined3d_cs *cs, const RECT *rect) cs->ops->submit(cs); } +static void wined3d_cs_exec_set_render_target(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_set_render_target *op = data; + + cs->state.fb->render_targets[op->render_target_idx] = op->render_target; + device_invalidate_state(cs->device, STATE_FRAMEBUFFER); +} + +void wined3d_cs_emit_set_render_target(struct wined3d_cs *cs, UINT render_target_idx, + struct wined3d_surface *render_target) +{ + struct wined3d_cs_set_render_target *op; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_SET_RENDER_TARGET; + op->render_target_idx = render_target_idx; + op->render_target = render_target; + + cs->ops->submit(cs); +} + static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void *data) = { /* WINED3D_CS_OP_PRESENT */ wined3d_cs_exec_present, @@ -205,6 +234,7 @@ static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void /* WINED3D_CS_OP_DRAW */ wined3d_cs_exec_draw, /* WINED3D_CS_OP_SET_VIEWPORT */ wined3d_cs_exec_set_viewport, /* WINED3D_CS_OP_SET_SCISSOR_RECT */ wined3d_cs_exec_set_scissor_rect, + /* WINED3D_CS_OP_SET_RENDER_TARGET */ wined3d_cs_exec_set_render_target, }; static void *wined3d_cs_st_require_space(struct wined3d_cs *cs, size_t size) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 5f4cafb..46057c3 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4032,13 +4032,12 @@ HRESULT CDECL wined3d_device_set_render_target(struct wined3d_device *device, if (render_target) wined3d_surface_incref(render_target); device->fb.render_targets[render_target_idx] = render_target; + wined3d_cs_emit_set_render_target(device->cs, render_target_idx, render_target); /* Release after the assignment, to prevent device_resource_released() * from seeing the surface as still in use. */ if (prev) wined3d_surface_decref(prev); - device_invalidate_state(device, STATE_FRAMEBUFFER); - return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f5665dd..d8c66b7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2486,6 +2486,8 @@ void wined3d_cs_emit_draw(struct wined3d_cs *cs, UINT start_idx, UINT index_coun 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, const RGNDATA *dirty_region, DWORD flags) DECLSPEC_HIDDEN; +void wined3d_cs_emit_set_render_target(struct wined3d_cs *cs, UINT render_target_idx, + struct wined3d_surface *render_target) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_scissor_rect(struct wined3d_cs *cs, const RECT *rect) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_viewport(struct wined3d_cs *cs, const struct wined3d_viewport *viewport) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : d3dcompiler: Get rid of the BWRITERSHADER_PARAM_REGISTER_TYPE typedef.
by Alexandre Julliard Oct. 1, 2013

Oct. 1, 2013

Module: wine Branch: master Commit: b34755493726126d1ee2eac0420f3151837d089a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b34755493726126d1ee2eac04… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 1 10:38:33 2013 +0200 d3dcompiler: Get rid of the BWRITERSHADER_PARAM_REGISTER_TYPE typedef. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index a6ee6b5..284bf8f 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -459,7 +459,8 @@ enum bwritershader_instruction_opcode_type BWRITERSIO_END, }; -typedef enum _BWRITERSHADER_PARAM_REGISTER_TYPE { +enum bwritershader_param_register_type +{ BWRITERSPR_TEMP, BWRITERSPR_INPUT, BWRITERSPR_CONST, @@ -478,7 +479,7 @@ typedef enum _BWRITERSHADER_PARAM_REGISTER_TYPE { BWRITERSPR_MISCTYPE, BWRITERSPR_LABEL, BWRITERSPR_PREDICATE -} BWRITERSHADER_PARAM_REGISTER_TYPE; +}; typedef enum _BWRITERVS_RASTOUT_OFFSETS {

1 0

Henri Verbeet : wined3d: Send vertex declaration binding updates through the command stream.
by Alexandre Julliard Oct. 1, 2013

Oct. 1, 2013

Module: wine Branch: master Commit: 1f864bc9c3ae7b9e659aaec4d809eacac6e7490b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f864bc9c3ae7b9e659aaec4d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 1 10:38:31 2013 +0200 wined3d: Send vertex declaration binding updates through the command stream. --- dlls/wined3d/cs.c | 27 +++++++++++++++++++++++++++ dlls/wined3d/device.c | 23 +++++++---------------- dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 36 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 3d155f1..1e427f4 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -32,6 +32,7 @@ enum wined3d_cs_op WINED3D_CS_OP_SET_SCISSOR_RECT, WINED3D_CS_OP_SET_RENDER_TARGET, WINED3D_CS_OP_SET_DEPTH_STENCIL, + WINED3D_CS_OP_SET_VERTEX_DECLARATION, }; struct wined3d_cs_present @@ -91,6 +92,12 @@ struct wined3d_cs_set_depth_stencil struct wined3d_surface *depth_stencil; }; +struct wined3d_cs_set_vertex_declaration +{ + enum wined3d_cs_op opcode; + struct wined3d_vertex_declaration *declaration; +}; + static void wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_present *op = data; @@ -284,6 +291,25 @@ void wined3d_cs_emit_set_depth_stencil(struct wined3d_cs *cs, struct wined3d_sur cs->ops->submit(cs); } +static void wined3d_cs_exec_set_vertex_declaration(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_set_vertex_declaration *op = data; + + cs->state.vertex_declaration = op->declaration; + device_invalidate_state(cs->device, STATE_VDECL); +} + +void wined3d_cs_emit_set_vertex_declaration(struct wined3d_cs *cs, struct wined3d_vertex_declaration *declaration) +{ + struct wined3d_cs_set_vertex_declaration *op; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_SET_VERTEX_DECLARATION; + op->declaration = declaration; + + cs->ops->submit(cs); +} + static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void *data) = { /* WINED3D_CS_OP_PRESENT */ wined3d_cs_exec_present, @@ -293,6 +319,7 @@ static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void /* WINED3D_CS_OP_SET_SCISSOR_RECT */ wined3d_cs_exec_set_scissor_rect, /* WINED3D_CS_OP_SET_RENDER_TARGET */ wined3d_cs_exec_set_render_target, /* WINED3D_CS_OP_SET_DEPTH_STENCIL */ wined3d_cs_exec_set_depth_stencil, + /* WINED3D_CS_OP_SET_VERTEX_DECLARATION */ wined3d_cs_exec_set_vertex_declaration, }; static void *wined3d_cs_st_require_space(struct wined3d_cs *cs, size_t size) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 12d0239..d581479 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2078,28 +2078,19 @@ void CDECL wined3d_device_set_vertex_declaration(struct wined3d_device *device, TRACE("device %p, declaration %p.\n", device, declaration); - if (declaration) - wined3d_vertex_declaration_incref(declaration); - if (prev) - wined3d_vertex_declaration_decref(prev); - - device->update_state->vertex_declaration = declaration; - if (device->recording) - { - TRACE("Recording... not performing anything.\n"); device->recording->changed.vertexDecl = TRUE; - return; - } if (declaration == prev) - { - /* Checked after the assignment to allow proper stateblock recording. */ - TRACE("Application is setting the old declaration over, nothing to do.\n"); return; - } - device_invalidate_state(device, STATE_VDECL); + if (declaration) + wined3d_vertex_declaration_incref(declaration); + device->update_state->vertex_declaration = declaration; + if (!device->recording) + wined3d_cs_emit_set_vertex_declaration(device->cs, declaration); + if (prev) + wined3d_vertex_declaration_decref(prev); } struct wined3d_vertex_declaration * CDECL wined3d_device_get_vertex_declaration(const struct wined3d_device *device) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7409807..648780f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2490,6 +2490,8 @@ void wined3d_cs_emit_set_depth_stencil(struct wined3d_cs *cs, struct wined3d_sur void wined3d_cs_emit_set_render_target(struct wined3d_cs *cs, UINT render_target_idx, struct wined3d_surface *render_target) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_scissor_rect(struct wined3d_cs *cs, const RECT *rect) DECLSPEC_HIDDEN; +void wined3d_cs_emit_set_vertex_declaration(struct wined3d_cs *cs, + struct wined3d_vertex_declaration *declaration) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_viewport(struct wined3d_cs *cs, const struct wined3d_viewport *viewport) DECLSPEC_HIDDEN; /* Direct3D terminology with little modifications. We do not have an issued state

1 0