April 2015 - Wine-Commits - list.winehq.org

Hans Leidekker : msi: Perform a suffix match on the volume name.
by Alexandre Julliard April 17, 2015

April 17, 2015

Module: wine Branch: master Commit: 89693776473f174f45d950e9669044ed46bc331b URL: http://source.winehq.org/git/wine.git/?a=commit;h=89693776473f174f45d950e96… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 16 17:01:55 2015 +0200 msi: Perform a suffix match on the volume name. --- dlls/msi/media.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/msi/media.c b/dlls/msi/media.c index 3dbd1b7..7c8c94f 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -54,8 +54,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(msi); static BOOL source_matches_volume(MSIMEDIAINFO *mi, LPCWSTR source_root) { - WCHAR volume_name[MAX_PATH + 1]; - WCHAR root[MAX_PATH + 1]; + WCHAR volume_name[MAX_PATH + 1], root[MAX_PATH + 1]; + const WCHAR *p; + int len, len2; strcpyW(root, source_root); PathStripToRootW(root); @@ -66,7 +67,13 @@ static BOOL source_matches_volume(MSIMEDIAINFO *mi, LPCWSTR source_root) WARN("failed to get volume information for %s (%u)\n", debugstr_w(root), GetLastError()); return FALSE; } - return !strcmpiW( mi->volume_label, volume_name ); + + len = strlenW( volume_name ); + len2 = strlenW( mi->volume_label ); + if (len2 > len) return FALSE; + p = volume_name + len - len2; + + return !strcmpiW( mi->volume_label, p ); } static UINT msi_change_media(MSIPACKAGE *package, MSIMEDIAINFO *mi)

1 0

Hans Leidekker : msi: Improve the check for files obsoleted by patches.
by Alexandre Julliard April 17, 2015

April 17, 2015

Module: wine Branch: master Commit: 20c3c09fac51538359bdc3934686c171c27204e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20c3c09fac51538359bdc3934… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 16 17:01:21 2015 +0200 msi: Improve the check for files obsoleted by patches. --- dlls/msi/files.c | 37 ++++++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 26e4cb1..8977a9c 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -63,6 +63,28 @@ static void msi_file_update_ui( MSIPACKAGE *package, MSIFILE *f, const WCHAR *ac msi_ui_progress( package, 2, f->FileSize, 0, 0 ); } +static BOOL is_registered_patch_media( MSIPACKAGE *package, UINT disk_id ) +{ + MSIPATCHINFO *patch; + + LIST_FOR_EACH_ENTRY( patch, &package->patches, MSIPATCHINFO, entry ) + { + if (patch->disk_id == disk_id && patch->registered) return TRUE; + } + return FALSE; +} + +static BOOL is_obsoleted_by_patch( MSIPACKAGE *package, MSIFILE *file ) +{ + if (!list_empty( &package->patches ) && file->disk_id < MSI_INITIAL_MEDIA_TRANSFORM_DISKID) + { + if (!msi_get_property_int( package->db, szInstalled, 0 )) return FALSE; + return TRUE; + } + if (is_registered_patch_media( package, file->disk_id )) return TRUE; + return FALSE; +} + static msi_file_state calculate_install_state( MSIPACKAGE *package, MSIFILE *file ) { MSICOMPONENT *comp = file->Component; @@ -77,9 +99,9 @@ static msi_file_state calculate_install_state( MSIPACKAGE *package, MSIFILE *fil TRACE("skipping %s (not scheduled for install)\n", debugstr_w(file->File)); return msifs_skipped; } - if (!list_empty( &package->patches ) && file->disk_id < MSI_INITIAL_MEDIA_TRANSFORM_DISKID) + if (is_obsoleted_by_patch( package, file )) { - TRACE("skipping %s (not part of patch)\n", debugstr_w(file->File)); + TRACE("skipping %s (obsoleted by patch)\n", debugstr_w(file->File)); return msifs_skipped; } if ((msi_is_global_assembly( comp ) && !comp->assembly->installed) || @@ -450,17 +472,6 @@ static MSIFILEPATCH *find_filepatch( MSIPACKAGE *package, UINT disk_id, const WC return NULL; } -static BOOL is_registered_patch_media( MSIPACKAGE *package, UINT disk_id ) -{ - MSIPATCHINFO *patch; - - LIST_FOR_EACH_ENTRY( patch, &package->patches, MSIPATCHINFO, entry ) - { - if (patch->disk_id == disk_id && patch->registered) return TRUE; - } - return FALSE; -} - static BOOL patchfiles_cb(MSIPACKAGE *package, LPCWSTR file, DWORD action, LPWSTR *path, DWORD *attrs, PVOID user) {

1 0

Piotr Caban : msvcrt: Don't ignore pmode attribute in _wsopen_s.
by Alexandre Julliard April 17, 2015

April 17, 2015

Module: wine Branch: master Commit: 760b78813d0e75d5d32f60318fe2bb4c7a5064b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=760b78813d0e75d5d32f60318… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 16 17:37:10 2015 +0200 msvcrt: Don't ignore pmode attribute in _wsopen_s. --- dlls/msvcrt/file.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index f803f5d..c1ba5fd 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -2114,8 +2114,6 @@ int CDECL MSVCRT__wsopen_s( int *fd, const MSVCRT_wchar_t* path, int oflags, int { if(pmode & ~(MSVCRT__S_IREAD | MSVCRT__S_IWRITE)) FIXME(": pmode 0x%04x ignored\n", pmode); - else - WARN(": pmode 0x%04x ignored\n", pmode); if (oflags & MSVCRT__O_EXCL) creation = CREATE_NEW; @@ -2150,7 +2148,11 @@ int CDECL MSVCRT__wsopen_s( int *fd, const MSVCRT_wchar_t* path, int oflags, int ERR( "Unhandled shflags 0x%x\n", shflags ); return MSVCRT_EINVAL; } - attrib = FILE_ATTRIBUTE_NORMAL; + + if (!(pmode & ~MSVCRT_umask & MSVCRT__S_IWRITE)) + attrib = FILE_ATTRIBUTE_READONLY; + else + attrib = FILE_ATTRIBUTE_NORMAL; if (oflags & MSVCRT__O_TEMPORARY) {

1 0

Piotr Caban : msvcr120: Added strtoll and strtoull exports.
by Alexandre Julliard April 17, 2015

April 17, 2015

Module: wine Branch: master Commit: 0694f8c89e3ffc2a6c62d44a447738bf5d48dd1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0694f8c89e3ffc2a6c62d44a4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 16 17:37:02 2015 +0200 msvcr120: Added strtoll and strtoull exports. --- dlls/msvcr120/msvcr120.spec | 8 ++++---- dlls/msvcr120_app/msvcr120_app.spec | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index b79e32c..c14ac45 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1734,11 +1734,11 @@ @ stub _strtoimax_l @ stub _strtol_l @ stub _strtold_l -@ stub _strtoll_l +@ cdecl -ret64 _strtoll_l(str ptr long ptr) MSVCRT_strtoi64_l @ cdecl -ret64 _strtoui64(str ptr long) MSVCRT_strtoui64 @ cdecl -ret64 _strtoui64_l(str ptr long ptr) MSVCRT_strtoui64_l @ cdecl _strtoul_l(str ptr long ptr) MSVCRT_strtoul_l -@ stub _strtoull_l +@ cdecl -ret64 _strtoull_l(str ptr long ptr) MSVCRT_strtoui64_l @ stub _strtoumax_l @ cdecl _strupr(str) MSVCRT__strupr @ cdecl _strupr_l(str ptr) MSVCRT__strupr_l @@ -2389,9 +2389,9 @@ @ cdecl strtok_s(ptr str ptr) MSVCRT_strtok_s @ cdecl strtol(str ptr long) MSVCRT_strtol @ stub strtold -@ stub strtoll +@ cdecl -ret64 strtoll(str ptr long) MSVCRT_strtoi64 @ cdecl strtoul(str ptr long) MSVCRT_strtoul -@ stub strtoull +@ cdecl -ret64 strtoull(str ptr long) MSVCRT_strtoui64 @ stub strtoumax @ cdecl strxfrm(ptr str long) MSVCRT_strxfrm @ varargs swprintf_s(ptr long wstr) MSVCRT_swprintf_s diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index f67e414..2ac7ab9 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1448,11 +1448,11 @@ @ stub _strtoimax_l @ stub _strtol_l @ stub _strtold_l -@ stub _strtoll_l +@ cdecl -ret64 _strtoll_l(str ptr long ptr) msvcr120._strtoll_l @ cdecl -ret64 _strtoui64(str ptr long) msvcr120._strtoui64 @ cdecl -ret64 _strtoui64_l(str ptr long ptr) msvcr120._strtoui64_l @ cdecl _strtoul_l(str ptr long ptr) msvcr120._strtoul_l -@ stub _strtoull_l +@ cdecl -ret64 _strtoull_l(str ptr long ptr) msvcr120._strtoull_l @ stub _strtoumax_l @ cdecl _strupr(str) msvcr120._strupr @ cdecl _strupr_l(str ptr) msvcr120._strupr_l @@ -2055,9 +2055,9 @@ @ cdecl strtok_s(ptr str ptr) msvcr120.strtok_s @ cdecl strtol(str ptr long) msvcr120.strtol @ stub strtold -@ stub strtoll +@ cdecl -ret64 strtoll(str ptr long) msvcr120.strtoll @ cdecl strtoul(str ptr long) msvcr120.strtoul -@ stub strtoull +@ cdecl -ret64 strtoull(str ptr long) msvcr120.strtoull @ stub strtoumax @ cdecl strxfrm(ptr str long) msvcr120.strxfrm @ varargs swprintf_s(ptr long wstr) msvcr120.swprintf_s

1 0

Hans Leidekker : server: Accept mandatory label ACEs.
by Alexandre Julliard April 17, 2015

April 17, 2015

Module: wine Branch: master Commit: aa407a281859af0d2e1ad4ee0156c10be1c4ef80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa407a281859af0d2e1ad4ee0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 16 17:02:58 2015 +0200 server: Accept mandatory label ACEs. --- server/token.c | 4 ++++ server/trace.c | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/server/token.c b/server/token.c index cb81eec..c235ece 100644 --- a/server/token.c +++ b/server/token.c @@ -265,6 +265,10 @@ static int acl_is_valid( const ACL *acl, data_size_t size ) sid = (const SID *)&((const SYSTEM_ALARM_ACE *)ace)->SidStart; sid_size = ace->AceSize - FIELD_OFFSET(SYSTEM_ALARM_ACE, SidStart); break; + case SYSTEM_MANDATORY_LABEL_ACE_TYPE: + sid = (const SID *)&((const SYSTEM_MANDATORY_LABEL_ACE *)ace)->SidStart; + sid_size = ace->AceSize - FIELD_OFFSET(SYSTEM_MANDATORY_LABEL_ACE, SidStart); + break; default: return FALSE; } diff --git a/server/trace.c b/server/trace.c index 236c9ab..20895b1 100644 --- a/server/trace.c +++ b/server/trace.c @@ -914,6 +914,12 @@ static void dump_inline_acl( const char *prefix, const ACL *acl, data_size_t siz fprintf( stderr, "SYSTEM_ALARM_ACE_TYPE,Mask=%x", ((const SYSTEM_ALARM_ACE *)ace)->Mask ); break; + case SYSTEM_MANDATORY_LABEL_ACE_TYPE: + sid = (const SID *)&((const SYSTEM_MANDATORY_LABEL_ACE *)ace)->SidStart; + sid_size = ace->AceSize - FIELD_OFFSET(SYSTEM_MANDATORY_LABEL_ACE, SidStart); + fprintf( stderr, "SYSTEM_MANDATORY_LABEL_ACE_TYPE,Mask=%x", + ((const SYSTEM_MANDATORY_LABEL_ACE *)ace)->Mask ); + break; default: fprintf( stderr, "unknown<%d>", ace->AceType ); break;

1 0

Hans Leidekker : advapi32: Support parsing mandatory label ACE strings.
by Alexandre Julliard April 17, 2015

April 17, 2015

Module: wine Branch: master Commit: 985e226c07c3d1dce70ee2794bab29c37188ea96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=985e226c07c3d1dce70ee2794… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 16 17:02:29 2015 +0200 advapi32: Support parsing mandatory label ACE strings. --- dlls/advapi32/security.c | 10 ++++++++++ dlls/advapi32/tests/security.c | 7 +++++++ include/winnt.h | 11 +++++++++++ 3 files changed, 28 insertions(+) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 2cd3f74..d27b2e7 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -311,6 +311,10 @@ static const WCHAR SDDL_GENERIC_READ[] = {'G','R',0}; static const WCHAR SDDL_GENERIC_WRITE[] = {'G','W',0}; static const WCHAR SDDL_GENERIC_EXECUTE[] = {'G','X',0}; +static const WCHAR SDDL_NO_READ_UP[] = {'N','R',0}; +static const WCHAR SDDL_NO_WRITE_UP[] = {'N','W',0}; +static const WCHAR SDDL_NO_EXECUTE_UP[] = {'N','X',0}; + /* * ACL flags */ @@ -325,6 +329,7 @@ static const WCHAR SDDL_ACCESS_ALLOWED[] = {'A',0}; static const WCHAR SDDL_ACCESS_DENIED[] = {'D',0}; static const WCHAR SDDL_AUDIT[] = {'A','U',0}; static const WCHAR SDDL_ALARM[] = {'A','L',0}; +static const WCHAR SDDL_MANDATORY_LABEL[] = {'M','L',0}; /* * ACE flags @@ -4147,6 +4152,7 @@ static const ACEFLAG AceType[] = { SDDL_AUDIT, SYSTEM_AUDIT_ACE_TYPE }, { SDDL_ACCESS_ALLOWED, ACCESS_ALLOWED_ACE_TYPE }, { SDDL_ACCESS_DENIED, ACCESS_DENIED_ACE_TYPE }, + { SDDL_MANDATORY_LABEL,SYSTEM_MANDATORY_LABEL_ACE_TYPE }, /* { SDDL_OBJECT_ACCESS_ALLOWED, ACCESS_ALLOWED_OBJECT_ACE_TYPE }, { SDDL_OBJECT_ACCESS_DENIED, ACCESS_DENIED_OBJECT_ACE_TYPE }, @@ -4257,6 +4263,10 @@ static const ACEFLAG AceRights[] = { SDDL_KEY_READ, KEY_READ }, { SDDL_KEY_WRITE, KEY_WRITE }, { SDDL_KEY_EXECUTE, KEY_EXECUTE }, + + { SDDL_NO_READ_UP, SYSTEM_MANDATORY_LABEL_NO_READ_UP }, + { SDDL_NO_WRITE_UP, SYSTEM_MANDATORY_LABEL_NO_WRITE_UP }, + { SDDL_NO_EXECUTE_UP, SYSTEM_MANDATORY_LABEL_NO_EXECUTE_UP }, { NULL, 0 }, }; diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 466100d..b43f212 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -3901,6 +3901,13 @@ static void test_ConvertStringSecurityDescriptor(void) Blank, SDDL_REVISION_1, &pSD, NULL); ok(ret, "ConvertStringSecurityDescriptorToSecurityDescriptor failed with error %d\n", GetLastError()); LocalFree(pSD); + + SetLastError(0xdeadbeef); + ret = pConvertStringSecurityDescriptorToSecurityDescriptorA( + "D:P(A;;GRGW;;;BA)(A;;GRGW;;;S-1-5-21-0-0-0-1000)S:(ML;;NWNR;;;S-1-16-12288)", SDDL_REVISION_1, &pSD, NULL); + ok(ret || broken(!ret && GetLastError() == ERROR_INVALID_DATATYPE) /* win2k */, + "ConvertStringSecurityDescriptorToSecurityDescriptor failed with error %u\n", GetLastError()); + if (ret) LocalFree(pSD); } static void test_ConvertSecurityDescriptorToString(void) diff --git a/include/winnt.h b/include/winnt.h index c2aa50e..9b08544 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -4445,6 +4445,7 @@ typedef struct _ACE_HEADER { #define ACCESS_DENIED_ACE_TYPE 1 #define SYSTEM_AUDIT_ACE_TYPE 2 #define SYSTEM_ALARM_ACE_TYPE 3 +#define SYSTEM_MANDATORY_LABEL_ACE_TYPE 0x11 /* inherit AceFlags */ #define OBJECT_INHERIT_ACE 0x01 @@ -4489,6 +4490,16 @@ typedef struct _SYSTEM_ALARM_ACE { DWORD SidStart; } SYSTEM_ALARM_ACE,*PSYSTEM_ALARM_ACE; +typedef struct _SYSTEM_MANDATORY_LABEL_ACE { + ACE_HEADER Header; + ACCESS_MASK Mask; + DWORD SidStart; +} SYSTEM_MANDATORY_LABEL_ACE,*PSYSTEM_MANDATORY_LABEL_ACE; + +#define SYSTEM_MANDATORY_LABEL_NO_WRITE_UP 0x1 +#define SYSTEM_MANDATORY_LABEL_NO_READ_UP 0x2 +#define SYSTEM_MANDATORY_LABEL_NO_EXECUTE_UP 0x4 + typedef enum tagSID_NAME_USE { SidTypeUser = 1, SidTypeGroup,

1 0

Henri Verbeet : wined3d: Bind the texture before calling wined3d_volume_upload_data() in wined3d_volume_load_location().
by Alexandre Julliard April 16, 2015

April 16, 2015

Module: wine Branch: master Commit: 52478e38095e8d1c70fcdbcfb091dee419c37bc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52478e38095e8d1c70fcdbcfb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 16 11:26:33 2015 +0200 wined3d: Bind the texture before calling wined3d_volume_upload_data() in wined3d_volume_load_location(). --- dlls/wined3d/volume.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 91325dc..357608f 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -64,6 +64,8 @@ void wined3d_volume_get_pitch(const struct wined3d_volume *volume, UINT *row_pit TRACE("Returning row pitch %u, slice pitch %u.\n", *row_pitch, *slice_pitch); } +/* This call just uploads data, the caller is responsible for binding the + * correct texture. */ /* Context activation is done by the caller. */ void wined3d_volume_upload_data(struct wined3d_volume *volume, const struct wined3d_context *context, const struct wined3d_const_bo_address *data) @@ -273,11 +275,15 @@ static void wined3d_volume_load_location(struct wined3d_volume *volume, else if (volume->locations & WINED3D_LOCATION_SYSMEM) { struct wined3d_const_bo_address data = {0, volume->resource.heap_memory}; + wined3d_texture_bind_and_dirtify(volume->container, context, + location == WINED3D_LOCATION_TEXTURE_SRGB); wined3d_volume_upload_data(volume, context, &data); } else if (volume->locations & WINED3D_LOCATION_BUFFER) { struct wined3d_const_bo_address data = {volume->pbo, NULL}; + wined3d_texture_bind_and_dirtify(volume->container, context, + location == WINED3D_LOCATION_TEXTURE_SRGB); wined3d_volume_upload_data(volume, context, &data); } else if (volume->locations & WINED3D_LOCATION_TEXTURE_RGB)

1 0

Jacek Caban : mshtml: Use NS_Alloc and NS_Free directly instead of via nsIMemory.
by Alexandre Julliard April 16, 2015

April 16, 2015

Module: wine Branch: master Commit: ba00e8e0e1159047e52469008ef41fe1f2d6b276 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba00e8e0e1159047e52469008… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 16 12:37:11 2015 +0200 mshtml: Use NS_Alloc and NS_Free directly instead of via nsIMemory. --- dlls/mshtml/nsembed.c | 18 ++++++------------ dlls/mshtml/nsiface.idl | 15 --------------- 2 files changed, 6 insertions(+), 27 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index f4d14bc..ac33015 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -42,7 +42,6 @@ WINE_DECLARE_DEBUG_CHANNEL(gecko); #define NS_APPSTARTUPNOTIFIER_CONTRACTID "@mozilla.org/embedcomp/appstartup-notifier;1" #define NS_WEBBROWSER_CONTRACTID "@mozilla.org/embedding/browser/nsWebBrowser;1" -#define NS_MEMORY_CONTRACTID "@mozilla.org/xpcom/memory-service;1" #define NS_COMMANDPARAMS_CONTRACTID "@mozilla.org/embedcomp/command-params;1" #define NS_HTMLSERIALIZER_CONTRACTID "@mozilla.org/layout/contentserializer;1?mimetype=text/html" #define NS_EDITORCONTROLLER_CONTRACTID "@mozilla.org/editor/editorcontroller;1" @@ -69,13 +68,14 @@ static nsresult (CDECL *NS_CStringSetData)(nsACString*,const char*,PRUint32); static nsresult (CDECL *NS_NewLocalFile)(const nsAString*,cpp_bool,nsIFile**); static PRUint32 (CDECL *NS_StringGetData)(const nsAString*,const PRUnichar **,cpp_bool*); static PRUint32 (CDECL *NS_CStringGetData)(const nsACString*,const char**,cpp_bool*); +static void* (CDECL *NS_Alloc)(SIZE_T); +static void (CDECL *NS_Free)(void*); static HINSTANCE xul_handle = NULL; static nsIServiceManager *pServMgr = NULL; static nsIComponentManager *pCompMgr = NULL; static nsICategoryManager *cat_mgr; -static nsIMemory *nsmem = NULL; static nsIFile *profile_directory, *plugin_directory; static const WCHAR wszNsContainer[] = {'N','s','C','o','n','t','a','i','n','e','r',0}; @@ -516,6 +516,8 @@ static BOOL load_xul(const PRUnichar *gre_path) NS_DLSYM(NS_NewLocalFile); NS_DLSYM(NS_StringGetData); NS_DLSYM(NS_CStringGetData); + NS_DLSYM(NS_Alloc); + NS_DLSYM(NS_Free); #undef NS_DLSYM @@ -733,11 +735,6 @@ static BOOL init_xpcom(const PRUnichar *gre_path) init_mutation(pCompMgr); set_preferences(); - nsres = nsIComponentManager_CreateInstanceByContractID(pCompMgr, NS_MEMORY_CONTRACTID, - NULL, &IID_nsIMemory, (void**)&nsmem); - if(NS_FAILED(nsres)) - ERR("Could not get nsIMemory: %08x\n", nsres); - nsres = nsIServiceManager_GetServiceByContractID(pServMgr, NS_CATEGORYMANAGER_CONTRACTID, &IID_nsICategoryManager, (void**)&cat_mgr); if(NS_FAILED(nsres)) @@ -796,12 +793,12 @@ BOOL load_gecko(void) void *nsalloc(size_t size) { - return nsIMemory_Alloc(nsmem, size); + return NS_Alloc(size); } void nsfree(void *mem) { - nsIMemory_Free(nsmem, mem); + NS_Free(mem); } static BOOL nsACString_Init(nsACString *str, const char *data) @@ -1118,9 +1115,6 @@ void close_gecko(void) if(cat_mgr) nsICategoryManager_Release(cat_mgr); - if(nsmem) - nsIMemory_Release(nsmem); - /* Gecko doesn't really support being unloaded */ /* if (hXPCOM) FreeLibrary(hXPCOM); */ diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 7989e9a..7cc898c 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -227,21 +227,6 @@ interface nsIFactory : nsISupports [ object, - uuid(6aef11c4-8615-44a6-9711-98f43805693d), - local -] -interface nsIMemory : nsISupports -{ - void *Alloc(/*size_t*/ int size); - void *Realloc(void *_ptr, /*size_t*/ int newSize); - void Free(void *_ptr); - nsresult HeapMinimize(bool immediate); - nsresult IsLowMemory(bool *_retval); - nsresult IsLowMemoryPlatform(bool *_retval); -} - -[ - object, uuid(9188bc85-f92e-11d2-81ef-0060083a0bcf), local ]

1 0

Henri Verbeet : wined3d: Use wined3d_texture_bind_and_dirtify() in device_update_volume().
by Alexandre Julliard April 16, 2015

April 16, 2015

Module: wine Branch: master Commit: 5c9da580a86d735b021af19c1e5cf64acec1fb38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c9da580a86d735b021af19c1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 16 11:26:34 2015 +0200 wined3d: Use wined3d_texture_bind_and_dirtify() in device_update_volume(). I missed this in 7c4d512fee752876b4ce95f1f97308f6a291b010. Generally speaking, the only places where plain wined3d_texture_bind() calls are appropriate are places where you're binding the texture to a specific stage for a subsequent draw. I.e., places where context_active_texture() is called first. --- dlls/wined3d/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 20a0e23..5f44a1a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3511,7 +3511,7 @@ static HRESULT device_update_volume(struct wined3d_device *device, /* Only a prepare, since we're uploading the entire volume. */ wined3d_texture_prepare_texture(dst_volume->container, context, FALSE); - wined3d_texture_bind(dst_volume->container, context, FALSE); + wined3d_texture_bind_and_dirtify(dst_volume->container, context, FALSE); data.buffer_object = 0; data.addr = src.data;

1 0

Henri Verbeet : wined3d: Use wined3d_texture_bind_and_dirtify() in wined3d_texture_upload_data().
by Alexandre Julliard April 16, 2015

April 16, 2015

Module: wine Branch: master Commit: dcaaf915f890530ea9a991fe90c0a44afd646b40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcaaf915f890530ea9a991fe9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 16 11:26:35 2015 +0200 wined3d: Use wined3d_texture_bind_and_dirtify() in wined3d_texture_upload_data(). --- dlls/wined3d/texture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 34c69d1..78d1266 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -749,7 +749,7 @@ static void wined3d_texture_upload_data(struct wined3d_texture *texture, const s context = context_acquire(texture->resource.device, NULL); wined3d_texture_prepare_texture(texture, context, FALSE); - wined3d_texture_bind(texture, context, FALSE); + wined3d_texture_bind_and_dirtify(texture, context, FALSE); for (i = 0; i < sub_count; ++i) {

1 0