September 2009 - Wine-commits

Henri Verbeet : wined3d: Add a separate function for copying stateblock values.
by Alexandre Julliard 30 Sep '09

30 Sep '09

Module: wine Branch: master Commit: 345b329217f0279f899d2311fc4ca974bdb91322 URL: http://source.winehq.org/git/wine.git/?a=commit;h=345b329217f0279f899d2311f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 30 10:49:11 2009 +0200 wined3d: Add a separate function for copying stateblock values. --- dlls/wined3d/stateblock.c | 30 +++++++++++++++++++----------- 1 files changed, 19 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index e568ec6..c637de0 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -164,20 +164,11 @@ static void stateblock_savedstates_set(SAVEDSTATES *states, BOOL value, const st memset(states->vertexShaderConstantsF, value, sizeof(BOOL) * gl_info->max_vshader_constantsF); } -static void stateblock_copy(IWineD3DStateBlockImpl *dst, const IWineD3DStateBlockImpl *src) +static void stateblock_copy_values(IWineD3DStateBlockImpl *dst, const IWineD3DStateBlockImpl *src, + const struct wined3d_gl_info *gl_info) { - const struct wined3d_gl_info *gl_info = &src->wineD3DDevice->adapter->gl_info; unsigned int l; - dst->lpVtbl = src->lpVtbl; - dst->ref = src->ref; - dst->parent = src->parent; - dst->wineD3DDevice = src->wineD3DDevice; - dst->blockType = src->blockType; - - /* Saved states */ - stateblock_savedstates_copy(&dst->changed, &src->changed, gl_info); - /* Single items */ dst->gl_primitive_type = src->gl_primitive_type; dst->vertexDecl = src->vertexDecl; @@ -237,6 +228,23 @@ static void stateblock_copy(IWineD3DStateBlockImpl *dst, const IWineD3DStateBloc memcpy(dst->pixelShaderConstantF, src->pixelShaderConstantF, sizeof(float) * gl_info->max_pshader_constantsF * 4); } +static void stateblock_copy(IWineD3DStateBlockImpl *dst, const IWineD3DStateBlockImpl *src) +{ + const struct wined3d_gl_info *gl_info = &src->wineD3DDevice->adapter->gl_info; + + dst->lpVtbl = src->lpVtbl; + dst->ref = src->ref; + dst->parent = src->parent; + dst->wineD3DDevice = src->wineD3DDevice; + dst->blockType = src->blockType; + + /* Saved states */ + stateblock_savedstates_copy(&dst->changed, &src->changed, gl_info); + + /* Saved values */ + stateblock_copy_values(dst, src, gl_info); +} + /********************************************************** * IWineD3DStateBlockImpl IUnknown parts follows **********************************************************/

1 0

Henri Verbeet : wined3d: Get rid of stateblock_copy().
by Alexandre Julliard 30 Sep '09

30 Sep '09

Module: wine Branch: master Commit: 5f3425b89b4e2bc2ae045b4b6a0b18e8d0954f2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f3425b89b4e2bc2ae045b4b6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 30 10:49:12 2009 +0200 wined3d: Get rid of stateblock_copy(). --- dlls/wined3d/stateblock.c | 34 +++++++++++----------------------- 1 files changed, 11 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index c637de0..eb2780a 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -228,23 +228,6 @@ static void stateblock_copy_values(IWineD3DStateBlockImpl *dst, const IWineD3DSt memcpy(dst->pixelShaderConstantF, src->pixelShaderConstantF, sizeof(float) * gl_info->max_pshader_constantsF * 4); } -static void stateblock_copy(IWineD3DStateBlockImpl *dst, const IWineD3DStateBlockImpl *src) -{ - const struct wined3d_gl_info *gl_info = &src->wineD3DDevice->adapter->gl_info; - - dst->lpVtbl = src->lpVtbl; - dst->ref = src->ref; - dst->parent = src->parent; - dst->wineD3DDevice = src->wineD3DDevice; - dst->blockType = src->blockType; - - /* Saved states */ - stateblock_savedstates_copy(&dst->changed, &src->changed, gl_info); - - /* Saved values */ - stateblock_copy_values(dst, src, gl_info); -} - /********************************************************** * IWineD3DStateBlockImpl IUnknown parts follows **********************************************************/ @@ -1387,13 +1370,18 @@ HRESULT stateblock_init(IWineD3DStateBlockImpl *stateblock, IWineD3DDeviceImpl * if (type == WINED3DSBT_INIT || type == WINED3DSBT_RECORDED) return WINED3D_OK; /* Otherwise, might as well set the whole state block to the appropriate values */ - if (device->stateBlock) stateblock_copy(stateblock, device->stateBlock); - else memset(stateblock->streamFreq, 1, sizeof(stateblock->streamFreq)); + if (device->stateBlock) + { + /* Saved states */ + stateblock_savedstates_copy(&stateblock->changed, &device->stateBlock->changed, gl_info); - /* Reset the ref and type after kludging it. */ - stateblock->wineD3DDevice = device; - stateblock->ref = 1; - stateblock->blockType = type; + /* Saved values */ + stateblock_copy_values(stateblock, device->stateBlock, gl_info); + } + else + { + memset(stateblock->streamFreq, 1, sizeof(stateblock->streamFreq)); + } TRACE("Updating changed flags appropriate for type %#x.\n", type);

1 0

Henri Verbeet : wined3d: Add a separate function for initializing the " contained_*" fields from the "changed" field.
by Alexandre Julliard 30 Sep '09

30 Sep '09

Module: wine Branch: master Commit: be0b7355fcf4a3f16bb23a829d74a084f84e7fe1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be0b7355fcf4a3f16bb23a829… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 30 10:49:13 2009 +0200 wined3d: Add a separate function for initializing the "contained_*" fields from the "changed" field. --- dlls/wined3d/device.c | 89 +------------------------------- dlls/wined3d/stateblock.c | 112 ++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 114 insertions(+), 88 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 60bd37d..fc67dec 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4406,7 +4406,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_BeginStateBlock(IWineD3DDevice *iface) static HRESULT WINAPI IWineD3DDeviceImpl_EndStateBlock(IWineD3DDevice *iface, IWineD3DStateBlock** ppStateBlock) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - unsigned int i, j; IWineD3DStateBlockImpl *object = This->updateStateBlock; if (!This->isRecordingState) { @@ -4415,93 +4414,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_EndStateBlock(IWineD3DDevice *iface, IW return WINED3DERR_INVALIDCALL; } - for (i = 0; i <= WINEHIGHEST_RENDER_STATE >> 5; ++i) - { - DWORD map = object->changed.renderState[i]; - for (j = 0; map; map >>= 1, ++j) - { - if (!(map & 1)) continue; - - object->contained_render_states[object->num_contained_render_states++] = (i << 5) | j; - } - } - - for (i = 0; i <= HIGHEST_TRANSFORMSTATE >> 5; ++i) - { - DWORD map = object->changed.transform[i]; - for (j = 0; map; map >>= 1, ++j) - { - if (!(map & 1)) continue; - - object->contained_transform_states[object->num_contained_transform_states++] = (i << 5) | j; - } - } - for(i = 0; i < GL_LIMITS(vshader_constantsF); i++) { - if(object->changed.vertexShaderConstantsF[i]) { - object->contained_vs_consts_f[object->num_contained_vs_consts_f] = i; - object->num_contained_vs_consts_f++; - } - } - for(i = 0; i < MAX_CONST_I; i++) { - if (object->changed.vertexShaderConstantsI & (1 << i)) - { - object->contained_vs_consts_i[object->num_contained_vs_consts_i] = i; - object->num_contained_vs_consts_i++; - } - } - for(i = 0; i < MAX_CONST_B; i++) { - if (object->changed.vertexShaderConstantsB & (1 << i)) - { - object->contained_vs_consts_b[object->num_contained_vs_consts_b] = i; - object->num_contained_vs_consts_b++; - } - } - for (i = 0; i < GL_LIMITS(pshader_constantsF); ++i) - { - if (object->changed.pixelShaderConstantsF[i]) - { - object->contained_ps_consts_f[object->num_contained_ps_consts_f] = i; - ++object->num_contained_ps_consts_f; - } - } - for(i = 0; i < MAX_CONST_I; i++) { - if (object->changed.pixelShaderConstantsI & (1 << i)) - { - object->contained_ps_consts_i[object->num_contained_ps_consts_i] = i; - object->num_contained_ps_consts_i++; - } - } - for(i = 0; i < MAX_CONST_B; i++) { - if (object->changed.pixelShaderConstantsB & (1 << i)) - { - object->contained_ps_consts_b[object->num_contained_ps_consts_b] = i; - object->num_contained_ps_consts_b++; - } - } - for(i = 0; i < MAX_TEXTURES; i++) { - DWORD map = object->changed.textureState[i]; - - for(j = 0; map; map >>= 1, ++j) - { - if (!(map & 1)) continue; - - object->contained_tss_states[object->num_contained_tss_states].stage = i; - object->contained_tss_states[object->num_contained_tss_states].state = j; - ++object->num_contained_tss_states; - } - } - for(i = 0; i < MAX_COMBINED_SAMPLERS; i++){ - DWORD map = object->changed.samplerState[i]; - - for (j = 0; map; map >>= 1, ++j) - { - if (!(map & 1)) continue; - - object->contained_sampler_states[object->num_contained_sampler_states].stage = i; - object->contained_sampler_states[object->num_contained_sampler_states].state = j; - ++object->num_contained_sampler_states; - } - } + stateblock_init_contained_states(object); *ppStateBlock = (IWineD3DStateBlock*) object; This->isRecordingState = FALSE; diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index eb2780a..4034f1a 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -228,6 +228,118 @@ static void stateblock_copy_values(IWineD3DStateBlockImpl *dst, const IWineD3DSt memcpy(dst->pixelShaderConstantF, src->pixelShaderConstantF, sizeof(float) * gl_info->max_pshader_constantsF * 4); } +void stateblock_init_contained_states(IWineD3DStateBlockImpl *stateblock) +{ + const struct wined3d_gl_info *gl_info = &stateblock->wineD3DDevice->adapter->gl_info; + unsigned int i, j; + + for (i = 0; i <= WINEHIGHEST_RENDER_STATE >> 5; ++i) + { + DWORD map = stateblock->changed.renderState[i]; + for (j = 0; map; map >>= 1, ++j) + { + if (!(map & 1)) continue; + + stateblock->contained_render_states[stateblock->num_contained_render_states] = (i << 5) | j; + ++stateblock->num_contained_render_states; + } + } + + for (i = 0; i <= HIGHEST_TRANSFORMSTATE >> 5; ++i) + { + DWORD map = stateblock->changed.transform[i]; + for (j = 0; map; map >>= 1, ++j) + { + if (!(map & 1)) continue; + + stateblock->contained_transform_states[stateblock->num_contained_transform_states] = (i << 5) | j; + ++stateblock->num_contained_transform_states; + } + } + + for (i = 0; i < gl_info->max_vshader_constantsF; ++i) + { + if (stateblock->changed.vertexShaderConstantsF[i]) + { + stateblock->contained_vs_consts_f[stateblock->num_contained_vs_consts_f] = i; + ++stateblock->num_contained_vs_consts_f; + } + } + + for (i = 0; i < MAX_CONST_I; ++i) + { + if (stateblock->changed.vertexShaderConstantsI & (1 << i)) + { + stateblock->contained_vs_consts_i[stateblock->num_contained_vs_consts_i] = i; + ++stateblock->num_contained_vs_consts_i; + } + } + + for (i = 0; i < MAX_CONST_B; ++i) + { + if (stateblock->changed.vertexShaderConstantsB & (1 << i)) + { + stateblock->contained_vs_consts_b[stateblock->num_contained_vs_consts_b] = i; + ++stateblock->num_contained_vs_consts_b; + } + } + + for (i = 0; i < gl_info->max_pshader_constantsF; ++i) + { + if (stateblock->changed.pixelShaderConstantsF[i]) + { + stateblock->contained_ps_consts_f[stateblock->num_contained_ps_consts_f] = i; + ++stateblock->num_contained_ps_consts_f; + } + } + + for (i = 0; i < MAX_CONST_I; ++i) + { + if (stateblock->changed.pixelShaderConstantsI & (1 << i)) + { + stateblock->contained_ps_consts_i[stateblock->num_contained_ps_consts_i] = i; + ++stateblock->num_contained_ps_consts_i; + } + } + + for (i = 0; i < MAX_CONST_B; ++i) + { + if (stateblock->changed.pixelShaderConstantsB & (1 << i)) + { + stateblock->contained_ps_consts_b[stateblock->num_contained_ps_consts_b] = i; + ++stateblock->num_contained_ps_consts_b; + } + } + + for (i = 0; i < MAX_TEXTURES; ++i) + { + DWORD map = stateblock->changed.textureState[i]; + + for(j = 0; map; map >>= 1, ++j) + { + if (!(map & 1)) continue; + + stateblock->contained_tss_states[stateblock->num_contained_tss_states].stage = i; + stateblock->contained_tss_states[stateblock->num_contained_tss_states].state = j; + ++stateblock->num_contained_tss_states; + } + } + + for (i = 0; i < MAX_COMBINED_SAMPLERS; ++i) + { + DWORD map = stateblock->changed.samplerState[i]; + + for (j = 0; map; map >>= 1, ++j) + { + if (!(map & 1)) continue; + + stateblock->contained_sampler_states[stateblock->num_contained_sampler_states].stage = i; + stateblock->contained_sampler_states[stateblock->num_contained_sampler_states].state = j; + ++stateblock->num_contained_sampler_states; + } + } +} + /********************************************************** * IWineD3DStateBlockImpl IUnknown parts follows **********************************************************/ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 044bae9..f48d791 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2354,6 +2354,7 @@ struct IWineD3DStateBlockImpl HRESULT stateblock_init(IWineD3DStateBlockImpl *stateblock, IWineD3DDeviceImpl *device, WINED3DSTATEBLOCKTYPE type, IUnknown *parent) DECLSPEC_HIDDEN; +void stateblock_init_contained_states(IWineD3DStateBlockImpl *object) DECLSPEC_HIDDEN; /* Direct3D terminology with little modifications. We do not have an issued state * because only the driver knows about it, but we have a created state because d3d

1 0

Dan Kegel : ntdll: Refactor test_NtQueryDirectoryFile to be table driven, check DIRECTORY attribute.
by Alexandre Julliard 30 Sep '09

30 Sep '09

Module: wine Branch: master Commit: ceb8577baba549118c3706140229f2661d0d9829 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ceb8577baba549118c3706140… Author: Dan Kegel <dank(a)kegel.com> Date: Tue Sep 29 08:56:20 2009 -0700 ntdll: Refactor test_NtQueryDirectoryFile to be table driven, check DIRECTORY attribute. --- dlls/ntdll/tests/directory.c | 213 +++++++++++++++++++++++------------------ 1 files changed, 119 insertions(+), 94 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ceb8577baba549118c370…

1 0

Juan Lang : server: Setting a process's affinity sets all of its threads' affinities too.
by Alexandre Julliard 30 Sep '09

30 Sep '09

Module: wine Branch: master Commit: 24036fe13a5bff131640a449c69329040e532871 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24036fe13a5bff131640a449c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Sep 29 09:15:02 2009 -0700 server: Setting a process's affinity sets all of its threads' affinities too. --- dlls/ntdll/tests/info.c | 2 -- server/process.c | 14 +++++++++++++- server/thread.c | 7 ++++++- server/thread.h | 1 + 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 69126fa..cc25513 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -946,7 +946,6 @@ static void test_affinity(void) /* Setting the process affinity changes the thread affinity to match */ status = pNtQueryInformationThread( GetCurrentThread(), ThreadBasicInformation, &tbi, sizeof(tbi), NULL ); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); - todo_wine ok( tbi.AffinityMask == 2, "Unexpected thread affinity\n" ); proc_affinity = (1 << si.dwNumberOfProcessors) - 1; @@ -955,7 +954,6 @@ static void test_affinity(void) /* Resetting the process affinity also resets the thread affinity */ status = pNtQueryInformationThread( GetCurrentThread(), ThreadBasicInformation, &tbi, sizeof(tbi), NULL ); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); - todo_wine ok( tbi.AffinityMask == (1 << si.dwNumberOfProcessors) - 1, "Unexpected thread affinity" ); } diff --git a/server/process.c b/server/process.c index 8df9f39..31d3527 100644 --- a/server/process.c +++ b/server/process.c @@ -1095,6 +1095,18 @@ DECL_HANDLER(get_process_info) } } +static void set_process_affinity( struct process *process, affinity_t affinity ) +{ + struct thread *thread; + + process->affinity = affinity; + + LIST_FOR_EACH_ENTRY( thread, &process->thread_list, struct thread, proc_entry ) + { + set_thread_affinity( thread, affinity ); + } +} + /* set information about a process */ DECL_HANDLER(set_process_info) { @@ -1103,7 +1115,7 @@ DECL_HANDLER(set_process_info) if ((process = get_process_from_handle( req->handle, PROCESS_SET_INFORMATION ))) { if (req->mask & SET_PROCESS_INFO_PRIORITY) process->priority = req->priority; - if (req->mask & SET_PROCESS_INFO_AFFINITY) process->affinity = req->affinity; + if (req->mask & SET_PROCESS_INFO_AFFINITY) set_process_affinity( process, req->affinity ); release_object( process ); } } diff --git a/server/thread.c b/server/thread.c index 2ea8929..8b367ca 100644 --- a/server/thread.c +++ b/server/thread.c @@ -404,6 +404,11 @@ struct thread *get_thread_from_pid( int pid ) return NULL; } +void set_thread_affinity( struct thread *thread, affinity_t affinity ) +{ + thread->affinity = affinity; +} + #define THREAD_PRIORITY_REALTIME_HIGHEST 6 #define THREAD_PRIORITY_REALTIME_LOWEST -7 @@ -428,7 +433,7 @@ static void set_thread_info( struct thread *thread, set_error( STATUS_INVALID_PARAMETER ); } if (req->mask & SET_THREAD_INFO_AFFINITY) - thread->affinity = req->affinity; + set_thread_affinity( thread, req->affinity ); if (req->mask & SET_THREAD_INFO_TOKEN) security_set_thread_token( thread, req->token ); } diff --git a/server/thread.h b/server/thread.h index b6c1cf5..90f6061 100644 --- a/server/thread.h +++ b/server/thread.h @@ -118,6 +118,7 @@ extern int thread_add_inflight_fd( struct thread *thread, int client, int server extern int thread_get_inflight_fd( struct thread *thread, int client ); extern struct thread_snapshot *thread_snap( int *count ); extern struct token *thread_get_impersonation_token( struct thread *thread ); +extern void set_thread_affinity( struct thread *thread, affinity_t affinity ); /* ptrace functions */

1 0

Juan Lang : server: Use kernel support for thread affinity when available.
by Alexandre Julliard 30 Sep '09

30 Sep '09

Module: wine Branch: master Commit: 474b2e4bfb46cf1bb8db0faa6ecfdb3fd157b117 URL: http://source.winehq.org/git/wine.git/?a=commit;h=474b2e4bfb46cf1bb8db0faa6… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Sep 29 09:17:30 2009 -0700 server: Use kernel support for thread affinity when available. --- configure | 1 + configure.ac | 1 + include/config.h.in | 3 +++ server/thread.c | 22 ++++++++++++++++++++++ 4 files changed, 27 insertions(+), 0 deletions(-) diff --git a/configure b/configure index ceb6e20..d05447a 100755 --- a/configure +++ b/configure @@ -12127,6 +12127,7 @@ for ac_func in \ pwrite \ readdir \ readlink \ + sched_setaffinity \ sched_yield \ select \ setproctitle \ diff --git a/configure.ac b/configure.ac index d489f00..27ae652 100644 --- a/configure.ac +++ b/configure.ac @@ -1692,6 +1692,7 @@ AC_CHECK_FUNCS(\ pwrite \ readdir \ readlink \ + sched_setaffinity \ sched_yield \ select \ setproctitle \ diff --git a/include/config.h.in b/include/config.h.in index d4bbce6..0be8f4d 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -645,6 +645,9 @@ /* Define to 1 if you have the <sched.h> header file. */ #undef HAVE_SCHED_H +/* Define to 1 if you have the `sched_setaffinity' function. */ +#undef HAVE_SCHED_SETAFFINITY + /* Define to 1 if you have the `sched_yield' function. */ #undef HAVE_SCHED_YIELD diff --git a/server/thread.c b/server/thread.c index 8b367ca..211cefe 100644 --- a/server/thread.c +++ b/server/thread.c @@ -35,6 +35,9 @@ #ifdef HAVE_POLL_H #include <poll.h> #endif +#ifdef HAVE_SCHED_H +#include <sched.h> +#endif #include "ntstatus.h" #define WIN32_NO_STATUS @@ -406,7 +409,26 @@ struct thread *get_thread_from_pid( int pid ) void set_thread_affinity( struct thread *thread, affinity_t affinity ) { +#ifdef HAVE_SCHED_SETAFFINITY + if (thread->unix_pid != -1) + { + cpu_set_t set; + int i; + affinity_t mask; + + CPU_ZERO( &set ); + for (i = 0, mask = 1; mask; i++, mask <<= 1) + if (affinity & mask) CPU_SET( i, &set ); + + if (!sched_setaffinity( thread->unix_pid, sizeof(set), &set )) + thread->affinity = affinity; + else + file_set_error(); + } + else set_error( STATUS_ACCESS_DENIED ); +#else thread->affinity = affinity; +#endif } #define THREAD_PRIORITY_REALTIME_HIGHEST 6

1 0

Damjan Jovanovic : sti.h: Define the IStilImageW interface.
by Alexandre Julliard 30 Sep '09

30 Sep '09

Module: wine Branch: master Commit: 9196e2ed213b39f3a6719203383534e3133acae9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9196e2ed213b39f3a67192033… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Wed Sep 30 07:53:35 2009 +0200 sti.h: Define the IStilImageW interface. --- include/sti.h | 113 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 113 insertions(+), 0 deletions(-) diff --git a/include/sti.h b/include/sti.h index cafdc6e..6b62436 100644 --- a/include/sti.h +++ b/include/sti.h @@ -49,9 +49,122 @@ DEFINE_GUID(IID_IStillImageA, 0xA7B1F740, 0x1D7F, 0x11D1, 0xAC, 0xA9, 0x00, 0xA0 typedef struct IStillImageA *PSTIA; typedef struct IStillImageW *PSTIW; DECL_WINELIB_TYPE_AW(PSTI) +typedef struct IStillImageA *LPSTILLIMAGEA; +typedef struct IStillImageW *LPSTILLIMAGEW; +DECL_WINELIB_TYPE_AW(LPSTILLIMAGE) +typedef struct IStiDeviceA *PSTIDEVICEA; +typedef struct IStiDeviceW *PSTIDEVICEW; +DECL_WINELIB_TYPE_AW(PSTIDEVICE) HRESULT WINAPI StiCreateInstanceA(HINSTANCE hinst, DWORD dwVer, PSTIA *ppSti, LPUNKNOWN pUnkOuter); HRESULT WINAPI StiCreateInstanceW(HINSTANCE hinst, DWORD dwVer, PSTIW *ppSti, LPUNKNOWN pUnkOuter); +#define StiCreateInstance WINELIB_NAME_AW(StiCreateInstance) + +typedef DWORD STI_DEVICE_TYPE; +typedef enum _STI_DEVICE_MJ_TYPE +{ + StiDeviceTypeDefault = 0, + StiDeviceTypeScanner = 1, + StiDeviceTypeDigitalCamera = 2, + StiDeviceTypeStreamingVideo = 3 +} STI_DEVICE_MJ_TYPE; + +#define GET_STIDEVICE_TYPE(dwDevType) HIWORD(dwDevType) +#define GET_STIDEVICE_SUBTYPE(dwDevType) LOWORD(dwDevType) + +typedef struct _STI_DEV_CAPS { + DWORD dwGeneric; +} STI_DEV_CAPS, *PSTI_DEV_CAPS; + +#define STI_MAX_INTERNAL_NAME_LENGTH 128 + +typedef struct _STI_DEVICE_INFORMATIONW { + DWORD dwSize; + STI_DEVICE_TYPE DeviceType; + WCHAR szDeviceInternalName[STI_MAX_INTERNAL_NAME_LENGTH]; + STI_DEV_CAPS DeviceCapabilities; + DWORD dwHardwareConfiguration; + LPWSTR pszVendorDescription; + LPWSTR pszDeviceDescription; + LPWSTR pszPortName; + LPWSTR pszPropProvider; + LPWSTR pszLocalName; +} STI_DEVICE_INFORMATIONW, *PSTI_DEVICE_INFORMATIONW; + +typedef STI_DEVICE_INFORMATIONW STI_DEVICE_INFORMATION; +typedef PSTI_DEVICE_INFORMATIONW PSTI_DEVICE_INFORMATION; + +#define MAX_NOTIFICATION_DATA 64 + +typedef struct _STINOTIFY { + DWORD dwSize; + GUID guidNotificationCode; + BYTE abNotificationData[MAX_NOTIFICATION_DATA]; +} STINOTIFY,*LPSTINOTIFY; + +#define INTERFACE IStillImageW +DECLARE_INTERFACE_(IStillImageW, IUnknown) +{ + /*** IUnknown methods ***/ + STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; + /*** IStillImageW methods ***/ + STDMETHOD(Initialize)(THIS_ HINSTANCE hinst, DWORD dwVersion) PURE; + STDMETHOD(GetDeviceList)(THIS_ DWORD dwType, DWORD dwFlags, DWORD *pdwItemsReturned, LPVOID *ppBuffer) PURE; + STDMETHOD(GetDeviceInfo)(THIS_ LPWSTR pwszDeviceName, LPVOID *ppBuffer) PURE; + STDMETHOD(CreateDevice)(THIS_ LPWSTR pwszDeviceName, DWORD dwMode, PSTIDEVICEW *pDevice, LPUNKNOWN pUnkOuter) PURE; + STDMETHOD(GetDeviceValue)(THIS_ LPWSTR pwszDeviceName, LPWSTR pValueName, LPDWORD pType, LPBYTE pData, LPDWORD cbData) PURE; + STDMETHOD(SetDeviceValue)(THIS_ LPWSTR pwszDeviceName, LPWSTR pValueName, DWORD type, LPBYTE pData, DWORD cbData) PURE; + STDMETHOD(GetSTILaunchInformation)(THIS_ LPWSTR pwszDeviceName, DWORD *pdwEventCode, LPWSTR pwszEventName) PURE; + STDMETHOD(RegisterLaunchApplication)(THIS_ LPWSTR pwszAppName, LPWSTR pwszCommandLine) PURE; + STDMETHOD(UnregisterLaunchApplication)(THIS_ LPWSTR pwszAppName) PURE; + STDMETHOD(EnableHwNotifications)(THIS_ LPCWSTR pwszDeviceName, BOOL bNewState) PURE; + STDMETHOD(GetHwNotificationState)(THIS_ LPCWSTR pwszDeviceName, BOOL *pbCurrentState) PURE; + STDMETHOD(RefreshDeviceBus)(THIS_ LPCWSTR pwszDeviceName) PURE; + STDMETHOD(LaunchApplicationForDevice)(THIS_ LPWSTR pwszDeviceName, LPWSTR pwszAppName, LPSTINOTIFY pStiNotify); + STDMETHOD(SetupDeviceParameters)(THIS_ PSTI_DEVICE_INFORMATIONW pDevInfo); + STDMETHOD(WriteToErrorLog)(THIS_ DWORD dwMessageType, LPCWSTR pszMessage) PURE; +}; +#undef INTERFACE + +#if !defined(__cplusplus) || defined(CINTERFACE) +/*** IUnknown methods ***/ +#define IStillImage_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define IStillImage_AddRef(p) (p)->lpVtbl->AddRef(p) +#define IStillImage_Release(p) (p)->lpVtbl->Release(p) +/*** IStillImage methods ***/ +#define IStillImage_Initialize(p,a,b) (p)->lpVtbl->Initialize(p,a,b) +#define IStillImage_GetDeviceList(p,a,b,c,d) (p)->lpVtbl->GetDeviceList(p,a,b,c,d) +#define IStillImage_GetDeviceInfo(p,a,b) (p)->lpVtbl->GetDeviceInfo(p,a,b) +#define IStillImage_CreateDevice(p,a,b,c,d) (p)->lpVtbl->CreateDevice(p,a,b,c,d) +#define IStillImage_GetDeviceValue(p,a,b,c,d,e) (p)->lpVtbl->GetDeviceValue(p,a,b,c,d,e) +#define IStillImage_SetDeviceValue(p,a,b,c,d,e) (p)->lpVtbl->SetDeviceValue(p,a,b,c,d,e) +#define IStillImage_GetSTILaunchInformation(p,a,b,c) (p)->lpVtbl->GetSTILaunchInformation(p,a,b,c) +#define IStillImage_RegisterLaunchApplication(p,a,b) (p)->lpVtbl->RegisterLaunchApplication(p,a,b) +#define IStillImage_UnregisterLaunchApplication(p,a) (p)->lpVtbl->UnregisterLaunchApplication(p,a) +#define IStillImage_EnableHwNotifications(p,a,b) (p)->lpVtbl->EnableHwNotifications(p,a,b) +#define IStillImage_GetHwNotificationState(p,a,b) (p)->lpVtbl->GetHwNotificationState(p,a,b) +#define IStillImage_RefreshDeviceBus(p,a) (p)->lpVtbl->RefreshDeviceBus(p,a) +#else +/*** IUnknown methods ***/ +#define IStillImage_QueryInterface(p,a,b) (p)->QueryInterface(a,b) +#define IStillImage_AddRef(p) (p)->AddRef() +#define IStillImage_Release(p) (p)->Release() +/*** IStillImage methods ***/ +#define IStillImage_Initialize(p,a,b) (p)->Initialize(a,b) +#define IStillImage_GetDeviceList(p,a,b,c,d) (p)->GetDeviceList(a,b,c,d) +#define IStillImage_GetDeviceInfo(p,a,b) (p)->GetDeviceInfo(a,b) +#define IStillImage_CreateDevice(p,a,b,c,d) (p)->CreateDevice(a,b,c,d) +#define IStillImage_GetDeviceValue(p,a,b,c,d,e) (p)->GetDeviceValue(a,b,c,d,e) +#define IStillImage_SetDeviceValue(p,a,b,c,d,e) (p)->SetDeviceValue(a,b,c,d,e) +#define IStillImage_GetSTILaunchInformation(p,a,b,c) (p)->GetSTILaunchInformation(a,b,c) +#define IStillImage_RegisterLaunchApplication(p,a,b) (p)->RegisterLaunchApplication(a,b) +#define IStillImage_UnregisterLaunchApplication(p,a) (p)->UnregisterLaunchApplication(a) +#define IStillImage_EnableHwNotifications(p,a,b) (p)->EnableHwNotifications(a,b) +#define IStillImage_GetHwNotificationState(p,a,b) (p)->GetHwNotificationState(a,b) +#define IStillImage_RefreshDeviceBus(p,a) (p)->RefreshDeviceBus(a) +#endif #ifdef __cplusplus };

1 0

Peter Dons Tychsen : user32: Add exception handling for timer callbacks.
by Alexandre Julliard 30 Sep '09

30 Sep '09

Module: wine Branch: master Commit: f20f411925e789a2aecf740776f441335837ac5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f20f411925e789a2aecf74077… Author: Peter Dons Tychsen <donpedro(a)tdcadsl.dk> Date: Wed Sep 30 01:39:25 2009 +0200 user32: Add exception handling for timer callbacks. --- dlls/user32/message.c | 36 +++++++++++++++++++++++++++++++----- dlls/user32/tests/msg.c | 13 +++++++++++++ 2 files changed, 44 insertions(+), 5 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 3f7a4cd..4e9a62c 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -43,6 +43,7 @@ #include "win.h" #include "controls.h" #include "wine/debug.h" +#include "wine/exception.h" WINE_DEFAULT_DEBUG_CHANNEL(msg); WINE_DECLARE_DEBUG_CHANNEL(relay); @@ -3065,8 +3066,20 @@ LRESULT WINAPI DispatchMessageA( const MSG* msg ) /* Process timer messages */ if ((msg->message == WM_TIMER) || (msg->message == WM_SYSTIMER)) { - if (msg->lParam) return CallWindowProcA( (WNDPROC)msg->lParam, msg->hwnd, - msg->message, msg->wParam, GetTickCount() ); + if (msg->lParam) + { + __TRY + { + retval = CallWindowProcA( (WNDPROC)msg->lParam, msg->hwnd, + msg->message, msg->wParam, GetTickCount() ); + } + __EXCEPT_PAGE_FAULT + { + retval = 0; + } + __ENDTRY + return retval; + } } if (!msg->hwnd) return 0; @@ -3103,7 +3116,8 @@ LRESULT WINAPI DispatchMessageA( const MSG* msg ) * If the lpMsg parameter points to a WM_TIMER message and the * parameter of the WM_TIMER message is not NULL, the lParam parameter * points to the function that is called instead of the window - * procedure. + * procedure. The function stored in lParam (timer callback) is protected + * from causing page-faults. * * The message must be valid. * @@ -3123,8 +3137,20 @@ LRESULT WINAPI DispatchMessageW( const MSG* msg ) /* Process timer messages */ if ((msg->message == WM_TIMER) || (msg->message == WM_SYSTIMER)) { - if (msg->lParam) return CallWindowProcW( (WNDPROC)msg->lParam, msg->hwnd, - msg->message, msg->wParam, GetTickCount() ); + if (msg->lParam) + { + __TRY + { + retval = CallWindowProcW( (WNDPROC)msg->lParam, msg->hwnd, + msg->message, msg->wParam, GetTickCount() ); + } + __EXCEPT_PAGE_FAULT + { + retval = 0; + } + __ENDTRY + return retval; + } } if (!msg->hwnd) return 0; diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 9208c9d..aeb1b62 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -7813,6 +7813,12 @@ static VOID CALLBACK tfunc(HWND hwnd, UINT uMsg, UINT_PTR id, DWORD dwTime) { } +static VOID CALLBACK tfunc_crash(HWND hwnd, UINT uMsg, UINT_PTR id, DWORD dwTime) +{ + /* Crash on purpose */ + *(volatile int *)0 = 2; +} + #define TIMER_ID 0x19 static DWORD WINAPI timer_thread_proc(LPVOID x) @@ -7834,6 +7840,7 @@ static void test_timers(void) { struct timer_info info; DWORD id; + MSG msg; info.hWnd = CreateWindow ("TestWindowClass", NULL, WS_OVERLAPPEDWINDOW , @@ -7855,6 +7862,12 @@ static void test_timers(void) ok( KillTimer(info.hWnd, TIMER_ID), "KillTimer failed\n"); + /* Test timer callback with crash */ + info.id = SetTimer(info.hWnd, TIMER_ID, 0, tfunc_crash); + ok(info.id, "SetTimer failed\n"); + Sleep(150); + while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) DispatchMessage(&msg); + ok(DestroyWindow(info.hWnd), "failed to destroy window\n"); }

1 0

Rico Schüller : d3d10: Rename ConstantBuffer' s variable to member.
by Alexandre Julliard 30 Sep '09

30 Sep '09

Module: wine Branch: master Commit: 835dedc964576acc98ac87acd1f1038f2bb35f2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=835dedc964576acc98ac87acd… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Sep 30 11:39:13 2009 +0200 d3d10: Rename ConstantBuffer's variable to member. --- dlls/d3d10/d3d10_private.h | 4 ++-- dlls/d3d10/effect.c | 26 +++++++++++++------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 2d664cb..7ef2c17 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -109,9 +109,9 @@ struct d3d10_effect_local_buffer struct d3d10_effect *effect; char *name; DWORD data_size; - DWORD variable_count; + DWORD member_count; DWORD annotation_count; - struct d3d10_effect_variable *variables; + struct d3d10_effect_variable *members; struct d3d10_effect_variable *annotations; }; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index d1bd7ee..ccbc3c4 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -734,8 +734,8 @@ static HRESULT parse_fx10_local_buffer(struct d3d10_effect_local_buffer *l, cons skip_dword_unknown(ptr, 1); - read_dword(ptr, &l->variable_count); - TRACE("Local buffer variable count: %#x.\n", l->variable_count); + read_dword(ptr, &l->member_count); + TRACE("Local buffer member count: %#x.\n", l->member_count); skip_dword_unknown(ptr, 1); @@ -759,16 +759,16 @@ static HRESULT parse_fx10_local_buffer(struct d3d10_effect_local_buffer *l, cons if (FAILED(hr)) return hr; } - l->variables = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, l->variable_count * sizeof(*l->variables)); - if (!l->variables) + l->members = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, l->member_count * sizeof(*l->members)); + if (!l->members) { - ERR("Failed to allocate variables memory.\n"); + ERR("Failed to allocate members memory.\n"); return E_OUTOFMEMORY; } - for (i = 0; i < l->variable_count; ++i) + for (i = 0; i < l->member_count; ++i) { - struct d3d10_effect_variable *v = &l->variables[i]; + struct d3d10_effect_variable *v = &l->members[i]; v->buffer = l; v->effect = l->effect; @@ -1068,13 +1068,13 @@ static void d3d10_effect_local_buffer_destroy(struct d3d10_effect_local_buffer * TRACE("local buffer %p.\n", l); HeapFree(GetProcessHeap(), 0, l->name); - if (l->variables) + if (l->members) { - for (i = 0; i < l->variable_count; ++i) + for (i = 0; i < l->member_count; ++i) { - d3d10_effect_variable_destroy(&l->variables[i]); + d3d10_effect_variable_destroy(&l->members[i]); } - HeapFree(GetProcessHeap(), 0, l->variables); + HeapFree(GetProcessHeap(), 0, l->members); } if (l->annotations) @@ -1254,9 +1254,9 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_GetVariableB struct d3d10_effect_local_buffer *l = &This->local_buffers[i]; unsigned int j; - for (j = 0; j < l->variable_count; ++j) + for (j = 0; j < l->member_count; ++j) { - struct d3d10_effect_variable *v = &l->variables[j]; + struct d3d10_effect_variable *v = &l->members[j]; if (!strcmp(v->name, name)) {

1 0

Nikolay Sivov : comctl32/monthcal: Make prev/ next month day a current selection on LButton release.
by Alexandre Julliard 30 Sep '09

30 Sep '09

Module: wine Branch: master Commit: cc6fca015c4287ab128aa54533bdd83b17bcdbf4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc6fca015c4287ab128aa5453… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Sep 29 23:49:08 2009 +0400 comctl32/monthcal: Make prev/next month day a current selection on LButton release. --- dlls/comctl32/monthcal.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 583260d..bbf6cb7 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -1564,16 +1564,17 @@ MONTHCAL_LButtonUp(MONTHCAL_INFO *infoPtr, LPARAM lParam) infoPtr->status = MC_SEL_LBUTUP; - if(hit == MCHT_CALENDARDATENEXT) { - MONTHCAL_GoToNextMonth(infoPtr); - InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); - return TRUE; - } - if(hit == MCHT_CALENDARDATEPREV){ - MONTHCAL_GoToPrevMonth(infoPtr); + if((hit == MCHT_CALENDARDATENEXT) || (hit == MCHT_CALENDARDATEPREV)) { + SYSTEMTIME st[2]; + + st[0] = st[1] = ht.st; + MONTHCAL_SetSelRange(infoPtr, st); + MONTHCAL_SetCurSel(infoPtr, &st[0]); + InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); return TRUE; } + nmhdr.hwndFrom = infoPtr->hwndSelf; nmhdr.idFrom = GetWindowLongPtrW(infoPtr->hwndSelf, GWLP_ID); nmhdr.code = NM_RELEASEDCAPTURE;

1 0