September 2013 - Wine-Commits

Jacek Caban : mshtml: Added separated structure to store request data.
by Alexandre Julliard Sept. 26, 2013

Sept. 26, 2013

Module: wine Branch: master Commit: 29d27ef669349354ef829af24c13c83c45a0f8f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29d27ef669349354ef829af24… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 26 17:34:49 2013 +0200 mshtml: Added separated structure to store request data. --- dlls/mshtml/binding.h | 10 ++++-- dlls/mshtml/navigate.c | 83 +++++++++++++++++++++++++++--------------------- 2 files changed, 54 insertions(+), 39 deletions(-) diff --git a/dlls/mshtml/binding.h b/dlls/mshtml/binding.h index d953541..cfae014 100644 --- a/dlls/mshtml/binding.h +++ b/dlls/mshtml/binding.h @@ -49,6 +49,12 @@ typedef struct { struct list request_headers; } nsChannel; +typedef struct { + WCHAR *headers; + HGLOBAL post_data; + ULONG post_data_len; +} request_data_t; + typedef struct BSCallbackVtbl BSCallbackVtbl; struct BSCallback { @@ -61,9 +67,7 @@ struct BSCallback { LONG ref; - LPWSTR headers; - HGLOBAL post_data; - ULONG post_data_len; + request_data_t request_data; ULONG readed; DWORD bindf; BOOL bindinfo_ready; diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 4e6ed61..4091529 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -228,6 +228,13 @@ static nsProtocolStream *create_nsprotocol_stream(void) return ret; } +static void release_request_data(request_data_t *request_data) +{ + heap_free(request_data->headers); + if(request_data->post_data) + GlobalFree(request_data->post_data); +} + static inline BSCallback *impl_from_IBindStatusCallback(IBindStatusCallback *iface) { return CONTAINING_RECORD(iface, BSCallback, IBindStatusCallback_iface); @@ -286,15 +293,13 @@ static ULONG WINAPI BindStatusCallback_Release(IBindStatusCallback *iface) TRACE("(%p) ref = %d\n", This, ref); if(!ref) { - if(This->post_data) - GlobalFree(This->post_data); + release_request_data(&This->request_data); if(This->mon) IMoniker_Release(This->mon); if(This->binding) IBinding_Release(This->binding); list_remove(&This->entry); list_init(&This->entry); - heap_free(This->headers); This->vtbl->destroy(This); } @@ -396,15 +401,15 @@ static HRESULT WINAPI BindStatusCallback_GetBindInfo(IBindStatusCallback *iface, memset(pbindinfo, 0, size); pbindinfo->cbSize = size; - pbindinfo->cbstgmedData = This->post_data_len; + pbindinfo->cbstgmedData = This->request_data.post_data_len; pbindinfo->dwCodePage = CP_UTF8; pbindinfo->dwOptions = 0x80000; - if(This->post_data) { + if(This->request_data.post_data_len) { pbindinfo->dwBindVerb = BINDVERB_POST; pbindinfo->stgmedData.tymed = TYMED_HGLOBAL; - pbindinfo->stgmedData.u.hGlobal = This->post_data; + pbindinfo->stgmedData.u.hGlobal = This->request_data.post_data; pbindinfo->stgmedData.pUnkForRelease = (IUnknown*)&This->IBindStatusCallback_iface; IBindStatusCallback_AddRef(&This->IBindStatusCallback_iface); } @@ -483,14 +488,14 @@ static HRESULT WINAPI HttpNegotiate_BeginningTransaction(IHttpNegotiate2 *iface, if(hres != S_FALSE) return hres; - if(This->headers) { + if(This->request_data.headers) { DWORD size; - size = (strlenW(This->headers)+1)*sizeof(WCHAR); + size = (strlenW(This->request_data.headers)+1)*sizeof(WCHAR); *pszAdditionalHeaders = CoTaskMemAlloc(size); if(!*pszAdditionalHeaders) return E_OUTOFMEMORY; - memcpy(*pszAdditionalHeaders, This->headers, size); + memcpy(*pszAdditionalHeaders, This->request_data.headers, size); } return S_OK; @@ -1001,7 +1006,8 @@ HRESULT bind_mon_to_wstr(HTMLInnerWindow *window, IMoniker *mon, WCHAR **ret) return S_OK; } -static HRESULT read_post_data_stream(nsChannelBSC *This, nsChannel *nschannel) +static HRESULT read_post_data_stream(nsIInputStream *stream, BOOL contains_headers, struct list *headers_list, + request_data_t *request_data) { UINT64 available = 0; UINT32 data_len = 0; @@ -1009,10 +1015,10 @@ static HRESULT read_post_data_stream(nsChannelBSC *This, nsChannel *nschannel) nsresult nsres; HRESULT hres = S_OK; - if(!nschannel->post_data_stream) + if(!stream) return S_OK; - nsres = nsIInputStream_Available(nschannel->post_data_stream, &available); + nsres = nsIInputStream_Available(stream, &available); if(NS_FAILED(nsres)) return E_FAIL; @@ -1020,13 +1026,13 @@ static HRESULT read_post_data_stream(nsChannelBSC *This, nsChannel *nschannel) if(!data) return E_OUTOFMEMORY; - nsres = nsIInputStream_Read(nschannel->post_data_stream, data, available, &data_len); + nsres = nsIInputStream_Read(stream, data, available, &data_len); if(NS_FAILED(nsres)) { GlobalFree(data); return E_FAIL; } - if(nschannel->post_data_contains_headers) { + if(contains_headers) { if(data_len >= 2 && data[0] == '\r' && data[1] == '\n') { post_data = data+2; data_len -= 2; @@ -1038,21 +1044,23 @@ static HRESULT read_post_data_stream(nsChannelBSC *This, nsChannel *nschannel) post_data += data_len; for(ptr = data; ptr+4 < data+data_len; ptr++) { if(!memcmp(ptr, "\r\n\r\n", 4)) { - post_data = ptr+4; + ptr += 2; + post_data = ptr+2; break; } } data_len -= post_data-data; - size = MultiByteToWideChar(CP_ACP, 0, data, post_data-data, NULL, 0); + size = MultiByteToWideChar(CP_ACP, 0, data, ptr-data, NULL, 0); headers = heap_alloc((size+1)*sizeof(WCHAR)); if(headers) { - MultiByteToWideChar(CP_ACP, 0, data, post_data-data, headers, size); + MultiByteToWideChar(CP_ACP, 0, data, ptr-data, headers, size); headers[size] = 0; - hres = parse_headers(headers , &nschannel->request_headers); + if(headers_list) + hres = parse_headers(headers, headers_list); if(SUCCEEDED(hres)) - This->bsc.headers = headers; + request_data->headers = headers; else heap_free(headers); }else { @@ -1081,9 +1089,9 @@ static HRESULT read_post_data_stream(nsChannelBSC *This, nsChannel *nschannel) post_data = new_data; } - This->bsc.post_data = post_data; - This->bsc.post_data_len = data_len; - TRACE("post_data = %s\n", debugstr_a(This->bsc.post_data)); + request_data->post_data = post_data; + request_data->post_data_len = data_len; + TRACE("post_data = %s\n", debugstr_an(request_data->post_data, request_data->post_data_len)); return S_OK; } @@ -1399,10 +1407,12 @@ static HRESULT nsChannelBSC_start_binding(BSCallback *bsc) static HRESULT nsChannelBSC_init_bindinfo(BSCallback *bsc) { nsChannelBSC *This = nsChannelBSC_from_BSCallback(bsc); + nsChannel *nschannel = This->nschannel; HRESULT hres; - if(This->nschannel && This->nschannel->post_data_stream) { - hres = read_post_data_stream(This, This->nschannel); + if(nschannel && nschannel->post_data_stream) { + hres = read_post_data_stream(nschannel->post_data_stream, nschannel->post_data_contains_headers, + &nschannel->request_headers, &This->bsc.request_data); if(FAILED(hres)) return hres; } @@ -1854,23 +1864,23 @@ HRESULT create_channelbsc(IMoniker *mon, const WCHAR *headers, BYTE *post_data, ret->is_doc_channel = is_doc_binding; if(headers) { - ret->bsc.headers = heap_strdupW(headers); - if(!ret->bsc.headers) { + ret->bsc.request_data.headers = heap_strdupW(headers); + if(!ret->bsc.request_data.headers) { IBindStatusCallback_Release(&ret->bsc.IBindStatusCallback_iface); return E_OUTOFMEMORY; } } if(post_data) { - ret->bsc.post_data = GlobalAlloc(0, post_data_size); - if(!ret->bsc.post_data) { - heap_free(ret->bsc.headers); + ret->bsc.request_data.post_data = GlobalAlloc(0, post_data_size); + if(!ret->bsc.request_data.post_data) { + release_request_data(&ret->bsc.request_data); IBindStatusCallback_Release(&ret->bsc.IBindStatusCallback_iface); return E_OUTOFMEMORY; } - memcpy(ret->bsc.post_data, post_data, post_data_size); - ret->bsc.post_data_len = post_data_size; + memcpy(ret->bsc.request_data.post_data, post_data, post_data_size); + ret->bsc.request_data.post_data_len = post_data_size; } TRACE("created %p\n", ret); @@ -1994,12 +2004,12 @@ void channelbsc_set_channel(nsChannelBSC *This, nsChannel *channel, nsIStreamLis This->nscontext = context; } - if(This->bsc.headers) { + if(This->bsc.request_data.headers) { HRESULT hres; - hres = parse_headers(This->bsc.headers, &channel->request_headers); - heap_free(This->bsc.headers); - This->bsc.headers = NULL; + hres = parse_headers(This->bsc.request_data.headers, &channel->request_headers); + heap_free(This->bsc.request_data.headers); + This->bsc.request_data.headers = NULL; if(FAILED(hres)) WARN("parse_headers failed: %08x\n", hres); } @@ -2347,7 +2357,8 @@ HRESULT hlink_frame_navigate(HTMLDocument *doc, LPCWSTR url, nsChannel *nschanne } if(nschannel) - read_post_data_stream(callback, nschannel); + read_post_data_stream(nschannel->post_data_stream, nschannel->post_data_contains_headers, + &nschannel->request_headers, &callback->bsc.request_data); hres = CreateAsyncBindCtx(0, &callback->bsc.IBindStatusCallback_iface, NULL, &bindctx); if(SUCCEEDED(hres))

1 0

Ken Thomases : winemac: When programmatically focusing a window, don' t generate WINDOW_LOST_FOCUS event for previously focused window.
by Alexandre Julliard Sept. 26, 2013

Sept. 26, 2013

Module: wine Branch: master Commit: 4e0e9ca84a89d1ac2b548ee4a6224b764af2d23d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e0e9ca84a89d1ac2b548ee4a… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Sep 25 15:10:57 2013 -0500 winemac: When programmatically focusing a window, don't generate WINDOW_LOST_FOCUS event for previously focused window. That event can confuse things if the program switches focus from A to B and then back to A and then processes events. It will get an event saying that A lost focus in Cocoa, check that A does indeed have current focus in Wine, and so switch focus away from it (to the desktop window). (It then gets an event that B lost focus, but that does nothing at that point.) --- dlls/winemac.drv/cocoa_window.h | 1 - dlls/winemac.drv/cocoa_window.m | 14 ++++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.h b/dlls/winemac.drv/cocoa_window.h index 8672812..8893f85 100644 --- a/dlls/winemac.drv/cocoa_window.h +++ b/dlls/winemac.drv/cocoa_window.h @@ -58,7 +58,6 @@ NSSize savedContentMinSize; NSSize savedContentMaxSize; - BOOL causing_becomeKeyWindow; BOOL ignore_windowMiniaturize; BOOL ignore_windowDeminiaturize; } diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index a602adb..43be5d5 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -464,6 +464,8 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) @implementation WineWindow + static WineWindow* causing_becomeKeyWindow; + @synthesize disabled, noActivate, floating, fullscreen, latentParentWindow, hwnd, queue; @synthesize surface, surface_mutex; @synthesize shape, shapeChangedSinceLastDraw; @@ -1200,9 +1202,9 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) { [self orderBelow:nil orAbove:nil activate:activate]; - causing_becomeKeyWindow = TRUE; + causing_becomeKeyWindow = self; [self makeKeyWindow]; - causing_becomeKeyWindow = FALSE; + causing_becomeKeyWindow = nil; } - (void) postKey:(uint16_t)keyCode @@ -1263,7 +1265,7 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) */ - (BOOL) canBecomeKeyWindow { - if (causing_becomeKeyWindow) return YES; + if (causing_becomeKeyWindow == self) return YES; if (self.disabled || self.noActivate) return NO; return [self isKeyWindow]; } @@ -1432,7 +1434,7 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) if (event) [self flagsChanged:event]; - if (causing_becomeKeyWindow) return; + if (causing_becomeKeyWindow == self) return; [controller windowGotFocus:self]; } @@ -1465,9 +1467,9 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) if (!self.disabled && !self.noActivate) { - causing_becomeKeyWindow = TRUE; + causing_becomeKeyWindow = self; [self makeKeyWindow]; - causing_becomeKeyWindow = FALSE; + causing_becomeKeyWindow = nil; [controller windowGotFocus:self]; }

1 0

Alexandre Julliard : configure: Set the library prefix to "lib" on Android.
by Alexandre Julliard Sept. 26, 2013

Sept. 26, 2013

Module: wine Branch: master Commit: 90520f7fc4a7875c93a73519efbe6dea2914721f URL: http://source.winehq.org/git/wine.git/?a=commit;h=90520f7fc4a7875c93a73519e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 26 14:36:02 2013 +0200 configure: Set the library prefix to "lib" on Android. --- configure | 1 + configure.ac | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/configure b/configure index cf4bbd5..317bade 100755 --- a/configure +++ b/configure @@ -6903,6 +6903,7 @@ clean:: linux-android*) DLLFLAGS="$DLLFLAGS -fPIC" DLLEXT=".so" + DLLPREFIX="lib" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -Wl,--export-dynamic" >&5 $as_echo_n "checking whether the compiler supports -fPIC -Wl,--export-dynamic... " >&6; } if ${ac_cv_cflags__fPIC__Wl___export_dynamic+:} false; then : diff --git a/configure.ac b/configure.ac index 337235c..8ac0216 100644 --- a/configure.ac +++ b/configure.ac @@ -872,6 +872,7 @@ clean:: linux-android*) DLLFLAGS="$DLLFLAGS -fPIC" DLLEXT=".so" + DLLPREFIX="lib" WINE_TRY_CFLAGS([-fPIC -Wl,--export-dynamic], [AC_SUBST(LDEXECFLAGS,["-Wl,--export-dynamic"])]) WINE_TRY_CFLAGS([-fPIC -Wl,--rpath,\$ORIGIN/../lib],

1 0

Alexandre Julliard : makefiles: Add support for specifying a prefix for installed library file names.
by Alexandre Julliard Sept. 26, 2013

Sept. 26, 2013

Module: wine Branch: master Commit: a83c598c7987316582d254280ab57fcbe45acc5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a83c598c7987316582d254280… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 26 14:31:57 2013 +0200 makefiles: Add support for specifying a prefix for installed library file names. --- Make.vars.in | 1 + aclocal.m4 | 8 ++++---- configure | 11 +++++++---- configure.ac | 1 + dlls/Makedll.rules.in | 4 ++-- libs/wine/Makefile.in | 1 + libs/wine/config.c | 3 ++- libs/wine/loader.c | 14 ++++++++------ programs/Makeprog.rules.in | 4 ++-- 9 files changed, 28 insertions(+), 19 deletions(-) diff --git a/Make.vars.in b/Make.vars.in index 76436fa..133da5f 100644 --- a/Make.vars.in +++ b/Make.vars.in @@ -31,6 +31,7 @@ FLEX = @FLEX@ EXEEXT = @EXEEXT@ OBJEXT = @OBJEXT@ DLLEXT = @DLLEXT@ +DLLPREFIX = @DLLPREFIX@ FAKEEXT = $(DLLEXT:.so=.fake) TOOLSEXT = @TOOLSEXT@ IMPLIBEXT = @IMPLIBEXT@ diff --git a/aclocal.m4 b/aclocal.m4 index a3de5ee..ee67b83 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -381,10 +381,10 @@ __uninstall__: $ac_dir/__uninstall__" then wine_fn_append_rule \ "$ac_dir/__install-lib__:: $ac_dir \$(DESTDIR)\$(dlldir) \$(DESTDIR)\$(fakedlldir) - \$(INSTALL_PROGRAM) $ac_dir/$ac_dll$DLLEXT \$(DESTDIR)\$(dlldir)/$ac_dll$DLLEXT + \$(INSTALL_PROGRAM) $ac_dir/$ac_dll$DLLEXT \$(DESTDIR)\$(dlldir)/$DLLPREFIX$ac_dll$DLLEXT \$(INSTALL_DATA) $ac_dir/$ac_dll.fake \$(DESTDIR)\$(fakedlldir)/$ac_dll $ac_dir/__uninstall__:: - \$(RM) \$(DESTDIR)\$(dlldir)/$ac_dll$DLLEXT \$(DESTDIR)\$(fakedlldir)/$ac_dll" + \$(RM) \$(DESTDIR)\$(dlldir)/$DLLPREFIX$ac_dll$DLLEXT \$(DESTDIR)\$(fakedlldir)/$ac_dll" else wine_fn_append_rule \ "$ac_dir/__install-lib__:: $ac_dir \$(DESTDIR)\$(dlldir) @@ -501,10 +501,10 @@ __uninstall__: $ac_dir/__uninstall__" then wine_fn_append_rule \ "$ac_dir/__install__:: $ac_dir \$(DESTDIR)\$(dlldir) \$(DESTDIR)\$(fakedlldir) - \$(INSTALL_PROGRAM) $ac_dir/$ac_program$DLLEXT \$(DESTDIR)\$(dlldir)/$ac_program$DLLEXT + \$(INSTALL_PROGRAM) $ac_dir/$ac_program$DLLEXT \$(DESTDIR)\$(dlldir)/$DLLPREFIX$ac_program$DLLEXT \$(INSTALL_DATA) $ac_dir/$ac_program.fake \$(DESTDIR)\$(fakedlldir)/$ac_program $ac_dir/__uninstall__:: - \$(RM) \$(DESTDIR)\$(dlldir)/$ac_program$DLLEXT \$(DESTDIR)\$(fakedlldir)/$ac_program" + \$(RM) \$(DESTDIR)\$(dlldir)/$DLLPREFIX$ac_program$DLLEXT \$(DESTDIR)\$(fakedlldir)/$ac_program" if test "x$enable_tools" != xno && wine_fn_has_flag installbin $ac_flags then diff --git a/configure b/configure index 58f2579..cf4bbd5 100755 --- a/configure +++ b/configure @@ -713,6 +713,7 @@ LDRPATH_LOCAL LDRPATH_INSTALL IMPLIBEXT DLLFLAGS +DLLPREFIX DLLEXT CPP OPENGL_LIBS @@ -6409,6 +6410,8 @@ done DLLEXT="" +DLLPREFIX="" + DLLFLAGS="-D_REENTRANT" IMPLIBEXT="def" @@ -15634,10 +15637,10 @@ __uninstall__: $ac_dir/__uninstall__" then wine_fn_append_rule \ "$ac_dir/__install-lib__:: $ac_dir \$(DESTDIR)\$(dlldir) \$(DESTDIR)\$(fakedlldir) - \$(INSTALL_PROGRAM) $ac_dir/$ac_dll$DLLEXT \$(DESTDIR)\$(dlldir)/$ac_dll$DLLEXT + \$(INSTALL_PROGRAM) $ac_dir/$ac_dll$DLLEXT \$(DESTDIR)\$(dlldir)/$DLLPREFIX$ac_dll$DLLEXT \$(INSTALL_DATA) $ac_dir/$ac_dll.fake \$(DESTDIR)\$(fakedlldir)/$ac_dll $ac_dir/__uninstall__:: - \$(RM) \$(DESTDIR)\$(dlldir)/$ac_dll$DLLEXT \$(DESTDIR)\$(fakedlldir)/$ac_dll" + \$(RM) \$(DESTDIR)\$(dlldir)/$DLLPREFIX$ac_dll$DLLEXT \$(DESTDIR)\$(fakedlldir)/$ac_dll" else wine_fn_append_rule \ "$ac_dir/__install-lib__:: $ac_dir \$(DESTDIR)\$(dlldir) @@ -15758,10 +15761,10 @@ __uninstall__: $ac_dir/__uninstall__" then wine_fn_append_rule \ "$ac_dir/__install__:: $ac_dir \$(DESTDIR)\$(dlldir) \$(DESTDIR)\$(fakedlldir) - \$(INSTALL_PROGRAM) $ac_dir/$ac_program$DLLEXT \$(DESTDIR)\$(dlldir)/$ac_program$DLLEXT + \$(INSTALL_PROGRAM) $ac_dir/$ac_program$DLLEXT \$(DESTDIR)\$(dlldir)/$DLLPREFIX$ac_program$DLLEXT \$(INSTALL_DATA) $ac_dir/$ac_program.fake \$(DESTDIR)\$(fakedlldir)/$ac_program $ac_dir/__uninstall__:: - \$(RM) \$(DESTDIR)\$(dlldir)/$ac_program$DLLEXT \$(DESTDIR)\$(fakedlldir)/$ac_program" + \$(RM) \$(DESTDIR)\$(dlldir)/$DLLPREFIX$ac_program$DLLEXT \$(DESTDIR)\$(fakedlldir)/$ac_program" if test "x$enable_tools" != xno && wine_fn_has_flag installbin $ac_flags then diff --git a/configure.ac b/configure.ac index 1055b0a..337235c 100644 --- a/configure.ac +++ b/configure.ac @@ -677,6 +677,7 @@ AC_CHECK_HEADERS([libprocstat.h],,, dnl **** Check for working dll **** AC_SUBST(DLLEXT,"") +AC_SUBST(DLLPREFIX,"") AC_SUBST(DLLFLAGS,"-D_REENTRANT") AC_SUBST(IMPLIBEXT,"def") AC_SUBST(LDRPATH_INSTALL,"") diff --git a/dlls/Makedll.rules.in b/dlls/Makedll.rules.in index 56414a0..b34a35a 100644 --- a/dlls/Makedll.rules.in +++ b/dlls/Makedll.rules.in @@ -72,7 +72,7 @@ install_dll: $(MODULE) $(DESTDIR)$(dlldir) dummy $(INSTALL_PROGRAM) $(MODULE) $(DESTDIR)$(dlldir)/$(MODULE) install_dll.so: $(MODULE).so $(DESTDIR)$(dlldir) dummy - $(INSTALL_PROGRAM) $(MODULE).so $(DESTDIR)$(dlldir)/$(MODULE).so + $(INSTALL_PROGRAM) $(MODULE).so $(DESTDIR)$(dlldir)/$(DLLPREFIX)$(MODULE).so install_dll.fake: $(MODULE).fake $(DESTDIR)$(fakedlldir) dummy $(INSTALL_DATA) $(MODULE).fake $(DESTDIR)$(fakedlldir)/$(MODULE) @@ -80,7 +80,7 @@ install_dll.fake: $(MODULE).fake $(DESTDIR)$(fakedlldir) dummy install install-lib:: install_dll$(DLLEXT) install_dll$(FAKEEXT) uninstall:: - $(RM) $(DESTDIR)$(dlldir)/$(MODULE)$(DLLEXT) $(DESTDIR)$(fakedlldir)/$(MODULE) + $(RM) $(DESTDIR)$(dlldir)/$(DLLPREFIX)$(MODULE)$(DLLEXT) $(DESTDIR)$(fakedlldir)/$(MODULE) # Misc. rules diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index 04838c9..7123e9b 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -107,6 +107,7 @@ EXTRA_OBJS = version.o CONFIGDIRS = \ -DBINDIR='"$(bindir)"' \ -DDLLDIR='"$(dlldir)"' \ + -DDLLPREFIX='"$(DLLPREFIX)"' \ -DLIB_TO_BINDIR=\"`$(RELPATH) $(libdir) $(bindir)`\" \ -DLIB_TO_DLLDIR=\"`$(RELPATH) $(libdir) $(dlldir)`\" \ -DBIN_TO_DLLDIR=\"`$(RELPATH) $(bindir) $(dlldir)`\" \ diff --git a/libs/wine/config.c b/libs/wine/config.c index 3b5dd68..a273502 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c @@ -249,9 +249,10 @@ static void init_server_dir( dev_t dev, ino_t ino ) } /* retrieve the default dll dir */ -const char *get_dlldir( const char **default_dlldir ) +const char *get_dlldir( const char **default_dlldir, const char **dll_prefix ) { *default_dlldir = DLLDIR; + *dll_prefix = "/" DLLPREFIX; return dlldir; } diff --git a/libs/wine/loader.c b/libs/wine/loader.c index 4e78116..01cc57a 100644 --- a/libs/wine/loader.c +++ b/libs/wine/loader.c @@ -90,19 +90,20 @@ static load_dll_callback_t load_dll_callback; static const char *build_dir; static const char *default_dlldir; +static const char *dll_prefix; static const char **dll_paths; static unsigned int nb_dll_paths; static int dll_path_maxlen; extern void mmap_init(void); -extern const char *get_dlldir( const char **default_dlldir ); +extern const char *get_dlldir( const char **default_dlldir, const char **dll_prefix ); /* build the dll load path from the WINEDLLPATH variable */ static void build_dll_path(void) { int len, count = 0; char *p, *path = getenv( "WINEDLLPATH" ); - const char *dlldir = get_dlldir( &default_dlldir ); + const char *dlldir = get_dlldir( &default_dlldir, &dll_prefix ); if (path) { @@ -152,6 +153,7 @@ static void build_dll_path(void) if (len > dll_path_maxlen) dll_path_maxlen = len; dll_paths[nb_dll_paths++] = default_dlldir; } + dll_path_maxlen += strlen( dll_prefix ) - 1; } /* check if the library is the correct architecture */ @@ -237,11 +239,11 @@ static char *next_dll_path( struct dll_path_context *context ) /* fall through */ default: index -= 2; - if (index < nb_dll_paths) - return prepend( context->name, dll_paths[index], strlen( dll_paths[index] )); - break; + if (index >= nb_dll_paths) return NULL; + path = prepend( path + 1, dll_prefix, strlen( dll_prefix )); + path = prepend( path, dll_paths[index], strlen( dll_paths[index] )); + return path; } - return NULL; } diff --git a/programs/Makeprog.rules.in b/programs/Makeprog.rules.in index a3da072..9c2cb4b 100644 --- a/programs/Makeprog.rules.in +++ b/programs/Makeprog.rules.in @@ -26,7 +26,7 @@ $(MODULE) $(MODULE).so $(MODULE).fake: $(OBJS) Makefile.in .PHONY: install_prog install_prog.so install_prog.fake install_prog.so: $(MODULE).so $(DESTDIR)$(dlldir) dummy - $(INSTALL_PROGRAM) $(MODULE).so $(DESTDIR)$(dlldir)/$(MODULE).so + $(INSTALL_PROGRAM) $(MODULE).so $(DESTDIR)$(dlldir)/$(DLLPREFIX)$(MODULE).so install_prog.fake: $(MODULE).fake $(DESTDIR)$(fakedlldir) dummy $(INSTALL_DATA) $(MODULE).fake $(DESTDIR)$(fakedlldir)/$(MODULE) @@ -37,7 +37,7 @@ install_prog: $(MODULE) $(DESTDIR)$(bindir) dummy install install-lib:: install_prog$(DLLEXT) install_prog$(FAKEEXT) uninstall:: - $(RM) $(DESTDIR)$(bindir)/$(MODULE) $(DESTDIR)$(dlldir)/$(MODULE)$(DLLEXT) $(DESTDIR)$(fakedlldir)/$(MODULE) + $(RM) $(DESTDIR)$(bindir)/$(MODULE) $(DESTDIR)$(dlldir)/$(DLLPREFIX)$(MODULE)$(DLLEXT) $(DESTDIR)$(fakedlldir)/$(MODULE) clean:: $(RM) $(MODULE)

1 0

Henri Verbeet : wined3d: Explicitly pass gl_info to state_init_default().
by Alexandre Julliard Sept. 26, 2013

Sept. 26, 2013

Module: wine Branch: master Commit: 4a9da034ab1ddc16cf0ffe7cc2a792cea4b7a44a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a9da034ab1ddc16cf0ffe7cc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 26 09:31:55 2013 +0200 wined3d: Explicitly pass gl_info to state_init_default(). --- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/stateblock.c | 5 ++--- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ab3364d..34ceaa7 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4710,7 +4710,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, if (FAILED(hr = state_init(&device->state, &device->fb, &device->adapter->d3d_info))) ERR("Failed to initialize device state, hr %#x.\n", hr); - state_init_default(&device->state, device); + state_init_default(&device->state, &device->adapter->gl_info); device->update_state = &device->state; device_init_swapchain_state(device, swapchain); @@ -4982,7 +4982,7 @@ HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d, wined3d_decref(device->wined3d); return hr; } - state_init_default(&device->state, device); + state_init_default(&device->state, &adapter->gl_info); device->update_state = &device->state; return WINED3D_OK; diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 5c90c22..c990e7d 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1171,9 +1171,8 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) TRACE("Applied stateblock %p.\n", stateblock); } -void state_init_default(struct wined3d_state *state, struct wined3d_device *device) +void state_init_default(struct wined3d_state *state, const struct wined3d_gl_info *gl_info) { - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; union { struct wined3d_line_pattern lp; @@ -1192,7 +1191,7 @@ void state_init_default(struct wined3d_state *state, struct wined3d_device *devi 0.0f, 0.0f, 0.0f, 1.0f, }}}; - TRACE("state %p, device %p.\n", state, device); + TRACE("state %p, gl_info %p.\n", state, gl_info); /* Set some of the defaults for lights, transforms etc */ state->transforms[WINED3D_TS_PROJECTION] = identity; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 515079a..9b979dc 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2449,7 +2449,7 @@ void stateblock_init_contained_states(struct wined3d_stateblock *stateblock) DEC void state_cleanup(struct wined3d_state *state) DECLSPEC_HIDDEN; HRESULT state_init(struct wined3d_state *state, struct wined3d_fb_state *fb, const struct wined3d_d3d_info *d3d_info) DECLSPEC_HIDDEN; -void state_init_default(struct wined3d_state *state, struct wined3d_device *device) DECLSPEC_HIDDEN; +void state_init_default(struct wined3d_state *state, const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; void state_unbind_resources(struct wined3d_state *state) DECLSPEC_HIDDEN; /* Direct3D terminology with little modifications. We do not have an issued state

1 0

Henri Verbeet : wined3d: Initialize the fb state pointer in state_init().
by Alexandre Julliard Sept. 26, 2013

Sept. 26, 2013

Module: wine Branch: master Commit: abbc595fc127298dce07ba20fc5aeeb9708c0628 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abbc595fc127298dce07ba20f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 26 09:31:54 2013 +0200 wined3d: Initialize the fb state pointer in state_init(). --- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/stateblock.c | 9 +++++---- dlls/wined3d/wined3d_private.h | 3 ++- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index bcafa9f..ab3364d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4708,7 +4708,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, if (device->d3d_initialized) delete_opengl_contexts(device, swapchain); - if (FAILED(hr = state_init(&device->state, &device->adapter->d3d_info))) + if (FAILED(hr = state_init(&device->state, &device->fb, &device->adapter->d3d_info))) ERR("Failed to initialize device state, hr %#x.\n", hr); state_init_default(&device->state, device); device->update_state = &device->state; @@ -4972,7 +4972,7 @@ HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d, device->blitter = adapter->blitter; - if (FAILED(hr = state_init(&device->state, &adapter->d3d_info))) + if (FAILED(hr = state_init(&device->state, &device->fb, &adapter->d3d_info))) { ERR("Failed to initialize device state, hr %#x.\n", hr); for (i = 0; i < sizeof(device->multistate_funcs) / sizeof(device->multistate_funcs[0]); ++i) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 6bdbb1b..5c90c22 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -598,10 +598,13 @@ void state_cleanup(struct wined3d_state *state) HeapFree(GetProcessHeap(), 0, state->ps_consts_f); } -HRESULT state_init(struct wined3d_state *state, const struct wined3d_d3d_info *d3d_info) +HRESULT state_init(struct wined3d_state *state, struct wined3d_fb_state *fb, + const struct wined3d_d3d_info *d3d_info) { unsigned int i; + state->fb = fb; + for (i = 0; i < LIGHTMAP_SIZE; i++) { list_init(&state->light_map[i]); @@ -1199,8 +1202,6 @@ void state_init_default(struct wined3d_state *state, struct wined3d_device *devi state->transforms[WINED3D_TS_WORLD_MATRIX(i)] = identity; } - state->fb = &device->fb; - TRACE("Render states\n"); /* Render states: */ state->render_states[WINED3D_RS_ZENABLE] = WINED3D_ZB_TRUE; @@ -1386,7 +1387,7 @@ static HRESULT stateblock_init(struct wined3d_stateblock *stateblock, stateblock->ref = 1; stateblock->device = device; - if (FAILED(hr = state_init(&stateblock->state, d3d_info))) + if (FAILED(hr = state_init(&stateblock->state, NULL, d3d_info))) return hr; if (FAILED(hr = stateblock_allocate_shader_constants(stateblock))) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5525dd9..515079a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2447,7 +2447,8 @@ struct wined3d_stateblock void stateblock_init_contained_states(struct wined3d_stateblock *stateblock) DECLSPEC_HIDDEN; void state_cleanup(struct wined3d_state *state) DECLSPEC_HIDDEN; -HRESULT state_init(struct wined3d_state *state, const struct wined3d_d3d_info *d3d_info) DECLSPEC_HIDDEN; +HRESULT state_init(struct wined3d_state *state, struct wined3d_fb_state *fb, + const struct wined3d_d3d_info *d3d_info) DECLSPEC_HIDDEN; void state_init_default(struct wined3d_state *state, struct wined3d_device *device) DECLSPEC_HIDDEN; void state_unbind_resources(struct wined3d_state *state) DECLSPEC_HIDDEN;

1 0

Akihiro Sagawa : gdi32: Return GDI_ERROR when requested empty glyph bitmaps .
by Alexandre Julliard Sept. 26, 2013

Sept. 26, 2013

Module: wine Branch: master Commit: e2bce62a6daf5e79e5add26920552f3ef5df8170 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2bce62a6daf5e79e5add2692… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Sep 26 00:47:59 2013 +0900 gdi32: Return GDI_ERROR when requested empty glyph bitmaps. --- dlls/gdi32/freetype.c | 23 ++++++++++++++--------- dlls/gdi32/tests/font.c | 2 +- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 2a2619ee..bd4c895 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6518,12 +6518,14 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, } } - lpgm->gmBlackBoxX = (right - left) >> 6; - lpgm->gmBlackBoxY = (top - bottom) >> 6; + width = (right - left) >> 6; + height = (top - bottom) >> 6; + lpgm->gmBlackBoxX = width; + lpgm->gmBlackBoxY = height; lpgm->gmptGlyphOrigin.x = origin_x >> 6; lpgm->gmptGlyphOrigin.y = origin_y >> 6; abc->abcA = left >> 6; - abc->abcB = (right - left) >> 6; + abc->abcB = width; abc->abcC = adv - abc->abcA - abc->abcB; TRACE("%u,%u,%s,%d,%d\n", lpgm->gmBlackBoxX, lpgm->gmBlackBoxY, @@ -6552,12 +6554,11 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, switch(format) { case GGO_BITMAP: - width = lpgm->gmBlackBoxX; - height = lpgm->gmBlackBoxY; pitch = ((width + 31) >> 5) << 2; needed = pitch * height; if(!buf || !buflen) break; + if (!needed) return GDI_ERROR; /* empty glyph */ switch(ft_face->glyph->format) { case ft_glyph_format_bitmap: @@ -6604,12 +6605,11 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, unsigned int max_level, row, col; BYTE *start, *ptr; - width = lpgm->gmBlackBoxX; - height = lpgm->gmBlackBoxY; pitch = (width + 3) / 4 * 4; needed = pitch * height; if(!buf || !buflen) break; + if (!needed) return GDI_ERROR; /* empty glyph */ max_level = get_max_level( format ); @@ -6677,12 +6677,11 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, BYTE *src, *dst; INT src_pitch, x; - width = lpgm->gmBlackBoxX; - height = lpgm->gmBlackBoxY; pitch = width * 4; needed = pitch * height; if (!buf || !buflen) break; + if (!needed) return GDI_ERROR; /* empty glyph */ memset(buf, 0, buflen); dst = buf; @@ -6716,6 +6715,12 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, (format == WINE_GGO_HRGB_BITMAP || format == WINE_GGO_HBGR_BITMAP)? FT_RENDER_MODE_LCD: FT_RENDER_MODE_LCD_V; + if (!width || !height) + { + if (!buf || !buflen) return 0; + return GDI_ERROR; + } + if ( lcdfilter == FT_LCD_FILTER_DEFAULT || lcdfilter == FT_LCD_FILTER_LIGHT ) { if ( render_mode == FT_RENDER_MODE_LCD) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index f68021e..eed9cec 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4169,7 +4169,7 @@ static void test_GetGlyphOutline(void) } } else - todo_wine ok(ret == GDI_ERROR, "%2d:GetGlyphOutlineW should return GDI_ERROR, got %d\n", fmt[i], ret); + ok(ret == GDI_ERROR, "%2d:GetGlyphOutlineW should return GDI_ERROR, got %d\n", fmt[i], ret); } }

1 0

Dmitry Timoshkov : ntdll: Make set_line_control() for a serial device print slightly more informative messages.
by Alexandre Julliard Sept. 26, 2013

Sept. 26, 2013

Module: wine Branch: master Commit: a63be0823a8e4c7d0d873c73ed303a38fbb56a9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a63be0823a8e4c7d0d873c73e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Sep 26 11:52:48 2013 +0900 ntdll: Make set_line_control() for a serial device print slightly more informative messages. --- dlls/ntdll/serial.c | 26 ++++++++++++-------------- 1 files changed, 12 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/serial.c b/dlls/ntdll/serial.c index db618f8..6738009 100644 --- a/dlls/ntdll/serial.c +++ b/dlls/ntdll/serial.c @@ -575,35 +575,33 @@ static NTSTATUS set_line_control(int fd, const SERIAL_LINE_CONTROL* slc) { struct termios port; unsigned bytesize, stopbits; - + if (tcgetattr(fd, &port) == -1) { ERR("tcgetattr error '%s'\n", strerror(errno)); return FILE_GetNtStatus(); } - + #ifdef IMAXBEL port.c_iflag &= ~(ISTRIP|BRKINT|IGNCR|ICRNL|INLCR|PARMRK|IMAXBEL); #else port.c_iflag &= ~(ISTRIP|BRKINT|IGNCR|ICRNL|INLCR|PARMRK); #endif port.c_iflag |= IGNBRK | INPCK; - port.c_oflag &= ~(OPOST); - port.c_cflag &= ~(HUPCL); port.c_cflag |= CLOCAL | CREAD; - + /* * on FreeBSD, turning off ICANON does not disable IEXTEN, * so we must turn it off explicitly. No harm done on Linux. */ port.c_lflag &= ~(ICANON|ECHO|ISIG|IEXTEN); port.c_lflag |= NOFLSH; - + bytesize = slc->WordLength; stopbits = slc->StopBits; - + #ifdef CMSPAR port.c_cflag &= ~(PARENB | PARODD | CMSPAR); #else @@ -633,7 +631,7 @@ static NTSTATUS set_line_control(int fd, const SERIAL_LINE_CONTROL* slc) } else { - ERR("Cannot set MARK Parity\n"); + FIXME("Cannot set MARK Parity\n"); return STATUS_NOT_SUPPORTED; } break; @@ -645,16 +643,16 @@ static NTSTATUS set_line_control(int fd, const SERIAL_LINE_CONTROL* slc) } else { - ERR("Cannot set SPACE Parity\n"); + FIXME("Cannot set SPACE Parity\n"); return STATUS_NOT_SUPPORTED; } break; #endif default: - ERR("Parity\n"); + FIXME("Parity %d is not supported\n", slc->Parity); return STATUS_NOT_SUPPORTED; } - + port.c_cflag &= ~CSIZE; switch (bytesize) { @@ -663,17 +661,17 @@ static NTSTATUS set_line_control(int fd, const SERIAL_LINE_CONTROL* slc) case 7: port.c_cflag |= CS7; break; case 8: port.c_cflag |= CS8; break; default: - ERR("ByteSize\n"); + FIXME("ByteSize %d is not supported\n", bytesize); return STATUS_NOT_SUPPORTED; } - + switch (stopbits) { case ONESTOPBIT: port.c_cflag &= ~CSTOPB; break; case ONE5STOPBITS: /* will be selected if bytesize is 5 */ case TWOSTOPBITS: port.c_cflag |= CSTOPB; break; default: - ERR("StopBits\n"); + FIXME("StopBits %d is not supported\n", stopbits); return STATUS_NOT_SUPPORTED; } /* otherwise it hangs with pending input*/

1 0

Dmitry Timoshkov : ntdll: Make asynchronous WaitCommEvent report correct number of bytes returned.
by Alexandre Julliard Sept. 26, 2013

Sept. 26, 2013

Module: wine Branch: master Commit: a20b07c558d8702b3923e2ed1a3f2afa364efb0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a20b07c558d8702b3923e2ed1… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Sep 26 11:51:40 2013 +0900 ntdll: Make asynchronous WaitCommEvent report correct number of bytes returned. --- dlls/kernel32/tests/comm.c | 2 -- dlls/ntdll/serial.c | 11 ++++++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/comm.c b/dlls/kernel32/tests/comm.c index 4e7fee5..7ec5fc5 100644 --- a/dlls/kernel32/tests/comm.c +++ b/dlls/kernel32/tests/comm.c @@ -863,7 +863,6 @@ todo_wine { res = GetOverlappedResult(hcom, &ovl_wait, &bytes, FALSE); ok(res, "GetOverlappedResult reported error %d\n", GetLastError()); -todo_wine ok(bytes == sizeof(evtmask), "expected %u, written %u\n", (UINT)sizeof(evtmask), bytes); res = TRUE; } @@ -2135,7 +2134,6 @@ todo_wine last_event_time = after; ret = GetOverlappedResult(hcom, &ovl_wait, &bytes, FALSE); ok(ret, "GetOverlappedResult reported error %d\n", GetLastError()); -todo_wine ok(bytes == sizeof(evtmask), "expected sizeof(evtmask), got %u\n", bytes); ok(evtmask & EV_RXCHAR, "EV_RXCHAR should be set\n"); diff --git a/dlls/ntdll/serial.c b/dlls/ntdll/serial.c index 5e6eaf4..db618f8 100644 --- a/dlls/ntdll/serial.c +++ b/dlls/ntdll/serial.c @@ -947,7 +947,16 @@ static DWORD CALLBACK wait_for_event(LPVOID arg) } if (needs_close) close( fd ); } - if (commio->iosb) commio->iosb->u.Status = *commio->events ? STATUS_SUCCESS : STATUS_CANCELLED; + if (commio->iosb) + { + if (*commio->events) + { + commio->iosb->u.Status = STATUS_SUCCESS; + commio->iosb->Information = sizeof(DWORD); + } + else + commio->iosb->u.Status = STATUS_CANCELLED; + } if (commio->hEvent) NtSetEvent(commio->hEvent, NULL); RtlFreeHeap(GetProcessHeap(), 0, commio); return 0;

1 0

Henri Verbeet : wined3d: Initialize the default state in device_init().
by Alexandre Julliard Sept. 26, 2013

Sept. 26, 2013

Module: wine Branch: master Commit: 6793fa71575ec840d902e453e3f68478066abf7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6793fa71575ec840d902e453e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 26 09:31:53 2013 +0200 wined3d: Initialize the default state in device_init(). --- dlls/wined3d/device.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 2014338..bcafa9f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -896,8 +896,6 @@ HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, goto err_out; } device->swapchains[0] = swapchain; - - state_init_default(&device->state, device); device_init_swapchain_state(device, swapchain); context = context_acquire(device, swapchain->front_buffer); @@ -4984,6 +4982,7 @@ HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d, wined3d_decref(device->wined3d); return hr; } + state_init_default(&device->state, device); device->update_state = &device->state; return WINED3D_OK;

1 0