September 2010 - Wine-commits

Alexandre Julliard : ntdll: Add support for retrieving the server pid from the socket credentials.
by Alexandre Julliard 30 Sep '10

30 Sep '10

Module: wine Branch: master Commit: dec7effac0fb22b735d626edc86671148a6f0cb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dec7effac0fb22b735d626edc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 30 17:05:13 2010 +0200 ntdll: Add support for retrieving the server pid from the socket credentials. --- dlls/ntdll/server.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index f7c2ef5..8da00ca 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -103,6 +103,7 @@ timeout_t server_start_time = 0; /* time of server startup */ sigset_t server_block_set; /* signals to block during server calls */ static int fd_socket = -1; /* socket to exchange file descriptors with the server */ +static pid_t server_pid; static RTL_CRITICAL_SECTION fd_cache_section; static RTL_CRITICAL_SECTION_DEBUG critsect_debug = @@ -402,6 +403,13 @@ static int receive_fd( obj_handle_t *handle ) { if (cmsg->cmsg_level != SOL_SOCKET) continue; if (cmsg->cmsg_type == SCM_RIGHTS) fd = *(int *)CMSG_DATA(cmsg); +#ifdef SCM_CREDENTIALS + else if (cmsg->cmsg_type == SCM_CREDENTIALS) + { + struct ucred *ucred = (struct ucred *)CMSG_DATA(cmsg); + server_pid = ucred->pid; + } +#endif } #endif /* HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS */ if (fd != -1) fcntl( fd, F_SETFD, FD_CLOEXEC ); /* in case MSG_CMSG_CLOEXEC is not supported */ @@ -960,6 +968,7 @@ void server_init_process(void) obj_handle_t version; const char *env_socket = getenv( "WINESERVERSOCKET" ); + server_pid = -1; if (env_socket) { fd_socket = atoi( env_socket ); @@ -981,6 +990,17 @@ void server_init_process(void) pthread_sigmask( SIG_BLOCK, &server_block_set, NULL ); /* receive the first thread request fd on the main socket */ +#ifdef SO_PASSCRED + if (server_pid == -1) + { + int enable = 1; + setsockopt( fd_socket, SOL_SOCKET, SO_PASSCRED, &enable, sizeof(enable) ); + ntdll_get_thread_data()->request_fd = receive_fd( &version ); + enable = 0; + setsockopt( fd_socket, SOL_SOCKET, SO_PASSCRED, &enable, sizeof(enable) ); + } + else +#endif ntdll_get_thread_data()->request_fd = receive_fd( &version ); if (version != SERVER_PROTOCOL_VERSION)

1 0

Alexandre Julliard : ntdll: Add a workaround for Ubuntu' s stupid ptrace breakage.
by Alexandre Julliard 30 Sep '10

30 Sep '10

Module: wine Branch: master Commit: 9227eb2c9d6f0cecbabcb54cc25b5691f544b0f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9227eb2c9d6f0cecbabcb54cc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 30 17:05:35 2010 +0200 ntdll: Add a workaround for Ubuntu's stupid ptrace breakage. --- dlls/ntdll/server.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 8da00ca..df46935 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -45,6 +45,9 @@ #ifdef HAVE_SYS_MMAN_H #include <sys/mman.h> #endif +#ifdef HAVE_SYS_PRCTL_H +# include <sys/prctl.h> +#endif #ifdef HAVE_SYS_STAT_H # include <sys/stat.h> #endif @@ -1013,6 +1016,10 @@ void server_init_process(void) #ifdef __APPLE__ send_server_task_port(); #endif +#if defined(__linux__) && defined(HAVE_PRCTL) + /* work around Ubuntu's ptrace breakage */ + if (server_pid != -1) prctl( 0x59616d61 /* PR_SET_PTRACER */, server_pid ); +#endif }

1 0

Andrew Nguyen : msvcrt: Initialize environ on DLL load.
by Alexandre Julliard 30 Sep '10

30 Sep '10

Module: wine Branch: master Commit: 285e6d249fded2a306a251550652c650f7bf81ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=285e6d249fded2a306a251550… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Thu Sep 30 01:24:13 2010 -0500 msvcrt: Initialize environ on DLL load. --- dlls/msvcrt/data.c | 15 +++-- dlls/msvcrt/environ.c | 12 +--- dlls/msvcrt/tests/environ.c | 131 ++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 142 insertions(+), 16 deletions(-) diff --git a/dlls/msvcrt/data.c b/dlls/msvcrt/data.c index 54dda1c..068b29f 100644 --- a/dlls/msvcrt/data.c +++ b/dlls/msvcrt/data.c @@ -204,8 +204,6 @@ MSVCRT_wchar_t*** CDECL __p___wargv(void) { return &MSVCRT___wargv; } */ char*** CDECL __p__environ(void) { - if (!MSVCRT__environ) - MSVCRT__environ = msvcrt_SnapshotOfEnvironmentA(NULL); return &MSVCRT__environ; } @@ -214,8 +212,6 @@ char*** CDECL __p__environ(void) */ MSVCRT_wchar_t*** CDECL __p__wenviron(void) { - if (!MSVCRT__wenviron) - MSVCRT__wenviron = msvcrt_SnapshotOfEnvironmentW(NULL); return &MSVCRT__wenviron; } @@ -311,9 +307,10 @@ void msvcrt_init_args(void) MSVCRT___setlc_active = 0; MSVCRT___unguarded_readlc_active = 0; MSVCRT__fmode = MSVCRT__O_TEXT; - - MSVCRT___initenv= msvcrt_SnapshotOfEnvironmentA(NULL); - MSVCRT___winitenv= msvcrt_SnapshotOfEnvironmentW(NULL); + + MSVCRT__environ = msvcrt_SnapshotOfEnvironmentA(NULL); + MSVCRT___initenv = msvcrt_SnapshotOfEnvironmentA(NULL); + MSVCRT___winitenv = msvcrt_SnapshotOfEnvironmentW(NULL); MSVCRT__pgmptr = HeapAlloc(GetProcessHeap(), 0, MAX_PATH); if (MSVCRT__pgmptr) @@ -368,6 +365,10 @@ void CDECL __wgetmainargs(int *argc, MSVCRT_wchar_t** *wargv, MSVCRT_wchar_t** * int expand_wildcards, int *new_mode) { TRACE("(%p,%p,%p,%d,%p).\n", argc, wargv, wenvp, expand_wildcards, new_mode); + + /* Initialize the _wenviron array if it's not already created. */ + if (!MSVCRT__wenviron) + MSVCRT__wenviron = msvcrt_SnapshotOfEnvironmentW(NULL); *argc = MSVCRT___argc; *wargv = MSVCRT___wargv; *wenvp = MSVCRT___winitenv; diff --git a/dlls/msvcrt/environ.c b/dlls/msvcrt/environ.c index a60f116..6ceeebb 100644 --- a/dlls/msvcrt/environ.c +++ b/dlls/msvcrt/environ.c @@ -104,9 +104,8 @@ int CDECL _putenv(const char *str) /* _putenv returns success on deletion of nonexistent variable, unlike [Rtl]SetEnvironmentVariable */ if ((ret == -1) && (GetLastError() == ERROR_ENVVAR_NOT_FOUND)) ret = 0; - /* Update the __p__environ array only when already initialized */ - if (MSVCRT__environ) - MSVCRT__environ = msvcrt_SnapshotOfEnvironmentA(MSVCRT__environ); + MSVCRT__environ = msvcrt_SnapshotOfEnvironmentA(MSVCRT__environ); + /* Update the __p__wenviron array only when already initialized */ if (MSVCRT__wenviron) MSVCRT__wenviron = msvcrt_SnapshotOfEnvironmentW(MSVCRT__wenviron); @@ -150,11 +149,8 @@ int CDECL _wputenv(const MSVCRT_wchar_t *str) /* _putenv returns success on deletion of nonexistent variable, unlike [Rtl]SetEnvironmentVariable */ if ((ret == -1) && (GetLastError() == ERROR_ENVVAR_NOT_FOUND)) ret = 0; - /* Update the __p__environ array only when already initialized */ - if (MSVCRT__environ) - MSVCRT__environ = msvcrt_SnapshotOfEnvironmentA(MSVCRT__environ); - if (MSVCRT__wenviron) - MSVCRT__wenviron = msvcrt_SnapshotOfEnvironmentW(MSVCRT__wenviron); + MSVCRT__environ = msvcrt_SnapshotOfEnvironmentA(MSVCRT__environ); + MSVCRT__wenviron = msvcrt_SnapshotOfEnvironmentW(MSVCRT__wenviron); finish: HeapFree(GetProcessHeap(), 0, name); diff --git a/dlls/msvcrt/tests/environ.c b/dlls/msvcrt/tests/environ.c index 336238c..3169503 100644 --- a/dlls/msvcrt/tests/environ.c +++ b/dlls/msvcrt/tests/environ.c @@ -42,6 +42,20 @@ static const char *a_very_long_env_string = "/usr/lib/mingw32/3.4.2/;" "/usr/lib/"; +void __cdecl __getmainargs(int *, char ***, char ***, int, int *); +void __cdecl __wgetmainargs(int *, wchar_t ***, wchar_t ***, int, int *); + +static char ***p_environ; +static WCHAR ***p_wenviron; + +static void init(void) +{ + HMODULE hmod = GetModuleHandleA("msvcrt.dll"); + + p_environ = (void *)GetProcAddress(hmod, "_environ"); + p_wenviron = (void *)GetProcAddress(hmod, "_wenviron"); +} + static void test_system(void) { int ret = system(NULL); @@ -51,7 +65,112 @@ static void test_system(void) ok(ret == 0, "Expected system to return 0, got %d\n", ret); } -START_TEST(environ) +static void test__environ(void) +{ + int argc; + char **argv, **envp = NULL; + int i, mode = 0; + + ok( p_environ != NULL, "Expected the pointer to _environ to be non-NULL\n" ); + if (p_environ) + ok( *p_environ != NULL, "Expected _environ to be initialized on startup\n" ); + + if (!p_environ || !*p_environ) + { + skip( "_environ pointers are not valid\n" ); + return; + } + + /* Note that msvcrt from Windows versions older than Vista + * expects the mode pointer parameter to be valid.*/ + __getmainargs(&argc, &argv, &envp, 0, &mode); + + ok( envp != NULL, "Expected initial environment block pointer to be non-NULL\n" ); + if (!envp) + { + skip( "Initial environment block pointer is not valid\n" ); + return; + } + + for (i = 0; ; i++) + { + if ((*p_environ)[i]) + { + ok( envp[i] != NULL, "Expected environment block pointer element to be non-NULL\n" ); + ok( !strcmp((*p_environ)[i], envp[i]), + "Expected _environ and environment block pointer strings (%s vs. %s) to match\n", + (*p_environ)[i], envp[i] ); + } + else + { + ok( !envp[i], "Expected environment block pointer element to be NULL, got %p\n", envp[i] ); + break; + } + } +} + +static void test__wenviron(void) +{ + int argc; + char **argv, **envp = NULL; + WCHAR **wargv, **wenvp = NULL; + int i, mode = 0; + + ok( p_wenviron != NULL, "Expected the pointer to _wenviron to be non-NULL\n" ); + if (p_wenviron) + ok( *p_wenviron == NULL, "Expected _wenviron to be NULL, got %p\n", *p_wenviron ); + else + { + skip( "Pointer to _wenviron is not valid\n" ); + return; + } + + /* __getmainargs doesn't initialize _wenviron. */ + __getmainargs(&argc, &argv, &envp, 0, &mode); + + ok( *p_wenviron == NULL, "Expected _wenviron to be NULL, got %p\n", *p_wenviron); + ok( envp != NULL, "Expected initial environment block pointer to be non-NULL\n" ); + if (!envp) + { + skip( "Initial environment block pointer is not valid\n" ); + return; + } + + /* Neither does calling the non-Unicode environment manipulation functions. */ + ok( _putenv("cat=dog") == 0, "failed setting cat=dog\n" ); + ok( *p_wenviron == NULL, "Expected _wenviron to be NULL, got %p\n", *p_wenviron); + ok( _putenv("cat=") == 0, "failed deleting cat\n" ); + + /* _wenviron isn't initialized until __wgetmainargs is called or + * one of the Unicode environment manipulation functions is called. */ + __wgetmainargs(&argc, &wargv, &wenvp, 0, &mode); + + ok( *p_wenviron != NULL, "Expected _wenviron to be non-NULL\n" ); + ok( wenvp != NULL, "Expected initial environment block pointer to be non-NULL\n" ); + if (!wenvp) + { + skip( "Initial environment block pointer is not valid\n" ); + return; + } + + for (i = 0; ; i++) + { + if ((*p_wenviron)[i]) + { + ok( wenvp[i] != NULL, "Expected environment block pointer element to be non-NULL\n" ); + ok( !winetest_strcmpW((*p_wenviron)[i], wenvp[i]), + "Expected _wenviron and environment block pointer strings (%s vs. %s) to match\n", + wine_dbgstr_w((*p_wenviron)[i]), wine_dbgstr_w(wenvp[i]) ); + } + else + { + ok( !wenvp[i], "Expected environment block pointer element to be NULL, got %p\n", wenvp[i] ); + break; + } + } +} + +static void test_environment_manipulation(void) { ok( _putenv("cat=") == 0, "_putenv failed on deletion of nonexistent environment variable\n" ); ok( _putenv("cat=dog") == 0, "failed setting cat=dog\n" ); @@ -63,6 +182,16 @@ START_TEST(environ) ok( _putenv(a_very_long_env_string) == 0, "_putenv failed for long environment string\n"); ok( getenv("nonexistent") == NULL, "getenv should fail with nonexistent var name\n" ); +} + +START_TEST(environ) +{ + init(); + /* The environ tests should always be run first, as they assume + * that the process has not manipulated the environment. */ + test__environ(); + test__wenviron(); + test_environment_manipulation(); test_system(); }

1 0

Henri Verbeet : wined3d: Pass a wined3d_state structure to device_preload_texture().
by Alexandre Julliard 30 Sep '10

30 Sep '10

Module: wine Branch: master Commit: 5097623dcfbddcce049be54957bf66bae7547803 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5097623dcfbddcce049be5495… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 30 11:44:27 2010 +0200 wined3d: Pass a wined3d_state structure to device_preload_texture(). --- dlls/wined3d/device.c | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index cf50ce8..ea4f69e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -453,20 +453,19 @@ void device_update_stream_info(IWineD3DDeviceImpl *device, const struct wined3d_ } } -static void device_preload_texture(IWineD3DStateBlockImpl *stateblock, unsigned int idx) +static void device_preload_texture(const struct wined3d_state *state, unsigned int idx) { IWineD3DBaseTextureImpl *texture; enum WINED3DSRGB srgb; - if (!(texture = stateblock->state.textures[idx])) return; - srgb = stateblock->state.sampler_states[idx][WINED3DSAMP_SRGBTEXTURE] ? SRGB_SRGB : SRGB_RGB; + if (!(texture = state->textures[idx])) return; + srgb = state->sampler_states[idx][WINED3DSAMP_SRGBTEXTURE] ? SRGB_SRGB : SRGB_RGB; texture->baseTexture.internal_preload((IWineD3DBaseTexture *)texture, srgb); } void device_preload_textures(IWineD3DDeviceImpl *device) { - IWineD3DStateBlockImpl *stateblock = device->stateBlock; - const struct wined3d_state *state = &stateblock->state; + const struct wined3d_state *state = &device->stateBlock->state; unsigned int i; if (use_vs(state)) @@ -474,7 +473,7 @@ void device_preload_textures(IWineD3DDeviceImpl *device) for (i = 0; i < MAX_VERTEX_SAMPLERS; ++i) { if (state->vertex_shader->baseShader.reg_maps.sampler_type[i]) - device_preload_texture(stateblock, MAX_FRAGMENT_SAMPLERS + i); + device_preload_texture(state, MAX_FRAGMENT_SAMPLERS + i); } } @@ -483,7 +482,7 @@ void device_preload_textures(IWineD3DDeviceImpl *device) for (i = 0; i < MAX_FRAGMENT_SAMPLERS; ++i) { if (state->pixel_shader->baseShader.reg_maps.sampler_type[i]) - device_preload_texture(stateblock, i); + device_preload_texture(state, i); } } else @@ -493,7 +492,7 @@ void device_preload_textures(IWineD3DDeviceImpl *device) for (i = 0; ffu_map; ffu_map >>= 1, ++i) { if (ffu_map & 1) - device_preload_texture(stateblock, i); + device_preload_texture(state, i); } } }

1 0

Henri Verbeet : wined3d: Pass a wined3d_gl_info structure to send_attribute ().
by Alexandre Julliard 30 Sep '10

30 Sep '10

Module: wine Branch: master Commit: c2363f750b90467b1797cf78438e421fd55d1a0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2363f750b90467b1797cf784… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 30 11:44:28 2010 +0200 wined3d: Pass a wined3d_gl_info structure to send_attribute(). --- dlls/wined3d/drawprim.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 2e032c3..cc3cf40 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -306,11 +306,9 @@ static void drawStridedSlow(IWineD3DDevice *iface, const struct wined3d_context } /* GL locking is done by the caller */ -static inline void send_attribute(IWineD3DDeviceImpl *This, +static inline void send_attribute(const struct wined3d_gl_info *gl_info, enum wined3d_format_id format, const UINT index, const void *ptr) { - const struct wined3d_gl_info *gl_info = &This->adapter->gl_info; - switch(format) { case WINED3DFMT_R32_FLOAT: @@ -469,7 +467,7 @@ static void drawStridedSlowVs(IWineD3DDevice *iface, const struct wined3d_stream + si->elements[i].stride * SkipnStrides + stateblock->state.streams[si->elements[i].stream_idx].offset; - send_attribute(This, si->elements[i].format->id, i, ptr); + send_attribute(gl_info, si->elements[i].format->id, i, ptr); } SkipnStrides++; } @@ -486,6 +484,7 @@ static inline void drawStridedInstanced(IWineD3DDevice *iface, const struct wine int numInstancedAttribs = 0, j; UINT instancedData[sizeof(si->elements) / sizeof(*si->elements) /* 16 */]; IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; + const struct wined3d_gl_info *gl_info = &This->adapter->gl_info; IWineD3DStateBlockImpl *stateblock = This->stateBlock; if (!idxSize) @@ -542,7 +541,7 @@ static inline void drawStridedInstanced(IWineD3DDevice *iface, const struct wine ptr += (ULONG_PTR)buffer_get_sysmem(vb, &This->adapter->gl_info); } - send_attribute(This, si->elements[instancedData[j]].format->id, instancedData[j], ptr); + send_attribute(gl_info, si->elements[instancedData[j]].format->id, instancedData[j], ptr); } glDrawElements(glPrimitiveType, numberOfVertices, idxSize == 2 ? GL_UNSIGNED_SHORT : GL_UNSIGNED_INT,

1 0

Henri Verbeet : wined3d: Remove the useless device parameter to drawStridedFast().
by Alexandre Julliard 30 Sep '10

30 Sep '10

Module: wine Branch: master Commit: f065a5e54b862fc7038bb7cea855f15ad6996bed URL: http://source.winehq.org/git/wine.git/?a=commit;h=f065a5e54b862fc7038bb7cea… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 30 11:44:29 2010 +0200 wined3d: Remove the useless device parameter to drawStridedFast(). --- dlls/wined3d/drawprim.c | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index cc3cf40..f99239d 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -33,13 +33,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_draw); #include <math.h> /* GL locking is done by the caller */ -static void drawStridedFast(IWineD3DDevice *iface, GLenum primitive_type, - UINT count, UINT idx_size, const void *idx_data, UINT start_idx) +static void drawStridedFast(GLenum primitive_type, UINT count, UINT idx_size, const void *idx_data, UINT start_idx) { if (idx_size) { - TRACE("(%p) : glElements(%x, %d, ...)\n", iface, primitive_type, count); - glDrawElements(primitive_type, count, idx_size == 2 ? GL_UNSIGNED_SHORT : GL_UNSIGNED_INT, (const char *)idx_data + (idx_size * start_idx)); @@ -47,8 +44,6 @@ static void drawStridedFast(IWineD3DDevice *iface, GLenum primitive_type, } else { - TRACE("(%p) : glDrawArrays(%#x, %d, %d)\n", iface, primitive_type, start_idx, count); - glDrawArrays(primitive_type, start_idx, count); checkGLcall("glDrawArrays"); } @@ -722,7 +717,7 @@ void drawPrimitive(IWineD3DDevice *iface, UINT index_count, UINT StartIdx, UINT drawStridedInstanced(iface, &This->strided_streams, index_count, glPrimType, idxData, idxSize, StartIdx); } else { - drawStridedFast(iface, glPrimType, index_count, idxSize, idxData, StartIdx); + drawStridedFast(glPrimType, index_count, idxSize, idxData, StartIdx); } }

1 0

Henri Verbeet : wined3d: Pass gl_info and state parameters directly to drawStridedSlowVs().
by Alexandre Julliard 30 Sep '10

30 Sep '10

Module: wine Branch: master Commit: 132158cbf5f435466f059bbe3910a04d2a45757f URL: http://source.winehq.org/git/wine.git/?a=commit;h=132158cbf5f435466f059bbe3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 30 11:44:30 2010 +0200 wined3d: Pass gl_info and state parameters directly to drawStridedSlowVs(). --- dlls/wined3d/drawprim.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index f99239d..2441e4c 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -411,17 +411,15 @@ static inline void send_attribute(const struct wined3d_gl_info *gl_info, } /* GL locking is done by the caller */ -static void drawStridedSlowVs(IWineD3DDevice *iface, const struct wined3d_stream_info *si, UINT numberOfVertices, - GLenum glPrimitiveType, const void *idxData, UINT idxSize, UINT startIdx) +static void drawStridedSlowVs(const struct wined3d_gl_info *gl_info, const struct wined3d_state *state, + const struct wined3d_stream_info *si, UINT numberOfVertices, GLenum glPrimitiveType, + const void *idxData, UINT idxSize, UINT startIdx) { - IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; - const struct wined3d_gl_info *gl_info = &This->adapter->gl_info; - LONG SkipnStrides = startIdx + This->stateBlock->state.load_base_vertex_index; + LONG SkipnStrides = startIdx + state->load_base_vertex_index; const DWORD *pIdxBufL = NULL; const WORD *pIdxBufS = NULL; UINT vx_index; int i; - IWineD3DStateBlockImpl *stateblock = This->stateBlock; const BYTE *ptr; if (idxSize) @@ -431,7 +429,7 @@ static void drawStridedSlowVs(IWineD3DDevice *iface, const struct wined3d_stream * supported or other reason), or with user pointer drawing idxData * will be non-NULL. */ if (!idxData) - idxData = buffer_get_sysmem(This->stateBlock->state.index_buffer, gl_info); + idxData = buffer_get_sysmem(state->index_buffer, gl_info); if (idxSize == 2) pIdxBufS = idxData; else pIdxBufL = idxData; @@ -449,18 +447,17 @@ static void drawStridedSlowVs(IWineD3DDevice *iface, const struct wined3d_stream { /* Indexed so work out the number of strides to skip */ if (idxSize == 2) - SkipnStrides = pIdxBufS[startIdx + vx_index] + stateblock->state.load_base_vertex_index; + SkipnStrides = pIdxBufS[startIdx + vx_index] + state->load_base_vertex_index; else - SkipnStrides = pIdxBufL[startIdx + vx_index] + stateblock->state.load_base_vertex_index; + SkipnStrides = pIdxBufL[startIdx + vx_index] + state->load_base_vertex_index; } for (i = MAX_ATTRIBS - 1; i >= 0; i--) { if (!(si->use_map & (1 << i))) continue; - ptr = si->elements[i].data - + si->elements[i].stride * SkipnStrides - + stateblock->state.streams[si->elements[i].stream_idx].offset; + ptr = si->elements[i].data + si->elements[i].stride * SkipnStrides + + state->streams[si->elements[i].stream_idx].offset; send_attribute(gl_info, si->elements[i].format->id, i, ptr); } @@ -707,8 +704,11 @@ void drawPrimitive(IWineD3DDevice *iface, UINT index_count, UINT StartIdx, UINT } else { TRACE("Using immediate mode with vertex shaders for half float emulation\n"); } - drawStridedSlowVs(iface, stream_info, index_count, glPrimType, idxData, idxSize, StartIdx); - } else { + drawStridedSlowVs(context->gl_info, state, stream_info, + index_count, glPrimType, idxData, idxSize, StartIdx); + } + else + { drawStridedSlow(iface, context, stream_info, index_count, glPrimType, idxData, idxSize, StartIdx); }

1 0

Frédéric Delanoy : inetcpl.cpl: Update French translation.
by Alexandre Julliard 30 Sep '10

30 Sep '10

Module: wine Branch: master Commit: 4bf30d130fbe2ad7e19ab0adcd3da713111702f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bf30d130fbe2ad7e19ab0adc… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Sep 29 22:35:34 2010 +0200 inetcpl.cpl: Update French translation. --- dlls/inetcpl.cpl/cpl_Fr.rc | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/inetcpl.cpl/cpl_Fr.rc b/dlls/inetcpl.cpl/cpl_Fr.rc index aeedb73..5772321 100644 --- a/dlls/inetcpl.cpl/cpl_Fr.rc +++ b/dlls/inetcpl.cpl/cpl_Fr.rc @@ -32,3 +32,18 @@ BEGIN IDS_CPL_NAME "Paramètres Internet" IDS_CPL_INFO "Configurer le navigateur internet de Wine et d'autres paramètres associés" END + +/* "Content" propsheet */ +IDD_CONTENT DIALOG 0, 0, 320, 220 +STYLE WS_CAPTION | WS_CHILD | WS_DISABLED +FONT 8, "MS Shell Dlg" +CAPTION "Content" +BEGIN + + GROUPBOX " Certificats ", IDC_STATIC, 4, 4, 312, 50 + LTEXT "Les certificats sont utilisés pour votre identification personnelle, celle d'autorités de certification ou d'éditeurs.", + IDC_STATIC, 58, 14, 252, 18 + PUSHBUTTON "Certificats...", IDC_CERT, 146, 34, 80, 14 + PUSHBUTTON "Éditeurs...", IDC_CERT_PUBLISHER, 230, 34, 80, 14 + +END

1 0

Detlef Riekenberg : inetcpl: Remove a space from a button label.
by Alexandre Julliard 30 Sep '10

30 Sep '10

Module: wine Branch: master Commit: ddb033b7c022a475ce4ba26dfbb1babbdfae0dcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddb033b7c022a475ce4ba26df… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Sep 29 22:59:13 2010 +0200 inetcpl: Remove a space from a button label. --- dlls/inetcpl.cpl/cpl_De.rc | 2 +- dlls/inetcpl.cpl/cpl_En.rc | 2 +- dlls/inetcpl.cpl/cpl_It.rc | 2 +- dlls/inetcpl.cpl/cpl_Ko.rc | 2 +- dlls/inetcpl.cpl/cpl_Lt.rc | 2 +- dlls/inetcpl.cpl/cpl_Sv.rc | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/inetcpl.cpl/cpl_De.rc b/dlls/inetcpl.cpl/cpl_De.rc index a5280a2..ecc2761 100644 --- a/dlls/inetcpl.cpl/cpl_De.rc +++ b/dlls/inetcpl.cpl/cpl_De.rc @@ -42,6 +42,6 @@ BEGIN LTEXT "Zertifikate werden benutzt, um sich persönlich, Zertifizierungsstellen und Herausgeber von Zertifikaten zu identifizieren.", IDC_STATIC, 58, 14, 252, 18 PUSHBUTTON "Zertifikate...", IDC_CERT, 146, 34, 80, 14 - PUSHBUTTON "Herausgeber... ", IDC_CERT_PUBLISHER, 230, 34, 80, 14 + PUSHBUTTON "Herausgeber...", IDC_CERT_PUBLISHER, 230, 34, 80, 14 END diff --git a/dlls/inetcpl.cpl/cpl_En.rc b/dlls/inetcpl.cpl/cpl_En.rc index 651755d..f463df7 100644 --- a/dlls/inetcpl.cpl/cpl_En.rc +++ b/dlls/inetcpl.cpl/cpl_En.rc @@ -40,6 +40,6 @@ BEGIN LTEXT "Certificates are used for your personal identification and to identify certificate authorities and publishers.", IDC_STATIC, 58, 14, 252, 18 PUSHBUTTON "Certificates...", IDC_CERT, 146, 34, 80, 14 - PUSHBUTTON "Publishers... ", IDC_CERT_PUBLISHER, 230, 34, 80, 14 + PUSHBUTTON "Publishers...", IDC_CERT_PUBLISHER, 230, 34, 80, 14 END diff --git a/dlls/inetcpl.cpl/cpl_It.rc b/dlls/inetcpl.cpl/cpl_It.rc index 629a1e3..6be9341 100644 --- a/dlls/inetcpl.cpl/cpl_It.rc +++ b/dlls/inetcpl.cpl/cpl_It.rc @@ -43,6 +43,6 @@ BEGIN LTEXT "I certificati sono usati per la tua identificazione personale e per identificare le autorità e gli editori dei certificati.", IDC_STATIC, 58, 14, 252, 18 PUSHBUTTON "Certificati...", IDC_CERT, 146, 34, 80, 14 - PUSHBUTTON "Editori... ", IDC_CERT_PUBLISHER, 230, 34, 80, 14 + PUSHBUTTON "Editori...", IDC_CERT_PUBLISHER, 230, 34, 80, 14 END diff --git a/dlls/inetcpl.cpl/cpl_Ko.rc b/dlls/inetcpl.cpl/cpl_Ko.rc index ffcceb0..6301701 100644 --- a/dlls/inetcpl.cpl/cpl_Ko.rc +++ b/dlls/inetcpl.cpl/cpl_Ko.rc @@ -43,6 +43,6 @@ BEGIN LTEXT " 인증서는 당신의 개인 식별과 인증기관과 게시자 식별에 사용됩니다.", IDC_STATIC, 58, 14, 252, 18 PUSHBUTTON "인증서...", IDC_CERT, 146, 34, 80, 14 - PUSHBUTTON "발행자... ", IDC_CERT_PUBLISHER, 230, 34, 80, 14 + PUSHBUTTON "발행자...", IDC_CERT_PUBLISHER, 230, 34, 80, 14 END diff --git a/dlls/inetcpl.cpl/cpl_Lt.rc b/dlls/inetcpl.cpl/cpl_Lt.rc index f180133..0eda833 100644 --- a/dlls/inetcpl.cpl/cpl_Lt.rc +++ b/dlls/inetcpl.cpl/cpl_Lt.rc @@ -43,6 +43,6 @@ BEGIN LTEXT "Liudijimai yra naudojami jūsų tapatumo nustatymui ir liudijimo įstaigų bei publikuotojų tapatumui nustatyti.", IDC_STATIC, 58, 14, 252, 18 PUSHBUTTON "Liudijimai...", IDC_CERT, 146, 34, 80, 14 - PUSHBUTTON "Publikuotojai... ", IDC_CERT_PUBLISHER, 230, 34, 80, 14 + PUSHBUTTON "Publikuotojai...", IDC_CERT_PUBLISHER, 230, 34, 80, 14 END diff --git a/dlls/inetcpl.cpl/cpl_Sv.rc b/dlls/inetcpl.cpl/cpl_Sv.rc index d825097..102f934 100644 --- a/dlls/inetcpl.cpl/cpl_Sv.rc +++ b/dlls/inetcpl.cpl/cpl_Sv.rc @@ -42,6 +42,6 @@ BEGIN LTEXT "Certifikat används för din personliga identifikation samt för att identifiera certifikats-auktoriteter och -utgivare.", IDC_STATIC, 58, 14, 252, 18 PUSHBUTTON "Certifikat...", IDC_CERT, 146, 34, 80, 14 - PUSHBUTTON "Utgivare... ", IDC_CERT_PUBLISHER, 230, 34, 80, 14 + PUSHBUTTON "Utgivare...", IDC_CERT_PUBLISHER, 230, 34, 80, 14 END

1 0

Stefan Leichter : setupapi: Added more tests for SetupDiGetINFClassA.
by Alexandre Julliard 30 Sep '10

30 Sep '10

Module: wine Branch: master Commit: 637fd3735ae7531468b5ee814fc61a32e3b4f313 URL: http://source.winehq.org/git/wine.git/?a=commit;h=637fd3735ae7531468b5ee814… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Wed Sep 29 23:05:03 2010 +0200 setupapi: Added more tests for SetupDiGetINFClassA. --- dlls/setupapi/tests/devinst.c | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 21fbb01..7005ef0 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -1443,11 +1443,32 @@ static void testSetupDiGetINFClassA(void) WritePrivateProfileStringA("Version", "Class", "WINE", filename); + count = 0xdeadbeef; retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); ok(retval, "expected SetupDiGetINFClassA to succeed! error %u\n", GetLastError()); + ok(count == 5, "expected count==5, got %u\n", count); + + count = 0xdeadbeef; + retval = SetupDiGetINFClassA(filename, &guid, cn, 5, &count); + ok(retval, "expected SetupDiGetINFClassA to succeed! error %u\n", GetLastError()); + ok(count == 5, "expected count==5, got %u\n", count); + + count = 0xdeadbeef; + SetLastError(0xdeadbeef); + retval = SetupDiGetINFClassA(filename, &guid, cn, 4, &count); + ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); + ok(ERROR_INSUFFICIENT_BUFFER == GetLastError(), + "expected error ERROR_INSUFFICIENT_BUFFER, got %u\n", GetLastError()); + ok(count == 5, "expected count==5, got %u\n", count); /* invalid parameter */ SetLastError(0xdeadbeef); + retval = SetupDiGetINFClassA(NULL, &guid, cn, MAX_PATH, &count); + ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); + ok(ERROR_INVALID_PARAMETER == GetLastError(), + "expected error ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); retval = SetupDiGetINFClassA(filename, NULL, cn, MAX_PATH, &count); ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); ok(ERROR_INVALID_PARAMETER == GetLastError(), @@ -1485,8 +1506,10 @@ static void testSetupDiGetINFClassA(void) "{4d36e972-e325-11ce-bfc1-08002be10318}", filename); /* this test succeeds only if the guid is known to the system */ + count = 0xdeadbeef; retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); ok(retval, "expected SetupDiGetINFClassA to succeed! error %u\n", GetLastError()); + ok(count == 4, "expected count==4, got %u(%s)\n", count, cn); DeleteFileA(filename); }

1 0