November 2010 - Wine-commits

Juan Lang : wininet: Verify revocation status of certificate chain.
by Alexandre Julliard 16 Nov '10

16 Nov '10

Module: wine Branch: master Commit: c2b42758da9542fb880d769f378fe54fad02b5ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2b42758da9542fb880d769f3… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Nov 15 17:07:22 2010 -0800 wininet: Verify revocation status of certificate chain. --- dlls/wininet/netconnection.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 83bab07..6a06b9a 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -228,13 +228,15 @@ static DWORD netconn_verify_cert(PCCERT_CONTEXT cert, HCERTSTORE store, PCCERT_CHAIN_CONTEXT chain; char oid_server_auth[] = szOID_PKIX_KP_SERVER_AUTH; char *server_auth[] = { oid_server_auth }; - DWORD err = ERROR_SUCCESS; + DWORD err = ERROR_SUCCESS, chainFlags = 0; TRACE("verifying %s\n", debugstr_w(server)); chainPara.RequestedUsage.Usage.cUsageIdentifier = 1; chainPara.RequestedUsage.Usage.rgpszUsageIdentifier = server_auth; - if ((ret = CertGetCertificateChain(NULL, cert, NULL, store, &chainPara, 0, - NULL, &chain))) + if (!(security_flags & SECURITY_FLAG_IGNORE_REVOCATION)) + chainFlags |= CERT_CHAIN_REVOCATION_CHECK_CHAIN_EXCLUDE_ROOT; + if ((ret = CertGetCertificateChain(NULL, cert, NULL, store, &chainPara, + chainFlags, NULL, &chain))) { if (chain->TrustStatus.dwErrorStatus) {

1 0

Ken Thomases : loader: On Mac, reserve the process' s original thread for the frameworks.
by Alexandre Julliard 16 Nov '10

16 Nov '10

Module: wine Branch: master Commit: 47dea9b6707a73a66bcc1b96bcf72ffe1168c0fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=47dea9b6707a73a66bcc1b96b… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Nov 16 01:41:14 2010 -0600 loader: On Mac, reserve the process's original thread for the frameworks. The frameworks expect the original thread to run its run loop, so input sources (like distributed notifications) get processed. For example, Core Audio on Snow Leopard doesn't track changes in the default ouput device, such as when headphones are plugged in, without this. --- dlls/kernel32/process.c | 64 ++++++++++++++++++++++++- libs/wine/Makefile.in | 2 +- libs/wine/loader.c | 121 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 185 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 258bb36..2b427b9 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -56,6 +56,9 @@ WINE_DECLARE_DEBUG_CHANNEL(file); WINE_DECLARE_DEBUG_CHANNEL(relay); #ifdef __APPLE__ +#include <CoreFoundation/CoreFoundation.h> +#include <pthread.h> +#include <unistd.h> extern char **__wine_get_main_environment(void); #else extern char **__wine_main_environ; @@ -1632,6 +1635,54 @@ static const char *get_alternate_loader( char **ret_env ) return loader; } +#ifdef __APPLE__ +/*********************************************************************** + * terminate_main_thread + * + * On some versions of Mac OS X, the execve system call fails with + * ENOTSUP if the process has multiple threads. Wine is always multi- + * threaded on Mac OS X because it specifically reserves the main thread + * for use by the system frameworks (see apple_main_thread() in + * libs/wine/loader.c). So, when we need to exec without first forking, + * we need to terminate the main thread first. We do this by installing + * a custom run loop source onto the main run loop and signaling it. + * The source's "perform" callback is pthread_exit and it will be + * executed on the main thread, terminating it. + * + * Returns TRUE if there's still hope the main thread has terminated or + * will soon. Return FALSE if we've given up. + */ +static BOOL terminate_main_thread(void) +{ + static int delayms; + + if (!delayms) + { + CFRunLoopSourceContext source_context = { 0 }; + CFRunLoopSourceRef source; + + source_context.perform = pthread_exit; + if (!(source = CFRunLoopSourceCreate( NULL, 0, &source_context ))) + return FALSE; + + CFRunLoopAddSource( CFRunLoopGetMain(), source, kCFRunLoopCommonModes ); + CFRunLoopSourceSignal( source ); + CFRunLoopWakeUp( CFRunLoopGetMain() ); + CFRelease( source ); + + delayms = 20; + } + + if (delayms > 1000) + return FALSE; + + usleep(delayms * 1000); + delayms *= 2; + + return TRUE; +} +#endif + /*********************************************************************** * create_process * @@ -1796,7 +1847,18 @@ static BOOL create_process( HANDLE hFile, LPCWSTR filename, LPWSTR cmd_line, LPW if (wineloader) putenv( wineloader ); if (unixdir) chdir(unixdir); - if (argv) wine_exec_wine_binary( loader, argv, getenv("WINELOADER") ); + if (argv) + { + do + { + wine_exec_wine_binary( loader, argv, getenv("WINELOADER") ); + } +#ifdef __APPLE__ + while (errno == ENOTSUP && exec_only && terminate_main_thread()); +#else + while (0); +#endif + } _exit(1); } diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index 359382f..fe33595 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -1,7 +1,7 @@ DLLFLAGS = @DLLFLAGS@ MODULE = libwine.$(LIBEXT) VERSCRIPT = $(srcdir)/wine.map -EXTRALIBS = $(LIBPORT) @LIBDL@ @CRTLIBS@ +EXTRALIBS = $(LIBPORT) @LIBDL@ @CRTLIBS@ @COREFOUNDATIONLIB@ DEFS = -D__WINESRC__ -DWINE_UNICODE_API="" VERSION = 1.0 diff --git a/libs/wine/loader.c b/libs/wine/loader.c index 37c603e..6c2324d 100644 --- a/libs/wine/loader.c +++ b/libs/wine/loader.c @@ -48,6 +48,8 @@ #ifdef __APPLE__ #include <crt_externs.h> #define environ (*_NSGetEnviron()) +#include <CoreFoundation/CoreFoundation.h> +#include <pthread.h> #else extern char **environ; #endif @@ -668,6 +670,121 @@ static void set_max_limit( int limit ) } +#ifdef __APPLE__ +struct apple_stack_info +{ + void *stack; + size_t desired_size; +}; + +/*********************************************************************** + * apple_alloc_thread_stack + * + * Callback for wine_mmap_enum_reserved_areas to allocate space for + * the secondary thread's stack. + */ +static int apple_alloc_thread_stack( void *base, size_t size, void *arg ) +{ + struct apple_stack_info *info = arg; + + /* For mysterious reasons, putting the thread stack at the very top + * of the address space causes subsequent execs to fail, even on the + * child side of a fork. Avoid the top 16MB. */ + char * const limit = (char*)0xff000000; + if (base >= limit) return 0; + if (size > limit - (char*)base) + size = limit - (char*)base; + if (size < info->desired_size) return 0; + info->stack = wine_anon_mmap( (char *)base + size - info->desired_size, + info->desired_size, PROT_READ|PROT_WRITE, MAP_FIXED ); + return (info->stack != (void *)-1); +} + +/*********************************************************************** + * apple_create_wine_thread + * + * Spin off a secondary thread to complete Wine initialization, leaving + * the original thread for the Mac frameworks. + * + * Invoked as a CFRunLoopSource perform callback. + */ +static void apple_create_wine_thread( void *init_func ) +{ + int success = 0; + pthread_t thread; + pthread_attr_t attr; + + if (!pthread_attr_init( &attr )) + { + struct apple_stack_info info; + + /* Try to put the new thread's stack in the reserved area. If this + * fails, just let it go wherever. It'll be a waste of space, but we + * can go on. */ + if (!pthread_attr_getstacksize( &attr, &info.desired_size ) && + wine_mmap_enum_reserved_areas( apple_alloc_thread_stack, &info, 1 )) + { + wine_mmap_remove_reserved_area( info.stack, info.desired_size, 0 ); + pthread_attr_setstackaddr( &attr, (char*)info.stack + info.desired_size ); + } + + if (!pthread_attr_setdetachstate( &attr, PTHREAD_CREATE_JOINABLE ) && + !pthread_create( &thread, &attr, init_func, NULL )) + success = 1; + + pthread_attr_destroy( &attr ); + } + + /* Failure is indicated by returning from wine_init(). Stopping + * the run loop allows apple_main_thread() and thus wine_init() to + * return. */ + if (!success) + CFRunLoopStop( CFRunLoopGetCurrent() ); +} + + +/*********************************************************************** + * apple_main_thread + * + * Park the process's original thread in a Core Foundation run loop for + * use by the Mac frameworks, especially receiving and handling + * distributed notifications. Spin off a new thread for the rest of the + * Wine initialization. + */ +static void apple_main_thread( void (*init_func)(void) ) +{ + CFRunLoopSourceContext source_context = { 0 }; + CFRunLoopSourceRef source; + + /* Give ourselves the best chance of having the distributed notification + * center scheduled on this thread's run loop. In theory, it's scheduled + * in the first thread to ask for it. */ + CFNotificationCenterGetDistributedCenter(); + + /* We use this run loop source for two purposes. First, a run loop exits + * if it has no more sources scheduled. So, we need at least one source + * to keep the run loop running. Second, although it's not critical, it's + * preferable for the Wine initialization to not proceed until we know + * the run loop is running. So, we signal our source immediately after + * adding it and have its callback spin off the Wine thread. */ + source_context.info = init_func; + source_context.perform = apple_create_wine_thread; + source = CFRunLoopSourceCreate( NULL, 0, &source_context ); + + if (source) + { + CFRunLoopAddSource( CFRunLoopGetCurrent(), source, kCFRunLoopCommonModes ); + CFRunLoopSourceSignal( source ); + CFRelease( source ); + + CFRunLoopRun(); /* Should never return, except on error. */ + } + + /* If we get here (i.e. return), that indicates failure to our caller. */ +} +#endif + + /*********************************************************************** * wine_init * @@ -708,7 +825,11 @@ void wine_init( int argc, char *argv[], char *error, int error_size ) if (!ntdll) return; if (!(init_func = wine_dlsym( ntdll, "__wine_process_init", error, error_size ))) return; +#ifdef __APPLE__ + apple_main_thread( init_func ); +#else init_func(); +#endif }

1 0

Hans Leidekker : msi: Check component attributes before extracting the cabinet.
by Alexandre Julliard 16 Nov '10

16 Nov '10

Module: wine Branch: master Commit: b1b32529635b4c5ad89e675e291b00f92dc66844 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1b32529635b4c5ad89e675e2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 16 09:06:50 2010 +0100 msi: Check component attributes before extracting the cabinet. --- dlls/msi/files.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 4dcf5bd..db1a962 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -66,15 +66,23 @@ static void schedule_install_files(MSIPACKAGE *package) LIST_FOR_EACH_ENTRY(file, &package->files, MSIFILE, entry) { - if (file->Component->ActionRequest != INSTALLSTATE_LOCAL || !file->Component->Enabled) + MSICOMPONENT *comp = file->Component; + + if (comp->ActionRequest != INSTALLSTATE_LOCAL || !comp->Enabled) { TRACE("File %s is not scheduled for install\n", debugstr_w(file->File)); + file->state = msifs_skipped; + continue; + } + comp->Action = INSTALLSTATE_LOCAL; + ui_progress( package, 2, file->FileSize, 0, 0 ); - ui_progress(package,2,file->FileSize,0,0); + if (file->state == msifs_overwrite && + (comp->Attributes & msidbComponentAttributesNeverOverwrite)) + { + TRACE("not overwriting %s\n", debugstr_w(file->TargetPath)); file->state = msifs_skipped; } - else - file->Component->Action = INSTALLSTATE_LOCAL; } } @@ -228,14 +236,6 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package) if (file->state != msifs_missing && !mi->is_continuous && file->state != msifs_overwrite) continue; - if (file->state == msifs_overwrite && - (file->Component->Attributes & msidbComponentAttributesNeverOverwrite)) - { - TRACE("not overwriting %s\n", debugstr_w(file->TargetPath)); - file->state = msifs_skipped; - continue; - } - if (file->Sequence > mi->last_sequence || mi->is_continuous || (file->IsCompressed && !mi->is_extracted)) {

1 0

Hans Leidekker : msi: Honor msidbComponentAttributesPermanent.
by Alexandre Julliard 16 Nov '10

16 Nov '10

Module: wine Branch: master Commit: 7cd084d0416f807d1ea84943e0c37c0991ca918f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cd084d0416f807d1ea84943e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 16 09:07:07 2010 +0100 msi: Honor msidbComponentAttributesPermanent. --- dlls/msi/files.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index db1a962..9aeaaf3 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -925,12 +925,6 @@ static UINT ITERATE_RemoveFiles(MSIRECORD *row, LPVOID param) install_mode = MSI_RecordGetInteger(row, 5); comp = get_loaded_component(package, component); - if (!comp) - { - ERR("Invalid component: %s\n", debugstr_w(component)); - return ERROR_FUNCTION_FAILED; - } - if (!comp->Enabled) { TRACE("component is disabled\n"); @@ -944,6 +938,12 @@ static UINT ITERATE_RemoveFiles(MSIRECORD *row, LPVOID param) return ERROR_SUCCESS; } + if (comp->Attributes & msidbComponentAttributesPermanent) + { + TRACE("permanent component, not removing file\n"); + return ERROR_SUCCESS; + } + dir = msi_dup_property(package->db, dirprop); if (!dir) return ERROR_OUTOFMEMORY; @@ -1027,6 +1027,12 @@ UINT ACTION_RemoveFiles( MSIPACKAGE *package ) continue; } + if (file->Component->Attributes & msidbComponentAttributesPermanent) + { + TRACE("permanent component, not removing file\n"); + continue; + } + if (file->Version) { ver = msi_get_disk_file_version( file->TargetPath );

1 0

Hans Leidekker : msi: Components don't require a key path.
by Alexandre Julliard 16 Nov '10

16 Nov '10

Module: wine Branch: master Commit: 6d13e2fd4b796b14082cc3605df8ed9696c4aa6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d13e2fd4b796b14082cc3605… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 16 09:07:23 2010 +0100 msi: Components don't require a key path. --- dlls/msi/action.c | 3 +-- dlls/msi/classes.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 5328193..511d82b 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -3245,8 +3245,7 @@ static UINT ACTION_ProcessComponents(MSIPACKAGE *package) '>','=',' ','%','i',' ','O','R','D','E','R',' ','B','Y',' ', '`','D','i','s','k','I','d','`',0}; - file = get_loaded_file(package, comp->KeyPath); - if (!file) + if (!comp->KeyPath || !(file = get_loaded_file(package, comp->KeyPath))) continue; row = MSI_QueryGetRecord(package->db, query, file->Sequence); diff --git a/dlls/msi/classes.c b/dlls/msi/classes.c index 9305e04..d11f48b 100644 --- a/dlls/msi/classes.c +++ b/dlls/msi/classes.c @@ -850,8 +850,7 @@ UINT ACTION_RegisterClassInfo(MSIPACKAGE *package) } feature->Action = feature->ActionRequest; - file = get_loaded_file( package, comp->KeyPath ); - if (!file) + if (!comp->KeyPath || !(file = get_loaded_file( package, comp->KeyPath ))) { TRACE("COM server not provided, skipping class %s\n", debugstr_w(cls->clsid)); continue;

1 0

Hans Leidekker : msi: Forward MsiInstallMissingComponentA to MsiInstallMissingComponentW.
by Alexandre Julliard 16 Nov '10

16 Nov '10

Module: wine Branch: master Commit: c3030532d4d193554f3e6f430025605a9e717ad1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3030532d4d193554f3e6f430… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 16 09:07:36 2010 +0100 msi: Forward MsiInstallMissingComponentA to MsiInstallMissingComponentW. --- dlls/msi/msi.c | 25 +++++++++++++++++++++++++ dlls/msi/msi.spec | 2 +- 2 files changed, 26 insertions(+), 1 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 9e2225c..dcd8e8e 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -3770,6 +3770,31 @@ UINT WINAPI MsiSetExternalUIRecord( INSTALLUI_HANDLER_RECORD handler, } /*********************************************************************** + * MsiInstallMissingComponentA [MSI.@] + */ +UINT WINAPI MsiInstallMissingComponentA( LPCSTR product, LPCSTR component, INSTALLSTATE state ) +{ + UINT r; + WCHAR *productW = NULL, *componentW = NULL; + + TRACE("%s, %s, %d\n", debugstr_a(product), debugstr_a(component), state); + + if (product && !(productW = strdupAtoW( product ))) + return ERROR_OUTOFMEMORY; + + if (component && !(componentW = strdupAtoW( component ))) + { + msi_free( productW ); + return ERROR_OUTOFMEMORY; + } + + r = MsiInstallMissingComponentW( productW, componentW, state ); + msi_free( productW ); + msi_free( componentW ); + return r; +} + +/*********************************************************************** * MsiInstallMissingComponentW [MSI.@] */ UINT WINAPI MsiInstallMissingComponentW(LPCWSTR szProduct, LPCWSTR szComponent, INSTALLSTATE eInstallState) diff --git a/dlls/msi/msi.spec b/dlls/msi/msi.spec index fd047f8..c1e3553 100644 --- a/dlls/msi/msi.spec +++ b/dlls/msi/msi.spec @@ -76,7 +76,7 @@ 80 stdcall MsiGetTargetPathW(long wstr ptr ptr) 81 stdcall MsiGetUserInfoA(str ptr ptr ptr ptr ptr ptr) 82 stdcall MsiGetUserInfoW(wstr ptr ptr ptr ptr ptr ptr) -83 stub MsiInstallMissingComponentA +83 stdcall MsiInstallMissingComponentA(str str long) 84 stdcall MsiInstallMissingComponentW(wstr wstr long) 85 stub MsiInstallMissingFileA 86 stub MsiInstallMissingFileW

1 0

Adam Martinson : msxml3: Fix a datatypes.xsd oops.
by Alexandre Julliard 16 Nov '10

16 Nov '10

Module: wine Branch: master Commit: bc56bbfbb43d23780553b8a72262d62b81b2e97b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc56bbfbb43d23780553b8a72… Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Mon Nov 15 18:15:04 2010 -0600 msxml3: Fix a datatypes.xsd oops. --- dlls/msxml3/datatypes.xsd | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/datatypes.xsd b/dlls/msxml3/datatypes.xsd index 493c0d0..9e0479d 100644 --- a/dlls/msxml3/datatypes.xsd +++ b/dlls/msxml3/datatypes.xsd @@ -37,7 +37,7 @@ <xsd:restriction base="xsd:base64Binary"/> </xsd:simpleType> -  + <xsd:element name="bin.base64" type="dt:bin.base64"/> <xsd:simpleType name="bin.hex"> <xsd:annotation>

1 0

Adam Martinson : msxml3: Move schema cache into the domdoc_properties struct.
by Alexandre Julliard 16 Nov '10

16 Nov '10

Module: wine Branch: master Commit: b7cdaba817b85fcc21486b7ec8de6aa44dfa7ef0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7cdaba817b85fcc21486b7ec… Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Mon Nov 15 18:15:24 2010 -0600 msxml3: Move schema cache into the domdoc_properties struct. --- dlls/msxml3/domdoc.c | 27 +++++--- dlls/msxml3/tests/domdoc.c | 172 ++++++++++++++++++++++++++++++-------------- 2 files changed, 134 insertions(+), 65 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b7cdaba817b85fcc21486…

1 0

Henri Verbeet : wined3d: Add a trace to IWineD3DSurfaceImpl_SetMem().
by Alexandre Julliard 15 Nov '10

15 Nov '10

Module: wine Branch: master Commit: 44b9712cd67b4ae8506d1817b7777460bf1a293e URL: http://source.winehq.org/git/wine.git/?a=commit;h=44b9712cd67b4ae8506d1817b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 15 13:43:34 2010 +0100 wined3d: Add a trace to IWineD3DSurfaceImpl_SetMem(). --- dlls/wined3d/surface.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index bef7688..485f255 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2583,6 +2583,8 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_SetFormat(IWineD3DSurface *iface, enum static HRESULT WINAPI IWineD3DSurfaceImpl_SetMem(IWineD3DSurface *iface, void *Mem) { IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *) iface; + TRACE("iface %p, mem %p.\n", iface, Mem); + if (This->flags & (SFLAG_LOCKED | SFLAG_DCINUSE)) { WARN("Surface is locked or the HDC is in use\n");

1 0

Henri Verbeet : wined3d: Properly recreate the sysmem resource location in IWineD3DSurfaceImpl_SetMem ().
by Alexandre Julliard 15 Nov '10

15 Nov '10

Module: wine Branch: master Commit: 745126b05d4bd2bb6d989574109fd542ac388629 URL: http://source.winehq.org/git/wine.git/?a=commit;h=745126b05d4bd2bb6d9895741… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 15 13:43:35 2010 +0100 wined3d: Properly recreate the sysmem resource location in IWineD3DSurfaceImpl_SetMem(). Otherwise we could end up with surfaces that have SFLAG_INSYSMEM set, but no actual system memory allocated. This was exposed by 3bbe658ef1b2a992ad44cd9503ad65889a1c6896. --- dlls/wined3d/surface.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 485f255..69a9efd 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2631,10 +2631,13 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_SetMem(IWineD3DSurface *iface, void *M /* HeapMemory should be NULL already */ if (This->resource.heapMemory) ERR("User pointer surface has heap memory allocated.\n"); - This->flags &= ~SFLAG_USERPTR; + This->flags &= ~(SFLAG_USERPTR | SFLAG_INSYSMEM); if (This->flags & SFLAG_CLIENT) surface_release_client_storage(This); + + surface_prepare_system_memory(This); + surface_modify_location(This, SFLAG_INSYSMEM, TRUE); } return WINED3D_OK; }

1 0