July 2011 - Wine-Commits - list.winehq.org

Hans Leidekker : msi: Use an enum to represent folder states.
by Alexandre Julliard July 1, 2011

July 1, 2011

Module: wine Branch: master Commit: 2cbeb20d395d9c1a1b61f0c7726e22bce2ff182a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cbeb20d395d9c1a1b61f0c77… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jun 30 12:14:07 2011 +0200 msi: Use an enum to represent folder states. --- dlls/msi/action.c | 6 +++--- dlls/msi/files.c | 4 ++-- dlls/msi/msipriv.h | 19 ++++++++++++------- 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index e892f64..01df974 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -877,8 +877,8 @@ static UINT ITERATE_CreateFolders(MSIRECORD *row, LPVOID param) TRACE("folder is %s\n", debugstr_w(full_path)); folder = msi_get_loaded_folder( package, dir ); - if (folder->State == 0) msi_create_full_path( full_path ); - folder->State = 3; + if (folder->State == FOLDER_STATE_UNINITIALIZED) msi_create_full_path( full_path ); + folder->State = FOLDER_STATE_CREATED_PERSISTENT; return ERROR_SUCCESS; } @@ -946,7 +946,7 @@ static UINT ITERATE_RemoveFolders( MSIRECORD *row, LPVOID param ) RemoveDirectoryW( full_path ); folder = msi_get_loaded_folder( package, dir ); - folder->State = 0; + folder->State = FOLDER_STATE_REMOVED; return ERROR_SUCCESS; } diff --git a/dlls/msi/files.c b/dlls/msi/files.c index d1bd615..69f6b68 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -239,10 +239,10 @@ static UINT msi_create_directory( MSIPACKAGE *package, const WCHAR *dir ) if (!install_path) return ERROR_FUNCTION_FAILED; folder = msi_get_loaded_folder( package, dir ); - if (folder->State == 0) + if (folder->State == FOLDER_STATE_UNINITIALIZED) { msi_create_full_path( install_path ); - folder->State = 2; + folder->State = FOLDER_STATE_CREATED; } return ERROR_SUCCESS; } diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 414b70c..09468c4 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -490,6 +490,15 @@ typedef struct tagFeatureList MSIFEATURE *feature; } FeatureList; +enum folder_state +{ + FOLDER_STATE_UNINITIALIZED, + FOLDER_STATE_EXISTS, + FOLDER_STATE_CREATED, + FOLDER_STATE_CREATED_PERSISTENT, + FOLDER_STATE_REMOVED +}; + typedef struct tagMSIFOLDER { struct list entry; @@ -502,13 +511,9 @@ typedef struct tagMSIFOLDER LPWSTR ResolvedTarget; LPWSTR ResolvedSource; - INT State; - /* 0 = uninitialized */ - /* 1 = existing */ - /* 2 = created remove if empty */ - /* 3 = created persist if empty */ - INT Cost; - INT Space; + enum folder_state State; + INT Cost; + INT Space; } MSIFOLDER; typedef struct tagFolderList

1 0

Michael Stefaniuc : quartz: COM cleanup for the IMediaEventEx iface.
by Alexandre Julliard July 1, 2011

July 1, 2011

Module: wine Branch: master Commit: eca149bb4ba1e5eec89414260d303027e556b70d URL: http://source.winehq.org/git/wine.git/?a=commit;h=eca149bb4ba1e5eec89414260… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 30 00:47:38 2011 +0200 quartz: COM cleanup for the IMediaEventEx iface. --- dlls/quartz/filtergraph.c | 135 +++++++++++++++++++++------------------------ 1 files changed, 63 insertions(+), 72 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eca149bb4ba1e5eec8941…

1 0

Michael Stefaniuc : quartz: Pass the object instead of the iface to an internal helper.
by Alexandre Julliard July 1, 2011

July 1, 2011

Module: wine Branch: master Commit: 2d589407b3cf8fdc2ea41feaf4f98e37217a09f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d589407b3cf8fdc2ea41feaf… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 30 00:32:32 2011 +0200 quartz: Pass the object instead of the iface to an internal helper. --- dlls/quartz/filtergraph.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index b1b50cc..20c0d78 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1903,9 +1903,8 @@ static HRESULT WINAPI SendGetState(IBaseFilter *pFilter, DWORD_PTR data) } -static HRESULT SendFilterMessage(IMediaControl *iface, fnFoundFilter FoundFilter, DWORD_PTR data) +static HRESULT SendFilterMessage(IFilterGraphImpl *This, fnFoundFilter FoundFilter, DWORD_PTR data) { - ICOM_THIS_MULTI(IFilterGraphImpl, IMediaControl_vtbl, iface); int i; IBaseFilter* pfilter; IEnumPins* pEnum; @@ -1913,7 +1912,8 @@ static HRESULT SendFilterMessage(IMediaControl *iface, fnFoundFilter FoundFilter IPin* pPin; DWORD dummy; PIN_DIRECTION dir; - TRACE("(%p/%p)->()\n", This, iface); + + TRACE("(%p)->()\n", This); /* Explorer the graph from source filters to renderers, determine renderers * number and run filters from renderers to source filters */ @@ -1985,7 +1985,7 @@ static HRESULT WINAPI MediaControl_Run(IMediaControl *iface) { } else This->start_time = 0; - SendFilterMessage(iface, SendRun, (DWORD_PTR)&This->start_time); + SendFilterMessage(This, SendRun, (DWORD_PTR)&This->start_time); This->state = State_Running; out: LeaveCriticalSection(&This->cs); @@ -2005,7 +2005,7 @@ static HRESULT WINAPI MediaControl_Pause(IMediaControl *iface) { else This->pause_time = -1; - SendFilterMessage(iface, SendPause, 0); + SendFilterMessage(This, SendPause, 0); This->state = State_Paused; out: LeaveCriticalSection(&This->cs); @@ -2019,8 +2019,8 @@ static HRESULT WINAPI MediaControl_Stop(IMediaControl *iface) { if (This->state == State_Stopped) return S_OK; EnterCriticalSection(&This->cs); - if (This->state == State_Running) SendFilterMessage(iface, SendPause, 0); - SendFilterMessage(iface, SendStop, 0); + if (This->state == State_Running) SendFilterMessage(This, SendPause, 0); + SendFilterMessage(This, SendStop, 0); This->state = State_Stopped; LeaveCriticalSection(&This->cs); return S_OK; @@ -2053,7 +2053,7 @@ static HRESULT WINAPI MediaControl_GetState(IMediaControl *iface, end = 0; } if (end) - SendFilterMessage(iface, SendGetState, end); + SendFilterMessage(This, SendGetState, end); LeaveCriticalSection(&This->cs);

1 0

Henri Verbeet : wined3d: Make the device parameter to context_resource_released() const.
by Alexandre Julliard July 1, 2011

July 1, 2011

Module: wine Branch: master Commit: 6894d8022a13b5258172222e31d4dbd670aa5a21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6894d8022a13b5258172222e3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 29 23:14:13 2011 +0200 wined3d: Make the device parameter to context_resource_released() const. --- dlls/wined3d/context.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index a37c664..4040083 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -604,7 +604,7 @@ static void context_queue_fbo_entry_destruction(struct wined3d_context *context, list_add_head(&context->fbo_destroy_list, &entry->entry); } -void context_resource_released(struct wined3d_device *device, +void context_resource_released(const struct wined3d_device *device, struct wined3d_resource *resource, WINED3DRESOURCETYPE type) { if (!device->d3d_initialized) return; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 81b5119..ad75c62 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1236,7 +1236,7 @@ void context_free_occlusion_query(struct wined3d_occlusion_query *query) DECLSPE struct wined3d_context *context_get_current(void) DECLSPEC_HIDDEN; DWORD context_get_tls_idx(void) DECLSPEC_HIDDEN; void context_release(struct wined3d_context *context) DECLSPEC_HIDDEN; -void context_resource_released(struct wined3d_device *device, +void context_resource_released(const struct wined3d_device *device, struct wined3d_resource *resource, WINED3DRESOURCETYPE type) DECLSPEC_HIDDEN; void context_resource_unloaded(struct wined3d_device *device, struct wined3d_resource *resource, WINED3DRESOURCETYPE type) DECLSPEC_HIDDEN;

1 0

Michael Stefaniuc : quartz: COM cleanup for the IVideoWindow iface.
by Alexandre Julliard July 1, 2011

July 1, 2011

Module: wine Branch: master Commit: 6d929c71b68c1f442a993ec30d17fc2358c87e3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d929c71b68c1f442a993ec30… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 30 00:45:48 2011 +0200 quartz: COM cleanup for the IVideoWindow iface. --- dlls/quartz/filtergraph.c | 408 ++++++++++++++++++++++----------------------- 1 files changed, 198 insertions(+), 210 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6d929c71b68c1f442a993…

1 0

Michael Stefaniuc : quartz: COM cleanup for the IBasicVideo2 iface.
by Alexandre Julliard July 1, 2011

July 1, 2011

Module: wine Branch: master Commit: a37208ba96855340fbfca0400127e36cc94725b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a37208ba96855340fbfca0400… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 30 00:44:08 2011 +0200 quartz: COM cleanup for the IBasicVideo2 iface. --- dlls/quartz/filtergraph.c | 358 ++++++++++++++++++++++----------------------- 1 files changed, 175 insertions(+), 183 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a37208ba96855340fbfca…

1 0

Henri Verbeet : wined3d: Make the device and surface parameters to context_enum_surface_fbo_entries () const.
by Alexandre Julliard July 1, 2011

July 1, 2011

Module: wine Branch: master Commit: 53b99dde14c7eef31d948a98d9a8822ffd9f4a8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=53b99dde14c7eef31d948a98d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 29 23:14:12 2011 +0200 wined3d: Make the device and surface parameters to context_enum_surface_fbo_entries() const. --- dlls/wined3d/context.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 51a77ef..a37c664 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -563,8 +563,8 @@ void context_free_event_query(struct wined3d_event_query *query) typedef void (context_fbo_entry_func_t)(struct wined3d_context *context, struct fbo_entry *entry); -static void context_enum_surface_fbo_entries(struct wined3d_device *device, - struct wined3d_surface *surface, context_fbo_entry_func_t *callback) +static void context_enum_surface_fbo_entries(const struct wined3d_device *device, + const struct wined3d_surface *surface, context_fbo_entry_func_t *callback) { UINT i;

1 0

Michael Stefaniuc : quartz: COM cleanup for the IMediaControl iface.
by Alexandre Julliard July 1, 2011

July 1, 2011

Module: wine Branch: master Commit: 6c3e62fdaf3d15956187633034ff1f8a6d72507d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c3e62fdaf3d1595618763303… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 30 00:33:21 2011 +0200 quartz: COM cleanup for the IMediaControl iface. --- dlls/quartz/filtergraph.c | 141 +++++++++++++++++++++++---------------------- 1 files changed, 72 insertions(+), 69 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6c3e62fdaf3d159561876…

1 0

Henri Verbeet : wined3d: Make the surface parameter to context_surface_update() const.
by Alexandre Julliard July 1, 2011

July 1, 2011

Module: wine Branch: master Commit: c20b23eb003ad14ac84530e5228e9d4b04e926b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c20b23eb003ad14ac84530e52… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 29 23:14:15 2011 +0200 wined3d: Make the surface parameter to context_surface_update() const. --- dlls/wined3d/context.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 0391672..ed80b78 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -641,7 +641,7 @@ void context_resource_unloaded(const struct wined3d_device *device, } } -void context_surface_update(struct wined3d_context *context, struct wined3d_surface *surface) +void context_surface_update(struct wined3d_context *context, const struct wined3d_surface *surface) { const struct wined3d_gl_info *gl_info = context->gl_info; struct fbo_entry *entry = context->current_fbo; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4420e13..e8fddb7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1243,7 +1243,7 @@ void context_resource_unloaded(const struct wined3d_device *device, BOOL context_set_current(struct wined3d_context *ctx) DECLSPEC_HIDDEN; void context_set_draw_buffer(struct wined3d_context *context, GLenum buffer) DECLSPEC_HIDDEN; void context_set_tls_idx(DWORD idx) DECLSPEC_HIDDEN; -void context_surface_update(struct wined3d_context *context, struct wined3d_surface *surface) DECLSPEC_HIDDEN; +void context_surface_update(struct wined3d_context *context, const struct wined3d_surface *surface) DECLSPEC_HIDDEN; /* Macros for doing basic GPU detection based on opengl capabilities */ #define WINE_D3D6_CAPABLE(gl_info) (gl_info->supported[ARB_MULTITEXTURE])

1 0

Michael Stefaniuc : quartz: COM cleanup for the IFilterGraph2 iface.
by Alexandre Julliard July 1, 2011

July 1, 2011

Module: wine Branch: master Commit: f888eb9135ed6d016cdfdf96b67d26a88d7faa2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f888eb9135ed6d016cdfdf96b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 30 00:30:45 2011 +0200 quartz: COM cleanup for the IFilterGraph2 iface. --- dlls/quartz/filtergraph.c | 147 +++++++++++++++++++++++---------------------- 1 files changed, 74 insertions(+), 73 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f888eb9135ed6d016cdfd…

1 0