January 2014 - Wine-Commits

Stefan Dösinger : wined3d: GL_ARB_instanced_arrays provides glDrawElementsInstanced.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 728766f64ef5293b2c5f7dda99c11394ac7b9558 URL: http://source.winehq.org/git/wine.git/?a=commit;h=728766f64ef5293b2c5f7dda9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Nov 4 12:38:34 2013 +0100 wined3d: GL_ARB_instanced_arrays provides glDrawElementsInstanced. (cherry picked from commit 292612cf4b4a906d273d096ffc2a8c25a0e735ac) --- dlls/wined3d/drawprim.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 490bf15..2bd9488 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -44,7 +44,7 @@ static void drawStridedFast(const struct wined3d_gl_info *gl_info, GLenum primit GLenum idxtype = idx_size == 2 ? GL_UNSIGNED_SHORT : GL_UNSIGNED_INT; if (instance_count) { - if (!gl_info->supported[ARB_DRAW_INSTANCED]) + if (!gl_info->supported[ARB_DRAW_INSTANCED] && !gl_info->supported[ARB_INSTANCED_ARRAYS]) { FIXME("Instanced drawing not supported.\n"); }

1 0

Stefan Dösinger : wined3d: Check for support before calling glDrawElementsInstancedBaseVertex.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 738302ffd1d923a7fa981ff5bafce78e77252022 URL: http://source.winehq.org/git/wine.git/?a=commit;h=738302ffd1d923a7fa981ff5b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Nov 4 12:38:33 2013 +0100 wined3d: Check for support before calling glDrawElementsInstancedBaseVertex. (cherry picked from commit 84a1e60e48d99efdaa6d7f4648d51bf938a98f98) --- dlls/wined3d/drawprim.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index c75ab59..490bf15 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -52,9 +52,18 @@ static void drawStridedFast(const struct wined3d_gl_info *gl_info, GLenum primit { if (start_instance) FIXME("Start instance (%u) not supported.\n", start_instance); - GL_EXTCALL(glDrawElementsInstancedBaseVertex(primitive_type, count, idxtype, - (const char *)idx_data + (idx_size * start_idx), instance_count, base_vertex_index)); - checkGLcall("glDrawElementsInstancedBaseVertex"); + if (gl_info->supported[ARB_DRAW_ELEMENTS_BASE_VERTEX]) + { + GL_EXTCALL(glDrawElementsInstancedBaseVertex(primitive_type, count, idxtype, + (const char *)idx_data + (idx_size * start_idx), instance_count, base_vertex_index)); + checkGLcall("glDrawElementsInstancedBaseVertex"); + } + else + { + GL_EXTCALL(glDrawElementsInstancedARB(primitive_type, count, idxtype, + (const char *)idx_data + (idx_size * start_idx), instance_count)); + checkGLcall("glDrawElementsInstancedARB"); + } } } else if (gl_info->supported[ARB_DRAW_ELEMENTS_BASE_VERTEX])

1 0

Hans Leidekker : wbemprox: Add a partial implementation of Win32_NetworkAdapterConfiguration.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 113ee49bcd92e402cfa312e614334fedf9126123 URL: http://source.winehq.org/git/wine.git/?a=commit;h=113ee49bcd92e402cfa312e61… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Nov 4 11:54:51 2013 +0100 wbemprox: Add a partial implementation of Win32_NetworkAdapterConfiguration. (cherry picked from commit ec1a57f25b25dba1ed47e8456cc64c2cc1ee0aa1) --- dlls/wbemprox/builtin.c | 63 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 4d1d787..90d077b 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -66,6 +66,9 @@ static const WCHAR class_logicaldisk2W[] = {'C','I','M','_','L','o','g','i','c','a','l','D','i','s','k',0}; static const WCHAR class_networkadapterW[] = {'W','i','n','3','2','_','N','e','t','w','o','r','k','A','d','a','p','t','e','r',0}; +static const WCHAR class_networkadapterconfigW[] = + {'W','i','n','3','2','_','N','e','t','w','o','r','k','A','d','a','p','t','e','r', + 'C','o','n','f','i','g','u','r','a','t','i','o','n',0}; static const WCHAR class_osW[] = {'W','i','n','3','2','_','O','p','e','r','a','t','i','n','g','S','y','s','t','e','m',0}; static const WCHAR class_paramsW[] = @@ -160,6 +163,8 @@ static const WCHAR prop_interfaceindexW[] = {'I','n','t','e','r','f','a','c','e','I','n','d','e','x',0}; static const WCHAR prop_intvalueW[] = {'I','n','t','e','g','e','r','V','a','l','u','e',0}; +static const WCHAR prop_ipenabledW[] = + {'I','P','E','n','a','b','l','e','d',0}; static const WCHAR prop_lastbootuptimeW[] = {'L','a','s','t','B','o','o','t','U','p','T','i','m','e',0}; static const WCHAR prop_localeW[] = @@ -340,6 +345,12 @@ static const struct column col_networkadapter[] = { prop_pnpdeviceidW, CIM_STRING }, { prop_speedW, CIM_UINT64 } }; +static const struct column col_networkadapterconfig[] = +{ + { prop_indexW, CIM_UINT32|COL_FLAG_KEY }, + { prop_ipenabledW, CIM_BOOLEAN }, + { prop_macaddressW, CIM_STRING|COL_FLAG_DYNAMIC } +}; static const struct column col_os[] = { { prop_captionW, CIM_STRING }, @@ -598,6 +609,12 @@ struct record_networkadapter const WCHAR *pnpdevice_id; UINT64 speed; }; +struct record_networkadapterconfig +{ + UINT32 index; + int ipenabled; + const WCHAR *mac_address; +}; struct record_operatingsystem { const WCHAR *caption; @@ -1598,6 +1615,50 @@ static enum fill_status fill_networkadapter( struct table *table, const struct e return status; } +static enum fill_status fill_networkadapterconfig( struct table *table, const struct expr *cond ) +{ + struct record_networkadapterconfig *rec; + IP_ADAPTER_ADDRESSES *aa, *buffer; + UINT row = 0, offset = 0, count = 0; + DWORD size = 0, ret; + enum fill_status status = FILL_STATUS_UNFILTERED; + + ret = GetAdaptersAddresses( AF_UNSPEC, 0, NULL, NULL, &size ); + if (ret != ERROR_BUFFER_OVERFLOW) return FILL_STATUS_FAILED; + + if (!(buffer = heap_alloc( size ))) return FILL_STATUS_FAILED; + if (GetAdaptersAddresses( AF_UNSPEC, 0, NULL, buffer, &size )) + { + heap_free( buffer ); + return FILL_STATUS_FAILED; + } + for (aa = buffer; aa; aa = aa->Next) count++; + if (!resize_table( table, count, sizeof(*rec) )) + { + heap_free( buffer ); + return FILL_STATUS_FAILED; + } + for (aa = buffer; aa; aa = aa->Next) + { + rec = (struct record_networkadapterconfig *)(table->data + offset); + rec->index = aa->u.s.IfIndex; + rec->ipenabled = -1; + rec->mac_address = get_mac_address( aa->PhysicalAddress, aa->PhysicalAddressLength ); + if (!match_row( table, row, cond, &status )) + { + free_row_values( table, row ); + continue; + } + offset += sizeof(*rec); + row++; + } + TRACE("created %u rows\n", row); + table->num_rows = row; + + heap_free( buffer ); + return status; +} + static WCHAR *get_cmdline( DWORD process_id ) { if (process_id == GetCurrentProcessId()) return heap_strdupW( GetCommandLineW() ); @@ -2100,6 +2161,8 @@ static struct table builtin_classes[] = { class_logicaldiskW, SIZEOF(col_logicaldisk), col_logicaldisk, 0, 0, NULL, fill_logicaldisk }, { class_logicaldisk2W, SIZEOF(col_logicaldisk), col_logicaldisk, 0, 0, NULL, fill_logicaldisk }, { class_networkadapterW, SIZEOF(col_networkadapter), col_networkadapter, 0, 0, NULL, fill_networkadapter }, + { class_networkadapterconfigW, SIZEOF(col_networkadapterconfig), col_networkadapterconfig, 0, 0, NULL, + fill_networkadapterconfig }, { class_osW, SIZEOF(col_os), col_os, 0, 0, NULL, fill_os }, { class_paramsW, SIZEOF(col_param), col_param, SIZEOF(data_param), 0, (BYTE *)data_param }, { class_processW, SIZEOF(col_process), col_process, 0, 0, NULL, fill_process },

1 0

Andrey Zhezherun : msvcp: Fixed char_traits<char>::to_int_type.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 659757be9bb1a719675b52800067fa60046bb11b URL: http://source.winehq.org/git/wine.git/?a=commit;h=659757be9bb1a719675b52800… Author: Andrey Zhezherun <zhezherun(a)yandex.ru> Date: Thu Oct 31 23:35:21 2013 +0000 msvcp: Fixed char_traits<char>::to_int_type. (cherry picked from commit 43d31483572dd5d17f3fa300738c813ef169a8f1) --- dlls/msvcp71/string.c | 2 +- dlls/msvcp90/string.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp71/string.c b/dlls/msvcp71/string.c index 415e514..848d39f 100644 --- a/dlls/msvcp71/string.c +++ b/dlls/msvcp71/string.c @@ -162,7 +162,7 @@ char CDECL MSVCP_char_traits_char_to_char_type(const int *i) /* ?to_int_type@?$char_traits(a)D@std@@SAHAEBD(a)Z */ int CDECL MSVCP_char_traits_char_to_int_type(const char *ch) { - return (int)*ch; + return (unsigned char)*ch; } /* ?eq_int_type@?$char_traits(a)D@std@@SA_NABH0(a)Z */ diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index a0359a1..fd7b131 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -162,7 +162,7 @@ char CDECL MSVCP_char_traits_char_to_char_type(const int *i) /* ?to_int_type@?$char_traits(a)D@std@@SAHAEBD(a)Z */ int CDECL MSVCP_char_traits_char_to_int_type(const char *ch) { - return (int)*ch; + return (unsigned char)*ch; } /* ?eq_int_type@?$char_traits(a)D@std@@SA_NABH0(a)Z */

1 0

Henri Verbeet : wined3d: Mark the context valid if making it current on the "backup" window worked.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 638f15f3679c3ae1d9ec40d1fdc606a4a194f3aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=638f15f3679c3ae1d9ec40d1f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 4 10:02:44 2013 +0100 wined3d: Mark the context valid if making it current on the "backup" window worked. (cherry picked from commit f4aab54ca15d0447e1336cea7844fdabbb975339) --- dlls/wined3d/context.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index a20bc7f..4a37b23 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -812,6 +812,8 @@ static BOOL context_set_gl_context(struct wined3d_context *ctx) context_set_current(NULL); return FALSE; } + + ctx->valid = 1; } return TRUE; }

1 0

Rico Schüller : opengl32: Use opengl xml registry files.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: bac043824b092295b2ae0a91a30a0e97d08752d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bac043824b092295b2ae0a91a… Author: Rico Schüller <kgbricola(a)web.de> Date: Fri Nov 1 18:18:26 2013 +0100 opengl32: Use opengl xml registry files. (cherry picked from commit 2fa9b7ebb5cee85a1d712a78b8ff50eae097851f) --- dlls/opengl32/make_opengl | 414 +++--- dlls/opengl32/opengl_ext.c | 2918 ++++++++++++++++++++++++++++++++----------- dlls/opengl32/opengl_norm.c | 1146 +++++++++++------ dlls/winemac.drv/opengl.c | 8 +- dlls/winex11.drv/opengl.c | 8 +- include/wine/wgl.h | 504 ++++++-- include/wine/wgl_driver.h | 860 ++++++++----- 7 files changed, 4098 insertions(+), 1760 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bac043824b092295b2ae0…

1 0

Rico Schüller : opengl32: Allow multiple extensions to support the same function.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 3c49f0a67a6e2ff73f92dec06ec1bd3268a54baa URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c49f0a67a6e2ff73f92dec06… Author: Rico Schüller <kgbricola(a)web.de> Date: Fri Nov 1 18:18:19 2013 +0100 opengl32: Allow multiple extensions to support the same function. This allows that gl functions are available for different extensions, e.g. "glVertexP2ui" which is new GL_ARB_vertex_type_2_10_10_10_rev and also in GL_VERSION_3_3. It is valid to get that function for each gl version when GL_ARB_vertex_type_2_10_10_10_rev is in the extension list. On the other hand that function is available, when the gl version is >= 3.3. (cherry picked from commit 8a23fbf56fa9e0191fbcdfe942b9be18d74c6388) --- dlls/opengl32/wgl.c | 53 ++++++++++++++++++++++++++++----------------------- 1 file changed, 29 insertions(+), 24 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 1317ff5..6735915 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -665,10 +665,8 @@ int WINAPI wglGetLayerPaletteEntries(HDC hdc, } /* check if the extension is present in the list */ -static BOOL has_extension( const char *list, const char *ext ) +static BOOL has_extension( const char *list, const char *ext, size_t len ) { - size_t len = strlen( ext ); - while (list) { while (*list == ' ') list++; @@ -688,6 +686,7 @@ static BOOL is_extension_supported(const char* extension) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; const char *gl_ext_string = (const char*)glGetString(GL_EXTENSIONS); + size_t len; TRACE("Checking for extension '%s'\n", extension); @@ -702,30 +701,36 @@ static BOOL is_extension_supported(const char* extension) * require the function to return NULL when an extension isn't found. For this reason we check * if the OpenGL extension required for the function we are looking up is supported. */ - /* Check if the extension is part of the GL extension string to see if it is supported. */ - if (has_extension(gl_ext_string, extension)) - return TRUE; - - /* In general an OpenGL function starts as an ARB/EXT extension and at some stage - * it becomes part of the core OpenGL library and can be reached without the ARB/EXT - * suffix as well. In the extension table, these functions contain GL_VERSION_major_minor. - * Check if we are searching for a core GL function */ - if(strncmp(extension, "GL_VERSION_", 11) == 0) + while ((len = strcspn(extension, " ")) != 0) { - const GLubyte *gl_version = funcs->gl.p_glGetString(GL_VERSION); - const char *version = extension + 11; /* Move past 'GL_VERSION_' */ + /* Check if the extension is part of the GL extension string to see if it is supported. */ + if (has_extension(gl_ext_string, extension, len)) + return TRUE; - if(!gl_version) { - ERR("No OpenGL version found!\n"); - return FALSE; - } + /* In general an OpenGL function starts as an ARB/EXT extension and at some stage + * it becomes part of the core OpenGL library and can be reached without the ARB/EXT + * suffix as well. In the extension table, these functions contain GL_VERSION_major_minor. + * Check if we are searching for a core GL function */ + if(strncmp(extension, "GL_VERSION_", 11) == 0) + { + const GLubyte *gl_version = funcs->gl.p_glGetString(GL_VERSION); + const char *version = extension + 11; /* Move past 'GL_VERSION_' */ - /* Compare the major/minor version numbers of the native OpenGL library and what is required by the function. - * The gl_version string is guaranteed to have at least a major/minor and sometimes it has a release number as well. */ - if( (gl_version[0] >= version[0]) || ((gl_version[0] == version[0]) && (gl_version[2] >= version[2])) ) { - return TRUE; + if(!gl_version) { + ERR("No OpenGL version found!\n"); + return FALSE; + } + + /* Compare the major/minor version numbers of the native OpenGL library and what is required by the function. + * The gl_version string is guaranteed to have at least a major/minor and sometimes it has a release number as well. */ + if( (gl_version[0] >= version[0]) || ((gl_version[0] == version[0]) && (gl_version[2] >= version[2])) ) { + return TRUE; + } + WARN("The function requires OpenGL version '%c.%c' while your drivers only provide '%c.%c'\n", version[0], version[2], gl_version[0], gl_version[2]); } - WARN("The function requires OpenGL version '%c.%c' while your drivers only provide '%c.%c'\n", version[0], version[2], gl_version[0], gl_version[2]); + + if (extension[len] == ' ') len++; + extension += len; } return FALSE; @@ -1677,7 +1682,7 @@ static GLubyte *filter_extensions( const char *extensions ) if (!(end = strchr( extensions, ' ' ))) end = extensions + strlen( extensions ); memcpy( p, extensions, end - extensions ); p[end - extensions] = 0; - if (!has_extension( disabled, p )) + if (!has_extension( disabled, p , strlen( p ))) { TRACE("++ %s\n", p ); p += end - extensions;

1 0

Andrey Zhezherun : msvcrt: Implemented _chsize_s.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: f768b8dec18a03d363c8c885ae792c73571dc5c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f768b8dec18a03d363c8c885a… Author: Andrey Zhezherun <zhezherun(a)yandex.ru> Date: Tue Nov 5 09:04:19 2013 +0000 msvcrt: Implemented _chsize_s. (cherry picked from commit 3bb2c11757156223be0f8a22f3b377b060b09562) --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/file.c | 27 +++++++++++++++++++-------- dlls/msvcrt/msvcrt.spec | 2 +- include/msvcrt/io.h | 1 + 7 files changed, 25 insertions(+), 13 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index bc93840..038a787 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -721,7 +721,7 @@ @ cdecl -arch=i386 -norelay _chkesp() msvcrt._chkesp @ cdecl _chmod(str long) msvcrt._chmod @ cdecl _chsize(long long) msvcrt._chsize -@ stub _chsize_s +@ cdecl _chsize_s(long int64) msvcrt._chsize_s @ cdecl _clearfp() msvcrt._clearfp @ cdecl _close(long) msvcrt._close @ cdecl _commit(long) msvcrt._commit diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 57bd107..343d26b 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1073,7 +1073,7 @@ @ cdecl -arch=i386 -norelay _chkesp() msvcrt._chkesp @ cdecl _chmod(str long) msvcrt._chmod @ cdecl _chsize(long long) msvcrt._chsize -@ stub _chsize_s +@ cdecl _chsize_s(long int64) msvcrt._chsize_s @ cdecl _clearfp() msvcrt._clearfp @ cdecl _close(long) msvcrt._close @ cdecl _commit(long) msvcrt._commit diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index c950f60..4f07638 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -384,7 +384,7 @@ @ cdecl -arch=i386 -norelay _chkesp() msvcrt._chkesp @ cdecl _chmod(str long) msvcrt._chmod @ cdecl _chsize(long long) msvcrt._chsize -@ stub _chsize_s +@ cdecl _chsize_s(long int64) msvcrt._chsize_s @ cdecl _clearfp() msvcrt._clearfp @ cdecl _close(long) msvcrt._close @ cdecl _commit(long) msvcrt._commit diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index ff00184..24251e1 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -367,7 +367,7 @@ @ cdecl -arch=i386 -norelay _chkesp() msvcrt._chkesp @ cdecl _chmod(str long) msvcrt._chmod @ cdecl _chsize(long long) msvcrt._chsize -@ stub _chsize_s +@ cdecl _chsize_s(long int64) msvcrt._chsize_s @ cdecl _clearfp() msvcrt._clearfp @ cdecl _close(long) msvcrt._close @ cdecl _commit(long) msvcrt._commit diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index f26d0c2..0c67744 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1259,15 +1259,17 @@ int CDECL MSVCRT_fseek(MSVCRT_FILE* file, MSVCRT_long offset, int whence) } /********************************************************************* - * _chsize (MSVCRT.@) + * _chsize_s (MSVCRT.@) */ -int CDECL MSVCRT__chsize(int fd, MSVCRT_long size) +int CDECL MSVCRT__chsize_s(int fd, __int64 size) { - LONG cur, pos; + __int64 cur, pos; HANDLE handle; BOOL ret = FALSE; - TRACE("(fd=%d, size=%d)\n", fd, size); + TRACE("(fd=%d, size=%s)\n", fd, wine_dbgstr_longlong(size)); + + if (!MSVCRT_CHECK_PMT(size >= 0)) return MSVCRT_EINVAL; LOCK_FILES(); @@ -1275,10 +1277,10 @@ int CDECL MSVCRT__chsize(int fd, MSVCRT_long size) if (handle != INVALID_HANDLE_VALUE) { /* save the current file pointer */ - cur = MSVCRT__lseek(fd, 0, SEEK_CUR); + cur = MSVCRT__lseeki64(fd, 0, SEEK_CUR); if (cur >= 0) { - pos = MSVCRT__lseek(fd, size, SEEK_SET); + pos = MSVCRT__lseeki64(fd, size, SEEK_SET); if (pos >= 0) { ret = SetEndOfFile(handle); @@ -1286,12 +1288,21 @@ int CDECL MSVCRT__chsize(int fd, MSVCRT_long size) } /* restore the file pointer */ - MSVCRT__lseek(fd, cur, SEEK_SET); + MSVCRT__lseeki64(fd, cur, SEEK_SET); } } UNLOCK_FILES(); - return ret ? 0 : -1; + return ret ? 0 : *MSVCRT__errno(); +} + +/********************************************************************* + * _chsize (MSVCRT.@) + */ +int CDECL MSVCRT__chsize(int fd, MSVCRT_long size) +{ + /* _chsize_s returns errno on failure but _chsize should return -1 */ + return MSVCRT__chsize_s( fd, size ) == 0 ? 0 : -1; } /********************************************************************* diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 58ceaf9..090cddd 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -356,7 +356,7 @@ @ cdecl -arch=i386 -norelay _chkesp() @ cdecl _chmod(str long) MSVCRT__chmod @ cdecl _chsize(long long) MSVCRT__chsize -# stub _chsize_s(long int64) +@ cdecl _chsize_s(long int64) MSVCRT__chsize_s # stub _chvalidator(long long) # stub _chvalidator_l(ptr long long) @ cdecl _clearfp() diff --git a/include/msvcrt/io.h b/include/msvcrt/io.h index 09b615c..b227b20 100644 --- a/include/msvcrt/io.h +++ b/include/msvcrt/io.h @@ -87,6 +87,7 @@ extern "C" { int __cdecl _access(const char*,int); int __cdecl _chmod(const char*,int); int __cdecl _chsize(int,__msvcrt_ulong); +int __cdecl _chsize_s(int,__int64); int __cdecl _close(int); int __cdecl _commit(int); int __cdecl _creat(const char*,int);

1 0

Alexandre Julliard : winemac: Only register the IME class when needed.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: ee573a246db74a6d464d9a14637b96ec1d6c1966 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee573a246db74a6d464d9a146… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 21 11:31:10 2013 +0200 winemac: Only register the IME class when needed. (cherry picked from commit 5435dad997cee166f47ca7681b61b4472841bab5) --- dlls/winemac.drv/ime.c | 1 + dlls/winemac.drv/macdrv.h | 1 + dlls/winemac.drv/macdrv_main.c | 7 ++++--- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/winemac.drv/ime.c b/dlls/winemac.drv/ime.c index bed094d..8279148 100644 --- a/dlls/winemac.drv/ime.c +++ b/dlls/winemac.drv/ime.c @@ -566,6 +566,7 @@ static void UpdateDataInDefaultIMEWindow(HIMC hIMC, HWND hwnd, BOOL showable) BOOL WINAPI ImeInquire(LPIMEINFO lpIMEInfo, LPWSTR lpszUIClass, LPCWSTR lpszOption) { TRACE("\n"); + IME_RegisterClasses( macdrv_module ); lpIMEInfo->dwPrivateDataSize = sizeof(IMEPRIVATE); lpIMEInfo->fdwProperty = IME_PROP_UNICODE | IME_PROP_AT_CARET; lpIMEInfo->fdwConversionCaps = IME_CMODE_NATIVE; diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 0c35ce1..98aa600 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -38,6 +38,7 @@ extern BOOL skip_single_buffer_flushes DECLSPEC_HIDDEN; extern BOOL allow_vsync DECLSPEC_HIDDEN; extern BOOL allow_set_gamma DECLSPEC_HIDDEN; +extern HMODULE macdrv_module DECLSPEC_HIDDEN; extern const char* debugstr_cf(CFTypeRef t) DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index d27ce94..0f4b056 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -52,6 +52,7 @@ BOOL allow_vsync = TRUE; BOOL allow_set_gamma = TRUE; int left_option_is_alt = 0; int right_option_is_alt = 0; +HMODULE macdrv_module = 0; /************************************************************************** @@ -183,7 +184,7 @@ static void setup_options(void) /*********************************************************************** * process_attach */ -static BOOL process_attach( HINSTANCE instance ) +static BOOL process_attach(void) { SessionAttributeBits attributes; OSStatus status; @@ -205,7 +206,6 @@ static BOOL process_attach( HINSTANCE instance ) set_app_icon(); macdrv_clipboard_process_attach(); - IME_RegisterClasses( instance ); return TRUE; } @@ -299,7 +299,8 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID reserved) switch(reason) { case DLL_PROCESS_ATTACH: - ret = process_attach( hinst ); + macdrv_module = hinst; + ret = process_attach(); break; case DLL_THREAD_DETACH: thread_detach();

1 0

Alexandre Julliard : wmc: Don't put timestamps in generated files.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 4665c33a77abdf3bf0f82470581afa94cc75b42b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4665c33a77abdf3bf0f824705… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 28 14:18:37 2013 +0100 wmc: Don't put timestamps in generated files. (cherry picked from commit f775f3e105f3c923368114aa839140d173f1f4d0) --- tools/wmc/wmc.c | 2 -- tools/wmc/wmc.h | 3 --- tools/wmc/write.c | 17 +++++------------ 3 files changed, 5 insertions(+), 17 deletions(-) diff --git a/tools/wmc/wmc.c b/tools/wmc/wmc.c index a08d733..9d34a40 100644 --- a/tools/wmc/wmc.c +++ b/tools/wmc/wmc.c @@ -174,8 +174,6 @@ int main(int argc,char *argv[]) signal( SIGHUP, exit_on_signal ); #endif - now = time(NULL); - /* First rebuild the commandline to put in destination */ /* Could be done through env[], but not all OS-es support it */ cmdlen = 5; /* for "wmc " and \0 */ diff --git a/tools/wmc/wmc.h b/tools/wmc/wmc.h index cf6d430..9ef9ac7 100644 --- a/tools/wmc/wmc.h +++ b/tools/wmc/wmc.h @@ -21,8 +21,6 @@ #ifndef __WMC_WMC_H #define __WMC_WMC_H -#include <time.h> /* For time_t */ - #include "wmctypes.h" /* @@ -51,7 +49,6 @@ extern char *output_name; extern char *input_name; extern char *header_name; extern char *cmdline; -extern time_t now; extern int line_number; extern int char_number; diff --git a/tools/wmc/write.c b/tools/wmc/write.c index cf170d4..19cd5b3 100644 --- a/tools/wmc/write.c +++ b/tools/wmc/write.c @@ -91,7 +91,6 @@ static const char str_header[] = "/* This file is generated with wmc version " PACKAGE_VERSION ". Do not edit! */\n" "/* Source : %s */\n" "/* Cmdline: %s */\n" - "/* Date : %s */\n" "\n" ; @@ -178,11 +177,9 @@ void write_h_file(const char *fname) perror(fname); exit(1); } - cptr = ctime(&now); - killnl(cptr, 0); - fprintf(fp, str_header, input_name ? input_name : "<stdin>", cmdline, cptr); - fprintf(fp, "#ifndef __WMCGENERATED_%08lx_H\n", (long)now); - fprintf(fp, "#define __WMCGENERATED_%08lx_H\n", (long)now); + fprintf(fp, str_header, input_name ? input_name : "<stdin>", cmdline); + fprintf(fp, "#ifndef __WMCGENERATED_H\n"); + fprintf(fp, "#define __WMCGENERATED_H\n"); fprintf(fp, "\n"); /* Write severity and facility aliases */ @@ -501,18 +498,14 @@ static void write_rcinline(FILE *fp) void write_rc_file(const char *fname) { - FILE *fp; - char *cptr; + FILE *fp = fopen(fname, "w"); - fp = fopen(fname, "w"); if(!fp) { perror(fname); exit(1); } - cptr = ctime(&now); - killnl(cptr, 0); - fprintf(fp, str_header, input_name ? input_name : "<stdin>", cmdline, cptr); + fprintf(fp, str_header, input_name ? input_name : "<stdin>", cmdline); if(rcinline) write_rcinline(fp);

1 0