October 2013 - Wine-commits

Alexandre Julliard : libwine: Add JNI initialisation support to start Wine from an Android activity.
by Alexandre Julliard 01 Oct '13

01 Oct '13

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 : mshtml: Added support for 'document' and 'window' script for attribute values.
by Alexandre Julliard 01 Oct '13

01 Oct '13

Module: wine Branch: master Commit: 5cdb4a273eefaa3c77e41e2875d7a759e8892d10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cdb4a273eefaa3c77e41e287… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 1 15:43:52 2013 +0200 mshtml: Added support for 'document' and 'window' script for attribute values. --- dlls/mshtml/htmlevent.c | 6 ++-- dlls/mshtml/htmlevent.h | 2 +- dlls/mshtml/script.c | 46 +++++++++++++++++++++++++++------------- dlls/mshtml/tests/events.html | 8 ++++++- 4 files changed, 42 insertions(+), 20 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index a7b2969..a564907 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1510,11 +1510,11 @@ HRESULT detach_event(event_target_t *event_target, HTMLDocument *doc, BSTR name, return S_OK; } -void bind_elem_event(HTMLDocumentNode *doc, HTMLElement *elem, const WCHAR *event, IDispatch *disp) +void bind_node_event(HTMLDocumentNode *doc, event_target_t **event_target, HTMLDOMNode *node, const WCHAR *event, IDispatch *disp) { eventid_t eid; - TRACE("(%p %p %s %p)\n", doc, elem, debugstr_w(event), disp); + TRACE("(%p %p %p %s %p)\n", doc, event_target, node, debugstr_w(event), disp); eid = attr_to_eid(event); if(eid == EVENTID_LAST) { @@ -1522,7 +1522,7 @@ void bind_elem_event(HTMLDocumentNode *doc, HTMLElement *elem, const WCHAR *even return; } - set_event_handler_disp(&elem->node.event_target, elem->node.nsnode, doc, eid, disp); + set_event_handler_disp(event_target, node ? node->nsnode : NULL, doc, eid, disp); } void update_cp_events(HTMLInnerWindow *window, event_target_t **event_target_ptr, cp_static_data_t *cp, nsIDOMNode *nsnode) diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index ca39038..abd19c2 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -62,7 +62,7 @@ void update_cp_events(HTMLInnerWindow*,event_target_t**,cp_static_data_t*,nsIDOM HRESULT doc_init_events(HTMLDocumentNode*) DECLSPEC_HIDDEN; void detach_events(HTMLDocumentNode *doc) DECLSPEC_HIDDEN; HRESULT create_event_obj(IHTMLEventObj**) DECLSPEC_HIDDEN; -void bind_elem_event(HTMLDocumentNode*,HTMLElement*,const WCHAR*,IDispatch*) DECLSPEC_HIDDEN; +void bind_node_event(HTMLDocumentNode*,event_target_t**,HTMLDOMNode*,const WCHAR*,IDispatch*) DECLSPEC_HIDDEN; void init_nsevents(HTMLDocumentNode*) DECLSPEC_HIDDEN; void release_nsevents(HTMLDocumentNode*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 3174bd2..8a74554 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -1046,11 +1046,12 @@ IDispatch *get_script_disp(ScriptHost *script_host) return disp; } -static HTMLElement *find_event_target(HTMLDocumentNode *doc, HTMLScriptElement *script_elem) +static event_target_t **find_event_target(HTMLDocumentNode *doc, HTMLScriptElement *script_elem, HTMLDOMNode **ret_target_node) { + HTMLDOMNode *target_node = NULL; + event_target_t **target = NULL; const PRUnichar *target_id; nsAString target_id_str; - HTMLElement *elem; nsresult nsres; HRESULT hres; @@ -1063,17 +1064,27 @@ static HTMLElement *find_event_target(HTMLDocumentNode *doc, HTMLScriptElement * } nsAString_GetData(&target_id_str, &target_id); - if(!*target_id || !strcmpW(target_id, documentW) || !strcmpW(target_id, windowW)) { - FIXME("for %s not supported\n", debugstr_w(target_id)); - elem = NULL; + if(!*target_id) { + FIXME("Empty for attribute\n"); + }else if(!strcmpW(target_id, documentW)) { + target = &doc->node.event_target; + target_node = &doc->node; + IHTMLDOMNode_AddRef(&target_node->IHTMLDOMNode_iface); + }else if(!strcmpW(target_id, windowW)) { + target = &doc->body_event_target; }else { - hres = get_doc_elem_by_id(doc, target_id, &elem); - if(FAILED(hres)) - elem = NULL; + HTMLElement *target_elem; + + hres = get_doc_elem_by_id(doc, target_id, &target_elem); + if(SUCCEEDED(hres) && target_elem) { + target_node = &target_elem->node; + target = &target_elem->node.event_target; + } } nsAString_Finish(&target_id_str); - return elem; + *ret_target_node = target_node; + return target; } static BOOL parse_event_str(WCHAR *event, const WCHAR **args) @@ -1168,8 +1179,9 @@ void bind_event_scripts(HTMLDocumentNode *doc) HTMLPluginContainer *plugin_container; nsIDOMHTMLScriptElement *nsscript; HTMLScriptElement *script_elem; - HTMLElement *event_target; + event_target_t **event_target; nsIDOMNodeList *node_list; + HTMLDOMNode *target_node; nsIDOMNode *script_node; nsAString selector_str; IDispatch *event_disp; @@ -1216,17 +1228,21 @@ void bind_event_scripts(HTMLDocumentNode *doc) event_disp = parse_event_elem(doc, script_elem, &event); if(event_disp) { - event_target = find_event_target(doc, script_elem); + event_target = find_event_target(doc, script_elem, &target_node); if(event_target) { - hres = IHTMLElement_QueryInterface(&event_target->IHTMLElement_iface, &IID_HTMLPluginContainer, - (void**)&plugin_container); + if(target_node) + hres = IHTMLDOMNode_QueryInterface(&target_node->IHTMLDOMNode_iface, &IID_HTMLPluginContainer, + (void**)&plugin_container); + else + hres = E_NOINTERFACE; if(SUCCEEDED(hres)) bind_activex_event(doc, plugin_container, event, event_disp); else - bind_elem_event(doc, event_target, event, event_disp); + bind_node_event(doc, event_target, target_node, event, event_disp); - IHTMLElement_Release(&event_target->IHTMLElement_iface); + if(target_node) + IHTMLDOMNode_Release(&target_node->IHTMLDOMNode_iface); } heap_free(event); diff --git a/dlls/mshtml/tests/events.html b/dlls/mshtml/tests/events.html index 131ba19..bf8a21f 100644 --- a/dlls/mshtml/tests/events.html +++ b/dlls/mshtml/tests/events.html @@ -1,7 +1,7 @@ <html> <head> <script> -var testevent_divid2_called = false, cnt=0; +var testevent_divid2_called = false, testevent_document_called = false, cnt=0; function ok(b,m) { return external.ok(b, m); @@ -71,8 +71,11 @@ function test_scriptfor() { ok("onclick" in div, "testevent not in div"); ok(typeof(div.onclick) === "function", "typeof(div.onclick) = " + typeof(div.onclick)); ok(testevent_divid2_called === false, "testevent_divid2_called = " + testevent_divid2_called); + ok(typeof(document.onclick) === "function", "typeof(document.onclick) = " + typeof(document.onclick)); + ok(testevent_document_called === false, "testevent_document_called = " + testevent_document_called); div.click(); ok(testevent_divid2_called === true, "testevent_divid2_called = " + testevent_divid2_called); + ok(testevent_document_called === true, "testevent_document_called = " + testevent_document_called); ok(!("ontest" in div), "testevent in div"); ok(typeof(div.ontest) === "undefined", "typeof(div.ontest) = " + typeof(div.ontest)); @@ -136,6 +139,9 @@ function runTests(t) { <script event="onclick" for="divid2"> testevent_divid2_called = true; </script> +<script event="onclick" for="document"> + testevent_document_called = true; +</script> <script event="ontest" for="divid2"> ok(false, "unexpected ontest"); </script>

1 0

Hans Leidekker : ntdll: Fix the version reported for 64-bit Windows XP.
by Alexandre Julliard 01 Oct '13

01 Oct '13

Module: wine Branch: master Commit: b0755344c46886f8ae1f294fdc207166dc6783fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0755344c46886f8ae1f294fd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 1 16:34:20 2013 +0200 ntdll: Fix the version reported for 64-bit Windows XP. --- dlls/ntdll/version.c | 15 +++++++++++++-- programs/winecfg/appdefaults.c | 4 ++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index 86637fc..1939c76 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -50,6 +50,7 @@ typedef enum NT40, /* Windows NT 4.0 */ NT2K, /* Windows 2000 */ WINXP, /* Windows XP */ + WINXP64, /* Windows XP 64-bit */ WIN2K3, /* Windows 2003 */ WINVISTA,/* Windows Vista */ WIN2K8, /* Windows 2008 */ @@ -134,6 +135,12 @@ static const RTL_OSVERSIONINFOEXW VersionData[NB_WINDOWS_VERSIONS] = {'S','e','r','v','i','c','e',' ','P','a','c','k',' ','3',0}, 3, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 30 /* FIXME: Great, a reserved field with a value! */ }, + /* WINXP64 */ + { + sizeof(RTL_OSVERSIONINFOEXW), 5, 2, 0xECE, VER_PLATFORM_WIN32_NT, + {'S','e','r','v','i','c','e',' ','P','a','c','k',' ','1',0}, + 1, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0 + }, /* WIN2K3 */ { sizeof(RTL_OSVERSIONINFOEXW), 5, 2, 0xECE, VER_PLATFORM_WIN32_NT, @@ -185,6 +192,7 @@ static const char * const WinVersionNames[NB_WINDOWS_VERSIONS] = "nt40", /* NT40 */ "win2000,win2k,nt2k,nt2000", /* NT2K */ "winxp", /* WINXP */ + "winxp64", /* WINXP64 */ "win2003,win2k3", /* WIN2K3 */ "vista,winvista", /* WINVISTA*/ "win2008,win2k8", /* WIN2K8 */ @@ -468,13 +476,16 @@ void version_init( const WCHAR *appname ) { static const WCHAR configW[] = {'S','o','f','t','w','a','r','e','\\','W','i','n','e',0}; static const WCHAR appdefaultsW[] = {'A','p','p','D','e','f','a','u','l','t','s','\\',0}; - + static const int is_win64 = (sizeof(void *) > sizeof(int)); OBJECT_ATTRIBUTES attr; UNICODE_STRING nameW; HANDLE root, hkey, config_key; BOOL got_win_ver = FALSE; - current_version = &VersionData[WINXP]; /* default if nothing else is specified */ + if (is_win64 || is_wow64) + current_version = &VersionData[WINXP64]; /* default if nothing else is specified */ + else + current_version = &VersionData[WINXP]; RtlOpenCurrentUser( KEY_ALL_ACCESS, &root ); attr.Length = sizeof(attr); diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index c8940a6..fdb0a71 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -55,6 +55,9 @@ static const struct { "win2008", "Windows 2008", 6, 0, 0x1772,VER_PLATFORM_WIN32_NT, "Service Pack 2", 2, 0, "ServerNT"}, { "vista", "Windows Vista", 6, 0, 0x1772,VER_PLATFORM_WIN32_NT, "Service Pack 2", 2, 0, "WinNT"}, { "win2003", "Windows 2003", 5, 2, 0xECE, VER_PLATFORM_WIN32_NT, "Service Pack 2", 2, 0, "ServerNT"}, +#ifdef _WIN64 + { "winxp64", "Windows XP", 5, 2, 0xECE, VER_PLATFORM_WIN32_NT, "Service Pack 1", 1, 0, "WinNT"}, +#else { "winxp", "Windows XP", 5, 1, 0xA28, VER_PLATFORM_WIN32_NT, "Service Pack 3", 3, 0, "WinNT"}, { "win2k", "Windows 2000", 5, 0, 0x893, VER_PLATFORM_WIN32_NT, "Service Pack 4", 4, 0, "WinNT"}, { "winme", "Windows ME", 4, 90, 0xBB8, VER_PLATFORM_WIN32_WINDOWS, " ", 0, 0, ""}, @@ -65,6 +68,7 @@ static const struct { "win31", "Windows 3.1", 3, 10, 0, VER_PLATFORM_WIN32s, "Win32s 1.3", 0, 0, ""}, { "win30", "Windows 3.0", 3, 0, 0, VER_PLATFORM_WIN32s, "Win32s 1.3", 0, 0, ""}, { "win20", "Windows 2.0", 2, 0, 0, VER_PLATFORM_WIN32s, "Win32s 1.3", 0, 0, ""} +#endif }; #define NB_VERSIONS (sizeof(win_versions)/sizeof(win_versions[0]))

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard 01 Oct '13

01 Oct '13

Module: wine Branch: master Commit: d3672524ed2fe8835479322b27f148c3e99e2843 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3672524ed2fe8835479322b2… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Oct 1 17:02:00 2013 +0200 Assorted spelling fixes. --- dlls/comctl32/tests/trackbar.c | 2 +- dlls/gdi32/tests/font.c | 2 +- dlls/imm32/tests/imm32.c | 2 +- dlls/kernel32/tests/console.c | 6 +++--- dlls/mshtml/nsiface.idl | 2 +- dlls/mshtml/tests/htmldoc.c | 22 +++++++++++----------- tools/winebuild/utils.c | 2 +- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c index 2e76000..3f57b1c 100644 --- a/dlls/comctl32/tests/trackbar.c +++ b/dlls/comctl32/tests/trackbar.c @@ -731,7 +731,7 @@ static void test_selection(HWND hWndTrackbar){ expect(8, r); ok_sequence(sequences, TRACKBAR_SEQ_INDEX, selection_test_seq, "selection test sequence", TRUE); - ok_sequence(sequences, PARENT_SEQ_INDEX, parent_selection_test_seq, "parent selection test seqence", TRUE); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_selection_test_seq, "parent selection test sequence", TRUE); } static void test_thumb_length(HWND hWndTrackbar){ diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index eed9cec..9f8d970 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1304,7 +1304,7 @@ static void test_GetCharABCWidths(void) strcpy(lf.lfFaceName, "Tahoma"); lf.lfHeight = 20; - trace("ABC sign test for a varity of transforms:\n"); + trace("ABC sign test for a variety of transforms:\n"); hfont = CreateFontIndirectA(&lf); hwnd = CreateWindowEx(0, "static", "", WS_POPUP, 0,0,100,100, 0, 0, 0, NULL); diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index f92b2c1..0324304 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -1056,7 +1056,7 @@ static void test_InvalidIMC(void) imc2 = ImmGetContext(hwnd); ok(imc1 == imc2, "imc should not changed! imc1 %p, imc2 %p\n", imc1, imc2); - /* Test associating NULL imc, which is different to invalid imc */ + /* Test associating NULL imc, which is different from an invalid imc */ oldimc = ImmAssociateContext(hwnd, imc_null); ok(oldimc != NULL, "Associating to NULL imc should success!\n"); imc2 = ImmGetContext(hwnd); diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index b02e723..d2ce294 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -458,7 +458,7 @@ static void testWriteWrappedProcessed(HANDLE hCon, COORD sbSize) static void testWrite(HANDLE hCon, COORD sbSize) { - /* FIXME: should in fact insure that the sb is at least 10 character wide */ + /* FIXME: should in fact ensure that the sb is at least 10 characters wide */ ok(SetConsoleTextAttribute(hCon, TEST_ATTRIB), "Setting default text color\n"); resetContent(hCon, sbSize, FALSE); testEmptyWrite(hCon); @@ -654,8 +654,8 @@ static void testCtrlHandler(void) ok(!SetConsoleCtrlHandler(mch, FALSE), "Shouldn't succeed\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "Bad error %u\n", GetLastError()); ok(SetConsoleCtrlHandler(mch, TRUE), "Couldn't set handler\n"); - /* wine requires the event for the test, as we cannot insure, so far, that event - * are processed synchronously in GenerateConsoleCtrlEvent() + /* wine requires the event for the test, as we cannot ensure, so far, that + * events are processed synchronously in GenerateConsoleCtrlEvent() */ mch_event = CreateEventA(NULL, TRUE, FALSE, NULL); mch_count = 0; diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index b4a7d82..ddb6d85 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -3692,7 +3692,7 @@ interface nsIDocShell : nsIDocShellTreeItem nsresult GetHasEditingSession(bool *aHasEditingSession); nsresult MakeEditable(bool inWaitForUriLoad); nsresult GetChildSHEntry(int32_t aChildOffset, nsISHEntry **_retval); - nsresult AddChildSHEntry(nsISHEntry *aCloneReference, nsISHEntry *aHistoryEntry, int32_t aChildOffset, uint32_t aLoadType, bool aCloneChilden); + nsresult AddChildSHEntry(nsISHEntry *aCloneReference, nsISHEntry *aHistoryEntry, int32_t aChildOffset, uint32_t aLoadType, bool aCloneChildren); nsresult GetUseGlobalHistory(bool *aUseGlobalHistory); nsresult SetUseGlobalHistory(bool aUseGlobalHistory); nsresult RemoveFromSessionHistory(); diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 02da764..f19f04d 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -219,7 +219,7 @@ static BOOL asynchronous_binding = FALSE; static BOOL support_wbapp, allow_new_window, no_travellog; static BOOL report_mime; static BOOL testing_submit; -static BOOL reseting_document; +static BOOL resetting_document; static int stream_read, protocol_read; static IStream *history_stream; static enum load_state_t { @@ -950,7 +950,7 @@ static ULONG WINAPI PropertyNotifySink_Release(IPropertyNotifySink *iface) static HRESULT WINAPI PropertyNotifySink_OnChanged(IPropertyNotifySink *iface, DISPID dispID) { - if(reseting_document) + if(resetting_document) return S_OK; switch(dispID) { @@ -1853,7 +1853,7 @@ static HRESULT WINAPI InPlaceFrame_RemoveMenus(IOleInPlaceFrame *iface, HMENU hm static HRESULT WINAPI InPlaceFrame_SetStatusText(IOleInPlaceFrame *iface, LPCOLESTR pszStatusText) { - if(!reseting_document) + if(!resetting_document) CHECK_EXPECT2(SetStatusText); if(!expect_status_text) ok(pszStatusText == NULL, "pszStatusText=%p, expected NULL\n", pszStatusText); @@ -2490,7 +2490,7 @@ static HRESULT WINAPI DocHostUIHandler_ShowContextMenu(IDocHostUIHandler2 *iface static HRESULT WINAPI DocHostUIHandler_GetHostInfo(IDocHostUIHandler2 *iface, DOCHOSTUIINFO *pInfo) { - if(!reseting_document) + if(!resetting_document) CHECK_EXPECT(GetHostInfo); ok(iface == expect_uihandler_iface, "called on unexpected iface\n"); ok(pInfo != NULL, "pInfo=NULL\n"); @@ -2783,7 +2783,7 @@ static void test_save_history(IUnknown *unk) static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) { - if(reseting_document) + if(resetting_document) return E_FAIL; if(!pguidCmdGroup) { @@ -3160,7 +3160,7 @@ static HRESULT WINAPI Dispatch_Invoke(IDispatch *iface, DISPID dispIdMember, REF LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { - if(reseting_document) + if(resetting_document) return E_FAIL; ok(IsEqualGUID(&IID_NULL, riid), "riid != IID_NULL\n"); @@ -3231,7 +3231,7 @@ static HRESULT WINAPI EventDispatch_Invoke(IDispatch *iface, DISPID dispIdMember IHTMLDocument2 *doc; BSTR state; - if(reseting_document) + if(resetting_document) return E_FAIL; ok(IsEqualGUID(&IID_NULL, riid), "riid = %s\n", debugstr_guid(riid)); @@ -3514,7 +3514,7 @@ static HRESULT WINAPI DocObjectService_GetPendingUrl( IDocObjectService* This, BSTR *pbstrPendingUrl) { - if(!reseting_document) + if(!resetting_document) CHECK_EXPECT(GetPendingUrl); return E_NOTIMPL; } @@ -5294,7 +5294,7 @@ static void _test_readyState(unsigned line, IUnknown *unk) "uninitialized" }; - if(open_call || reseting_document) + if(open_call || resetting_document) return; /* FIXME */ if(!unk) @@ -7679,12 +7679,12 @@ static void reset_document(IHTMLDocument2 *doc) if(FAILED(hres)) return; - reseting_document = TRUE; + resetting_document = TRUE; hres = IPersistStreamInit_InitNew(init); ok(hres == S_OK, "Load failed: %08x\n", hres); - reseting_document = FALSE; + resetting_document = FALSE; test_GetCurMoniker((IUnknown*)doc, NULL, "about:blank", FALSE); diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 9c497ed..d92a731 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -473,7 +473,7 @@ const char *get_nm_command(void) if (!nm_command) fatal_error( "cannot find suitable name lister\n" ); if (nm_command->count > 1) - fatal_error( "multiple arguemnts in nm command not supported yet\n" ); + fatal_error( "multiple arguments in nm command not supported yet\n" ); return nm_command->str[0]; }

1 0

Bruno Jesus : ws2_32: Implement WSASendMsg().
by Alexandre Julliard 01 Oct '13

01 Oct '13

Module: wine Branch: master Commit: adb8fb115a11598779c0188ef1535783acc2bdf8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adb8fb115a11598779c0188ef… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Sep 30 23:56:53 2013 -0300 ws2_32: Implement WSASendMsg(). --- dlls/ws2_32/socket.c | 21 +++++- dlls/ws2_32/tests/sock.c | 176 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/ws2_32/ws2_32.spec | 1 + 3 files changed, 197 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index c606659..a5837cf 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2427,6 +2427,24 @@ static void WINAPI WS2_GetAcceptExSockaddrs(PVOID buffer, DWORD data_size, DWORD } /*********************************************************************** + * WSASendMsg + */ +int WINAPI WSASendMsg( SOCKET s, LPWSAMSG msg, DWORD dwFlags, LPDWORD lpNumberOfBytesSent, + LPWSAOVERLAPPED lpOverlapped, + LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine) +{ + if (!msg) + { + SetLastError( WSAEFAULT ); + return SOCKET_ERROR; + } + + return WS2_sendto( s, msg->lpBuffers, msg->dwBufferCount, lpNumberOfBytesSent, + dwFlags, msg->name, msg->namelen, + lpOverlapped, lpCompletionRoutine ); +} + +/*********************************************************************** * WSARecvMsg * * Perform a receive operation that is capable of returning message @@ -3905,7 +3923,8 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID } else if ( IsEqualGUID(&wsasendmsg_guid, in_buff) ) { - FIXME("SIO_GET_EXTENSION_FUNCTION_POINTER: unimplemented WSASendMsg\n"); + *(LPFN_WSASENDMSG *)out_buff = WSASendMsg; + break; } else FIXME("SIO_GET_EXTENSION_FUNCTION_POINTER %s: stub\n", debugstr_guid(in_buff)); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 705981d..fddb820 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4755,6 +4755,181 @@ end: closesocket(v6); } +static void test_WSASendMsg(void) +{ + SOCKET sock, dst; + struct sockaddr_in sendaddr, sockaddr; + GUID WSASendMsg_GUID = WSAID_WSASENDMSG; + LPFN_WSASENDMSG pWSASendMsg = NULL; + char teststr[12] = "hello world", buffer[32]; + WSABUF iovec[2]; + WSAMSG msg; + DWORD bytesSent, err; + int ret, addrlen; + + /* FIXME: Missing OVERLAPPED and OVERLAPPED COMPLETION ROUTINE tests */ + + sock = socket(AF_INET, SOCK_DGRAM, 0); + ok(sock != INVALID_SOCKET, "socket() failed\n"); + + /* Obtain the WSASendMsg function */ + WSAIoctl(sock, SIO_GET_EXTENSION_FUNCTION_POINTER, &WSASendMsg_GUID, sizeof(WSASendMsg_GUID), + &pWSASendMsg, sizeof(pWSASendMsg), &err, NULL, NULL); + if (!pWSASendMsg) + { + closesocket(sock); + win_skip("WSASendMsg is unsupported, some tests will be skipped.\n"); + return; + } + + /* fake address for now */ + sendaddr.sin_family = AF_INET; + sendaddr.sin_port = htons(139); + sendaddr.sin_addr.s_addr = inet_addr("127.0.0.1"); + + memset(&msg, 0, sizeof(msg)); + iovec[0].buf = teststr; + iovec[0].len = sizeof(teststr); + iovec[1].buf = teststr; + iovec[1].len = sizeof(teststr) / 2; + msg.name = (struct sockaddr *) &sendaddr; + msg.namelen = sizeof(sendaddr); + msg.lpBuffers = iovec; + msg.dwBufferCount = 1; /* send only one buffer for now */ + + WSASetLastError(0xdeadbeef); + ret = pWSASendMsg(INVALID_SOCKET, &msg, 0, NULL, NULL, NULL); + ok(ret == SOCKET_ERROR, "WSASendMsg should have failed\n"); + err = WSAGetLastError(); + ok(err == WSAENOTSOCK, "expected 10038, got %d instead\n", err); + + WSASetLastError(0xdeadbeef); + ret = pWSASendMsg(sock, NULL, 0, NULL, NULL, NULL); + ok(ret == SOCKET_ERROR, "WSASendMsg should have failed\n"); + err = WSAGetLastError(); + ok(err == WSAEFAULT, "expected 10014, got %d instead\n", err); + + WSASetLastError(0xdeadbeef); + ret = pWSASendMsg(sock, NULL, 0, &bytesSent, NULL, NULL); + ok(ret == SOCKET_ERROR, "WSASendMsg should have failed\n"); + err = WSAGetLastError(); + ok(err == WSAEFAULT, "expected 10014, got %d instead\n", err); + + WSASetLastError(0xdeadbeef); + ret = pWSASendMsg(sock, &msg, 0, NULL, NULL, NULL); + ok(ret == SOCKET_ERROR, "WSASendMsg should have failed\n"); + err = WSAGetLastError(); + ok(err == WSAEFAULT, "expected 10014, got %d instead\n", err); + + closesocket(sock); + + sock = socket(AF_INET, SOCK_DGRAM, 0); + ok(sock != INVALID_SOCKET, "socket() failed\n"); + + dst = socket(AF_INET, SOCK_DGRAM, 0); + ok(dst != INVALID_SOCKET, "socket() failed\n"); + + memset(&sockaddr, 0, sizeof(sockaddr)); + sockaddr.sin_family = AF_INET; + sockaddr.sin_addr.s_addr = inet_addr("127.0.0.1"); + ok(!bind(dst, (struct sockaddr*)&sockaddr, sizeof(sockaddr)), + "bind should have worked\n"); + + /* read address to find out the port number to be used in send */ + memset(&sendaddr, 0, sizeof(sendaddr)); + addrlen = sizeof(sendaddr); + ok(!getsockname(dst, (struct sockaddr *) &sendaddr, &addrlen), + "getsockname should have worked\n"); + ok(sendaddr.sin_port, "socket port should be != 0\n"); + + /* ensure the sending socket is not bound */ + WSASetLastError(0xdeadbeef); + addrlen = sizeof(sockaddr); + ret = getsockname(sock, (struct sockaddr*)&sockaddr, &addrlen); + ok(ret == SOCKET_ERROR, "getsockname should have failed\n"); + err = WSAGetLastError(); + ok(err == WSAEINVAL, "expected 10022, got %d instead\n", err); + + set_blocking(sock, TRUE); + + bytesSent = 0; + ret = pWSASendMsg(sock, &msg, 0, &bytesSent, NULL, NULL); + ok(!ret, "WSASendMsg should have worked\n"); + ok(bytesSent == iovec[0].len, "incorret bytes sent, expected %d, sent %d\n", + iovec[0].len, bytesSent); + + /* receive data */ + addrlen = sizeof(sockaddr); + memset(buffer, 0, sizeof(buffer)); + ret = recvfrom(dst, buffer, sizeof(buffer), 0, (struct sockaddr *) &sockaddr, &addrlen); + ok(ret == bytesSent, "got %d, expected %d\n", + ret, bytesSent); + + /* A successful call to WSASendMsg must have bound the socket */ + addrlen = sizeof(sockaddr); + sockaddr.sin_port = 0; + sockaddr.sin_addr.s_addr = inet_addr("127.0.0.1"); + ret = getsockname(sock, (struct sockaddr*)&sockaddr, &addrlen); + ok(!ret, "getsockname should have worked\n"); + ok(sockaddr.sin_addr.s_addr == htonl(INADDR_ANY), "expected 0.0.0.0, got %s\n", + inet_ntoa(sockaddr.sin_addr)); + ok(sockaddr.sin_port, "sin_port should be != 0\n"); + + msg.dwBufferCount = 2; /* send both buffers */ + + bytesSent = 0; + ret = pWSASendMsg(sock, &msg, 0, &bytesSent, NULL, NULL); + ok(!ret, "WSASendMsg should have worked\n"); + ok(bytesSent == iovec[0].len + iovec[1].len, "incorret bytes sent, expected %d, sent %d\n", + iovec[0].len + iovec[1].len, bytesSent); + + /* receive data */ + addrlen = sizeof(sockaddr); + memset(buffer, 0, sizeof(buffer)); + ret = recvfrom(dst, buffer, sizeof(buffer), 0, (struct sockaddr *) &sockaddr, &addrlen); + ok(ret == bytesSent, "got %d, expected %d\n", + ret, bytesSent); + + closesocket(sock); + closesocket(dst); + + /* a bad call to WSASendMsg will also bind the socket */ + addrlen = sizeof(sockaddr); + sockaddr.sin_port = 0; + sockaddr.sin_addr.s_addr = inet_addr("127.0.0.1"); + sock = socket(AF_INET, SOCK_DGRAM, 0); + ok(sock != INVALID_SOCKET, "socket() failed\n"); + ok(pWSASendMsg(sock, &msg, 0, NULL, NULL, NULL) == SOCKET_ERROR, "WSASendMsg should have failed\n"); +todo_wine { + ok(!getsockname(sock, (struct sockaddr*)&sockaddr, &addrlen), "getsockname should have worked\n"); + ok(sockaddr.sin_addr.s_addr == htonl(INADDR_ANY), "expected 0.0.0.0, got %s\n", + inet_ntoa(sockaddr.sin_addr)); + ok(sockaddr.sin_port, "sin_port should be > 0\n"); +} + closesocket(sock); + + /* a bad call without msg parameter will not trigger the auto-bind */ + sock = socket(AF_INET, SOCK_DGRAM, 0); + ok(sock != INVALID_SOCKET, "socket() failed\n"); + ok(pWSASendMsg(sock, NULL, 0, NULL, NULL, NULL) == SOCKET_ERROR, "WSASendMsg should have failed\n"); + ok(getsockname(sock, (struct sockaddr*)&sockaddr, &addrlen), "getsockname should have failed\n"); + err = WSAGetLastError(); + ok(err == WSAEINVAL, "expected 10022, got %d instead\n", err); + closesocket(sock); + + /* SOCK_STREAM sockets are not supported */ + bytesSent = 0; + sock = socket(AF_INET, SOCK_STREAM, 0); + ok(sock != INVALID_SOCKET, "socket() failed\n"); + SetLastError(0xdeadbeef); + ret = pWSASendMsg(sock, &msg, 0, &bytesSent, NULL, NULL); + ok(ret == SOCKET_ERROR, "WSASendMsg should have failed\n"); + err = WSAGetLastError(); +todo_wine + ok(err == WSAEINVAL, "expected 10014, got %d instead\n", err); + closesocket(sock); +} + static void test_WSASendTo(void) { SOCKET s; @@ -6750,6 +6925,7 @@ START_TEST( sock ) test_dns(); test_gethostbyname_hack(); + test_WSASendMsg(); test_WSASendTo(); test_WSARecv(); diff --git a/dlls/ws2_32/ws2_32.spec b/dlls/ws2_32/ws2_32.spec index ccec106..0811b74 100644 --- a/dlls/ws2_32/ws2_32.spec +++ b/dlls/ws2_32/ws2_32.spec @@ -97,6 +97,7 @@ @ stdcall WSAResetEvent(long) kernel32.ResetEvent @ stdcall WSASend(long ptr long ptr long ptr ptr) @ stdcall WSASendDisconnect(long ptr) +@ stdcall WSASendMsg(long ptr long ptr ptr ptr) @ stdcall WSASendTo(long ptr long ptr long ptr long ptr ptr) @ stdcall WSASetEvent(long) kernel32.SetEvent @ stdcall WSASetServiceA(ptr long long)

1 0

Francois Gouget : ddraw/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 01 Oct '13

01 Oct '13

Module: wine Branch: master Commit: 0cc1c22d16ab89d46cb9d99c9c4095ff07374de4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cc1c22d16ab89d46cb9d99c9… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Oct 1 08:13:14 2013 +0200 ddraw/tests: Fix compilation on systems that don't support nameless unions. --- dlls/ddraw/tests/ddraw1.c | 2 +- dlls/ddraw/tests/ddraw2.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 8b21056..8c62901 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -3245,7 +3245,7 @@ static void test_rt_caps(void) if (test_data[i].pf) { surface_desc.dwFlags |= DDSD_PIXELFORMAT; - U4(surface_desc).ddpfPixelFormat = *test_data[i].pf; + surface_desc.ddpfPixelFormat = *test_data[i].pf; } if (test_data[i].caps_in & DDSCAPS_ZBUFFER) { diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index d56230d..939fce7 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -3850,7 +3850,7 @@ static void test_rt_caps(void) if (test_data[i].pf) { surface_desc.dwFlags |= DDSD_PIXELFORMAT; - U4(surface_desc).ddpfPixelFormat = *test_data[i].pf; + surface_desc.ddpfPixelFormat = *test_data[i].pf; } if (test_data[i].caps_in & DDSCAPS_ZBUFFER) { @@ -3905,7 +3905,7 @@ static void test_rt_caps(void) if (test_data[i].pf) { surface_desc.dwFlags |= DDSD_PIXELFORMAT; - U4(surface_desc).ddpfPixelFormat = *test_data[i].pf; + surface_desc.ddpfPixelFormat = *test_data[i].pf; } if (test_data[i].caps_in & DDSCAPS_ZBUFFER) {

1 0

Henri Verbeet : wined3d: Send render target binding updates through the command stream.
by Alexandre Julliard 01 Oct '13

01 Oct '13

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 : wined3d: Send depth stencil binding updates through the command stream.
by Alexandre Julliard 01 Oct '13

01 Oct '13

Module: wine Branch: master Commit: fd5fc51bc5c2ac203bfba8b84dd23168ba9e1974 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd5fc51bc5c2ac203bfba8b84… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 1 10:38:30 2013 +0200 wined3d: Send depth stencil binding updates through the command stream. --- dlls/wined3d/cs.c | 58 ++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/device.c | 33 +---------------------- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 60 insertions(+), 32 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index b182912..3d155f1 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -31,6 +31,7 @@ enum wined3d_cs_op WINED3D_CS_OP_SET_VIEWPORT, WINED3D_CS_OP_SET_SCISSOR_RECT, WINED3D_CS_OP_SET_RENDER_TARGET, + WINED3D_CS_OP_SET_DEPTH_STENCIL, }; struct wined3d_cs_present @@ -84,6 +85,12 @@ struct wined3d_cs_set_render_target struct wined3d_surface *render_target; }; +struct wined3d_cs_set_depth_stencil +{ + enum wined3d_cs_op opcode; + struct wined3d_surface *depth_stencil; +}; + static void wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_present *op = data; @@ -227,6 +234,56 @@ void wined3d_cs_emit_set_render_target(struct wined3d_cs *cs, UINT render_target cs->ops->submit(cs); } +static void wined3d_cs_exec_set_depth_stencil(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_set_depth_stencil *op = data; + struct wined3d_device *device = cs->device; + struct wined3d_surface *prev; + + if ((prev = cs->state.fb->depth_stencil)) + { + if (device->swapchains[0]->desc.flags & WINED3DPRESENTFLAG_DISCARD_DEPTHSTENCIL + || prev->flags & SFLAG_DISCARD) + { + surface_modify_ds_location(prev, SFLAG_DISCARDED, + prev->resource.width, prev->resource.height); + if (prev == device->onscreen_depth_stencil) + { + wined3d_surface_decref(device->onscreen_depth_stencil); + device->onscreen_depth_stencil = NULL; + } + } + } + + cs->fb.depth_stencil = op->depth_stencil; + + if (!prev != !op->depth_stencil) + { + /* Swapping NULL / non NULL depth stencil affects the depth and tests */ + device_invalidate_state(device, STATE_RENDER(WINED3D_RS_ZENABLE)); + device_invalidate_state(device, STATE_RENDER(WINED3D_RS_STENCILENABLE)); + device_invalidate_state(device, STATE_RENDER(WINED3D_RS_STENCILWRITEMASK)); + device_invalidate_state(device, STATE_RENDER(WINED3D_RS_DEPTHBIAS)); + } + else if (prev && prev->resource.format->depth_size != op->depth_stencil->resource.format->depth_size) + { + device_invalidate_state(device, STATE_RENDER(WINED3D_RS_DEPTHBIAS)); + } + + device_invalidate_state(device, STATE_FRAMEBUFFER); +} + +void wined3d_cs_emit_set_depth_stencil(struct wined3d_cs *cs, struct wined3d_surface *depth_stencil) +{ + struct wined3d_cs_set_depth_stencil *op; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_SET_DEPTH_STENCIL; + op->depth_stencil = depth_stencil; + + 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, @@ -235,6 +292,7 @@ static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void /* 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, + /* WINED3D_CS_OP_SET_DEPTH_STENCIL */ wined3d_cs_exec_set_depth_stencil, }; 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 46057c3..12d0239 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4054,43 +4054,12 @@ void CDECL wined3d_device_set_depth_stencil(struct wined3d_device *device, struc return; } - if (prev) - { - if (device->swapchains[0]->desc.flags & WINED3DPRESENTFLAG_DISCARD_DEPTHSTENCIL - || prev->flags & SFLAG_DISCARD) - { - surface_modify_ds_location(prev, SFLAG_DISCARDED, - prev->resource.width, prev->resource.height); - if (prev == device->onscreen_depth_stencil) - { - wined3d_surface_decref(device->onscreen_depth_stencil); - device->onscreen_depth_stencil = NULL; - } - } - } - device->fb.depth_stencil = depth_stencil; if (depth_stencil) wined3d_surface_incref(depth_stencil); - - if (!prev != !depth_stencil) - { - /* Swapping NULL / non NULL depth stencil affects the depth and tests */ - device_invalidate_state(device, STATE_RENDER(WINED3D_RS_ZENABLE)); - device_invalidate_state(device, STATE_RENDER(WINED3D_RS_STENCILENABLE)); - device_invalidate_state(device, STATE_RENDER(WINED3D_RS_STENCILWRITEMASK)); - device_invalidate_state(device, STATE_RENDER(WINED3D_RS_DEPTHBIAS)); - } - else if (prev && prev->resource.format->depth_size != depth_stencil->resource.format->depth_size) - { - device_invalidate_state(device, STATE_RENDER(WINED3D_RS_DEPTHBIAS)); - } + wined3d_cs_emit_set_depth_stencil(device->cs, depth_stencil); if (prev) wined3d_surface_decref(prev); - - device_invalidate_state(device, STATE_FRAMEBUFFER); - - return; } HRESULT CDECL wined3d_device_set_cursor_properties(struct wined3d_device *device, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d8c66b7..7409807 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2486,6 +2486,7 @@ 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_depth_stencil(struct wined3d_cs *cs, struct wined3d_surface *depth_stencil) 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;

1 0

Henri Verbeet : wined3d: Send vertex declaration binding updates through the command stream.
by Alexandre Julliard 01 Oct '13

01 Oct '13

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

Henri Verbeet : d3dcompiler: Get rid of the BWRITERSHADER_INSTRUCTION_OPCODE_TYPE typedef.
by Alexandre Julliard 01 Oct '13

01 Oct '13

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