wine-commits November 2012

wine-commits@winehq.org

2 participants
708 discussions

Andrew Talbot : winhttp: Remove unused variables.
by Alexandre Julliard 23 Nov '12

23 Nov '12

Module: wine Branch: master Commit: 4be1fce0d113a6a2dc246dfe797a68fe68844dfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=4be1fce0d113a6a2dc246dfe7… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Nov 22 21:02:02 2012 +0000 winhttp: Remove unused variables. --- dlls/winhttp/net.c | 3 +-- dlls/winhttp/request.c | 8 +++----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 5ec4e1a..ff0b0ff 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -927,14 +927,13 @@ BOOL netconn_get_next_line( netconn_t *conn, char *buffer, DWORD *buflen ) DWORD netconn_set_timeout( netconn_t *netconn, BOOL send, int value ) { - int res; struct timeval tv; /* value is in milliseconds, convert to struct timeval */ tv.tv_sec = value / 1000; tv.tv_usec = (value % 1000) * 1000; - if ((res = setsockopt( netconn->socket, SOL_SOCKET, send ? SO_SNDTIMEO : SO_RCVTIMEO, (void*)&tv, sizeof(tv) ) == -1)) + if (setsockopt( netconn->socket, SOL_SOCKET, send ? SO_SNDTIMEO : SO_RCVTIMEO, (void*)&tv, sizeof(tv) ) == -1) { WARN("setsockopt failed (%s)\n", strerror( errno )); return sock_get_error( errno ); diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 7c0d3ab..0d44ed1 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2814,7 +2814,7 @@ static DWORD wait_for_completion( struct winhttp_request *request ) static HRESULT request_receive( struct winhttp_request *request ) { - DWORD err, size, total_bytes_read, buflen = 4096; + DWORD err, size, buflen = 4096; wait_set_status_callback( request, WINHTTP_CALLBACK_STATUS_HEADERS_AVAILABLE ); if (!WinHttpReceiveResponse( request->hrequest, NULL )) @@ -2829,7 +2829,7 @@ static HRESULT request_receive( struct winhttp_request *request ) } if (!(request->buffer = heap_alloc( buflen ))) return E_OUTOFMEMORY; request->buffer[0] = 0; - size = total_bytes_read = 0; + size = 0; do { wait_set_status_callback( request, WINHTTP_CALLBACK_STATUS_DATA_AVAILABLE ); @@ -2860,7 +2860,6 @@ static HRESULT request_receive( struct winhttp_request *request ) goto error; } if ((err = wait_for_completion( request ))) goto error; - total_bytes_read += request->bytes_read; request->offset += request->bytes_read; } while (request->bytes_read); @@ -2913,7 +2912,6 @@ static HRESULT request_send( struct winhttp_request *request ) char *ptr = NULL; LONG size = 0; HRESULT hr; - BOOL ret; DWORD err; if ((err = request_set_parameters( request ))) return HRESULT_FROM_WIN32( err ); @@ -2952,7 +2950,7 @@ static HRESULT request_send( struct winhttp_request *request ) } } wait_set_status_callback( request, WINHTTP_CALLBACK_STATUS_REQUEST_SENT ); - if (!(ret = WinHttpSendRequest( request->hrequest, NULL, 0, ptr, size, size, 0 ))) + if (!WinHttpSendRequest( request->hrequest, NULL, 0, ptr, size, size, 0 )) { err = get_last_error(); goto error;

1 0

Andrew Talbot : wininet: Remove unused variable.
by Alexandre Julliard 23 Nov '12

23 Nov '12

Module: wine Branch: master Commit: 2691e580a0f5f00be94985266fdf08745f99c85f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2691e580a0f5f00be94985266… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Nov 22 21:02:08 2012 +0000 wininet: Remove unused variable. --- dlls/wininet/internet.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index d04e825..8d610c3 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -430,11 +430,11 @@ BOOL INTERNET_FindProxyForProtocol(LPCWSTR szProxy, LPCWSTR proto, WCHAR *foundP /* It wasn't found: look for no protocol */ for (ptr = szProxy; !ret && ptr && *ptr; ) { - LPCWSTR end, equal; + LPCWSTR end; if (!(end = strchrW(ptr, ' '))) end = ptr + strlenW(ptr); - if (!(equal = strchrW(ptr, '='))) + if (!strchrW(ptr, '=')) { if (end - ptr + 1 > *foundProxyLen) {

1 0

Andrew Talbot : winspool.drv: Remove unused variable.
by Alexandre Julliard 23 Nov '12

23 Nov '12

Module: wine Branch: master Commit: 26671c8f361b2b19dd41dda3170927131e3eef5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=26671c8f361b2b19dd41dda31… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Nov 22 21:02:13 2012 +0000 winspool.drv: Remove unused variable. --- dlls/winspool.drv/info.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 172f892..d8a78b0 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -5582,7 +5582,6 @@ BOOL WINAPI EnumPrinterDriversW(LPWSTR pName, LPWSTR pEnvironment, DWORD Level, if (pEnvironment && !strcmpW(pEnvironment, allW)) { DWORD i, needed, bufsize = cbBuf; - DWORD total_needed = 0; DWORD total_found = 0; DWORD data_offset; @@ -5594,7 +5593,6 @@ BOOL WINAPI EnumPrinterDriversW(LPWSTR pName, LPWSTR pEnvironment, DWORD Level, ret = WINSPOOL_EnumPrinterDrivers(pName, all_printenv[i]->envname, Level, NULL, 0, 0, &needed, &found, 0); if (!ret && GetLastError() != ERROR_INSUFFICIENT_BUFFER) return FALSE; - total_needed += needed; total_found += found; }

1 0

Henri Verbeet : d3d10core: Implement d3d10_device_SOGetTargets().
by Alexandre Julliard 23 Nov '12

23 Nov '12

Module: wine Branch: master Commit: dc67be012fe780306e6d1e16a8d9369da716d161 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc67be012fe780306e6d1e16a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 22 21:13:38 2012 +0100 d3d10core: Implement d3d10_device_SOGetTargets(). --- dlls/d3d10core/device.c | 21 ++++++++++++++++++++- dlls/wined3d/device.c | 15 +++++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 4 files changed, 38 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 3b09a04..0623ee5 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -713,8 +713,27 @@ static void STDMETHODCALLTYPE d3d10_device_OMGetDepthStencilState(ID3D10Device * static void STDMETHODCALLTYPE d3d10_device_SOGetTargets(ID3D10Device *iface, UINT buffer_count, ID3D10Buffer **buffers, UINT *offsets) { - FIXME("iface %p, buffer_count %u, buffers %p, offsets %p stub!\n", + struct d3d10_device *device = impl_from_ID3D10Device(iface); + unsigned int i; + + TRACE("iface %p, buffer_count %u, buffers %p, offsets %p.\n", iface, buffer_count, buffers, offsets); + + for (i = 0; i < buffer_count; ++i) + { + struct wined3d_buffer *wined3d_buffer; + struct d3d10_buffer *buffer_impl; + + if (!(wined3d_buffer = wined3d_device_get_stream_output(device->wined3d_device, i, &offsets[i]))) + { + buffers[i] = NULL; + continue; + } + + buffer_impl = wined3d_buffer_get_parent(wined3d_buffer); + buffers[i] = &buffer_impl->ID3D10Buffer_iface; + ID3D10Buffer_AddRef(buffers[i]); + } } static void STDMETHODCALLTYPE d3d10_device_RSGetState(ID3D10Device *iface, ID3D10RasterizerState **rasterizer_state) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b0e7ac2..20c535c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1600,6 +1600,21 @@ void CDECL wined3d_device_set_stream_output(struct wined3d_device *device, UINT } } +struct wined3d_buffer * CDECL wined3d_device_get_stream_output(struct wined3d_device *device, + UINT idx, UINT *offset) +{ + TRACE("device %p, idx %u, offset %p.\n", device, idx, offset); + + if (idx >= MAX_STREAM_OUT) + { + WARN("Invalid stream output %u.\n", idx); + return NULL; + } + + *offset = device->stateBlock->state.stream_output[idx].offset; + return device->stateBlock->state.stream_output[idx].buffer; +} + HRESULT CDECL wined3d_device_set_stream_source(struct wined3d_device *device, UINT stream_idx, struct wined3d_buffer *buffer, UINT offset, UINT stride) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 56e73e9..549a444 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -81,6 +81,7 @@ @ cdecl wined3d_device_get_sampler_state(ptr long long) @ cdecl wined3d_device_get_scissor_rect(ptr ptr) @ cdecl wined3d_device_get_software_vertex_processing(ptr) +@ cdecl wined3d_device_get_stream_output(ptr long ptr) @ cdecl wined3d_device_get_stream_source(ptr long ptr ptr ptr) @ cdecl wined3d_device_get_stream_source_freq(ptr long ptr) @ cdecl wined3d_device_get_surface_from_dc(ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 76e44f1..dd4d29b 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2150,6 +2150,8 @@ DWORD __cdecl wined3d_device_get_sampler_state(const struct wined3d_device *devi UINT sampler_idx, enum wined3d_sampler_state state); void __cdecl wined3d_device_get_scissor_rect(const struct wined3d_device *device, RECT *rect); BOOL __cdecl wined3d_device_get_software_vertex_processing(const struct wined3d_device *device); +struct wined3d_buffer * __cdecl wined3d_device_get_stream_output(struct wined3d_device *device, + UINT idx, UINT *offset); HRESULT __cdecl wined3d_device_get_stream_source(const struct wined3d_device *device, UINT stream_idx, struct wined3d_buffer **buffer, UINT *offset, UINT *stride); HRESULT __cdecl wined3d_device_get_stream_source_freq(const struct wined3d_device *device,

1 0

Henri Verbeet : d3d10core: Implement d3d10_device_SOSetTargets().
by Alexandre Julliard 23 Nov '12

23 Nov '12

Module: wine Branch: master Commit: 5b781d709d40aa3b706a072807b1e4a903f96442 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b781d709d40aa3b706a07280… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 22 21:13:37 2012 +0100 d3d10core: Implement d3d10_device_SOSetTargets(). --- dlls/d3d10core/device.c | 19 +++++++++++++++++- dlls/wined3d/device.c | 41 ++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d.spec | 1 + dlls/wined3d/wined3d_private.h | 8 +++++++ include/wine/wined3d.h | 2 + 5 files changed, 70 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 78c9d1b..3b09a04 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -347,7 +347,24 @@ static void STDMETHODCALLTYPE d3d10_device_OMSetDepthStencilState(ID3D10Device * static void STDMETHODCALLTYPE d3d10_device_SOSetTargets(ID3D10Device *iface, UINT target_count, ID3D10Buffer *const *targets, const UINT *offsets) { - FIXME("iface %p, target_count %u, targets %p, offsets %p stub!\n", iface, target_count, targets, offsets); + struct d3d10_device *device = impl_from_ID3D10Device(iface); + unsigned int count, i; + + TRACE("iface %p, target_count %u, targets %p, offsets %p.\n", iface, target_count, targets, offsets); + + count = min(target_count, 4); + for (i = 0; i < count; ++i) + { + struct d3d10_buffer *buffer = unsafe_impl_from_ID3D10Buffer(targets[i]); + + wined3d_device_set_stream_output(device->wined3d_device, i, + buffer ? buffer->wined3d_buffer : NULL, offsets[i]); + } + + for (i = count; i < 4; ++i) + { + wined3d_device_set_stream_output(device->wined3d_device, i, NULL, 0); + } } static void STDMETHODCALLTYPE d3d10_device_DrawAuto(ID3D10Device *iface) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3211038..b0e7ac2 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1559,6 +1559,47 @@ UINT CDECL wined3d_device_get_available_texture_mem(const struct wined3d_device return device->adapter->TextureRam - device->adapter->UsedTextureRam; } +void CDECL wined3d_device_set_stream_output(struct wined3d_device *device, UINT idx, + struct wined3d_buffer *buffer, UINT offset) +{ + struct wined3d_buffer *prev_buffer; + + TRACE("device %p, idx %u, buffer %p, offset %u.\n", device, idx, buffer, offset); + + if (idx >= MAX_STREAM_OUT) + { + WARN("Invalid stream output %u.\n", idx); + return; + } + + prev_buffer = device->updateStateBlock->state.stream_output[idx].buffer; + device->updateStateBlock->state.stream_output[idx].buffer = buffer; + device->updateStateBlock->state.stream_output[idx].offset = offset; + + if (device->isRecordingState) + { + if (buffer) + wined3d_buffer_incref(buffer); + if (prev_buffer) + wined3d_buffer_decref(buffer); + return; + } + + if (prev_buffer != buffer) + { + if (buffer) + { + InterlockedIncrement(&buffer->resource.bind_count); + wined3d_buffer_incref(buffer); + } + if (prev_buffer) + { + InterlockedDecrement(&prev_buffer->resource.bind_count); + wined3d_buffer_decref(prev_buffer); + } + } +} + HRESULT CDECL wined3d_device_set_stream_source(struct wined3d_device *device, UINT stream_idx, struct wined3d_buffer *buffer, UINT offset, UINT stride) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index cb8304a..56e73e9 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -129,6 +129,7 @@ @ cdecl wined3d_device_set_sampler_state(ptr long long long) @ cdecl wined3d_device_set_scissor_rect(ptr ptr) @ cdecl wined3d_device_set_software_vertex_processing(ptr long) +@ cdecl wined3d_device_set_stream_output(ptr long ptr long) @ cdecl wined3d_device_set_stream_source(ptr long ptr long long) @ cdecl wined3d_device_set_stream_source_freq(ptr long long) @ cdecl wined3d_device_set_texture(ptr long ptr) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ec7c3bf..ea3010f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -154,6 +154,7 @@ void wined3d_rb_free(void *ptr) DECLSPEC_HIDDEN; /* Device caps */ #define MAX_PALETTES 65536 +#define MAX_STREAM_OUT 4 #define MAX_STREAMS 16 #define MAX_TEXTURES 8 #define MAX_FRAGMENT_SAMPLERS 16 @@ -2273,6 +2274,12 @@ struct StageState { DWORD state; }; +struct wined3d_stream_output +{ + struct wined3d_buffer *buffer; + UINT offset; +}; + struct wined3d_stream_state { struct wined3d_buffer *buffer; @@ -2287,6 +2294,7 @@ struct wined3d_state const struct wined3d_fb_state *fb; struct wined3d_vertex_declaration *vertex_declaration; + struct wined3d_stream_output stream_output[MAX_STREAM_OUT]; struct wined3d_stream_state streams[MAX_STREAMS + 1 /* tesselated pseudo-stream */]; BOOL user_stream; struct wined3d_buffer *index_buffer; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index cf86df6..76e44f1 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2226,6 +2226,8 @@ void __cdecl wined3d_device_set_sampler_state(struct wined3d_device *device, UINT sampler_idx, enum wined3d_sampler_state state, DWORD value); void __cdecl wined3d_device_set_scissor_rect(struct wined3d_device *device, const RECT *rect); void __cdecl wined3d_device_set_software_vertex_processing(struct wined3d_device *device, BOOL software); +void __cdecl wined3d_device_set_stream_output(struct wined3d_device *device, UINT idx, + struct wined3d_buffer *buffer, UINT offset); HRESULT __cdecl wined3d_device_set_stream_source(struct wined3d_device *device, UINT stream_idx, struct wined3d_buffer *buffer, UINT offset, UINT stride); HRESULT __cdecl wined3d_device_set_stream_source_freq(struct wined3d_device *device, UINT stream_idx, UINT divider);

1 0

Henri Verbeet : d3dx9: Avoid LPD3DXCONSTANTTABLE.
by Alexandre Julliard 23 Nov '12

23 Nov '12

Module: wine Branch: master Commit: 63acbcbf8a4ba7dd98cfed92b8ad96924d5fe062 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63acbcbf8a4ba7dd98cfed92b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 22 21:13:36 2012 +0100 d3dx9: Avoid LPD3DXCONSTANTTABLE. --- dlls/d3dx9_36/effect.c | 3 +- dlls/d3dx9_36/shader.c | 70 ++++++++++------------------------------- dlls/d3dx9_36/tests/shader.c | 2 +- include/d3dx9effect.h | 4 +- include/d3dx9shader.h | 72 ++++++++++------------------------------- 5 files changed, 40 insertions(+), 111 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=63acbcbf8a4ba7dd98cfe…

1 0

Henri Verbeet : d3dx9: Avoid LPD3DXFILE.
by Alexandre Julliard 23 Nov '12

23 Nov '12

Module: wine Branch: master Commit: 7ecfb2e52dcdc3f54bfbf34b49735f689ffcfc1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ecfb2e52dcdc3f54bfbf34b4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 22 21:13:35 2012 +0100 d3dx9: Avoid LPD3DXFILE. --- include/d3dx9anim.h | 2 +- include/d3dx9xof.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/d3dx9anim.h b/include/d3dx9anim.h index c8378e2..975f1df 100644 --- a/include/d3dx9anim.h +++ b/include/d3dx9anim.h @@ -198,7 +198,7 @@ DECLARE_INTERFACE(ID3DXSaveUserData) ID3DXFileSaveObject *save_obj, ID3DXFileSaveData *mesh_data) PURE; STDMETHOD(AddTopLevelDataObjectsPre)(ID3DXFileSaveObject *save_obj) PURE; STDMETHOD(AddTopLevelDataObjectsPost)(ID3DXFileSaveObject *save_obj) PURE; - STDMETHOD(RegisterTemplates)(LPD3DXFILE xfile) PURE; + STDMETHOD(RegisterTemplates)(ID3DXFile *file) PURE; STDMETHOD(SaveTemplates)(ID3DXFileSaveObject *save_obj) PURE; }; #undef INTERFACE diff --git a/include/d3dx9xof.h b/include/d3dx9xof.h index 593fca5..4bcb769 100644 --- a/include/d3dx9xof.h +++ b/include/d3dx9xof.h @@ -66,7 +66,7 @@ typedef interface ID3DXFileSaveData *LPD3DXFILESAVEDATA, **LPLPD3DXFILESAVEDATA; typedef interface ID3DXFileEnumObject *LPD3DXFILEENUMOBJECT, **LPLPD3DXFILEENUMOBJECT; typedef interface ID3DXFileData *LPD3DXFILEDATA, **LPLPD3DXFILEDATA; -STDAPI D3DXFileCreate(LPD3DXFILE*); +STDAPI D3DXFileCreate(struct ID3DXFile **file); #define INTERFACE ID3DXFile DECLARE_INTERFACE_IID_(ID3DXFile,IUnknown,"cef08cf9-7b4f-4429-9624-2a690a933201") @@ -93,7 +93,7 @@ DECLARE_INTERFACE_IID_(ID3DXFileSaveObject,IUnknown,"cef08cfa-7b4f-4429-9624-2a6 STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; /*** ID3DXFileSaveObject methods ***/ - STDMETHOD(GetFile)(THIS_ LPD3DXFILE*) PURE; + STDMETHOD(GetFile)(THIS_ ID3DXFile **file) PURE; STDMETHOD(AddDataObject)(THIS_ REFGUID template_guid, const char *name, const GUID *guid, SIZE_T data_size, const void *data, struct ID3DXFileSaveData **obj) PURE; STDMETHOD(Save)(THIS) PURE; @@ -127,7 +127,7 @@ DECLARE_INTERFACE_IID_(ID3DXFileEnumObject,IUnknown,"cef08cfc-7b4f-4429-9624-2a6 STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; /*** ID3DXFileEnumObject methods ***/ - STDMETHOD(GetFile)(THIS_ LPD3DXFILE*) PURE; + STDMETHOD(GetFile)(THIS_ ID3DXFile **file) PURE; STDMETHOD(GetChildren)(THIS_ SIZE_T*) PURE; STDMETHOD(GetChild)(THIS_ SIZE_T id, struct ID3DXFileData **child) PURE; STDMETHOD(GetDataObjectById)(THIS_ REFGUID guid, struct ID3DXFileData **obj) PURE;

1 0

Henri Verbeet : d3dx9: Avoid LPD3DXFILESAVEOBJECT.
by Alexandre Julliard 23 Nov '12

23 Nov '12

Module: wine Branch: master Commit: ff04207e29ff4636898b462a0924facdd97ca9ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff04207e29ff4636898b462a0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 22 21:13:34 2012 +0100 d3dx9: Avoid LPD3DXFILESAVEOBJECT. --- include/d3dx9anim.h | 6 +++--- include/d3dx9xof.h | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/include/d3dx9anim.h b/include/d3dx9anim.h index 9a25ec8..c8378e2 100644 --- a/include/d3dx9anim.h +++ b/include/d3dx9anim.h @@ -196,10 +196,10 @@ DECLARE_INTERFACE(ID3DXSaveUserData) ID3DXFileSaveObject *save_obj, ID3DXFileSaveData *frame_data) PURE; STDMETHOD(AddMeshChildData)(const D3DXMESHCONTAINER *mesh_container, ID3DXFileSaveObject *save_obj, ID3DXFileSaveData *mesh_data) PURE; - STDMETHOD(AddTopLevelDataObjectsPre)(LPD3DXFILESAVEOBJECT save_obj) PURE; - STDMETHOD(AddTopLevelDataObjectsPost)(LPD3DXFILESAVEOBJECT save_obj) PURE; + STDMETHOD(AddTopLevelDataObjectsPre)(ID3DXFileSaveObject *save_obj) PURE; + STDMETHOD(AddTopLevelDataObjectsPost)(ID3DXFileSaveObject *save_obj) PURE; STDMETHOD(RegisterTemplates)(LPD3DXFILE xfile) PURE; - STDMETHOD(SaveTemplates)(LPD3DXFILESAVEOBJECT save_obj) PURE; + STDMETHOD(SaveTemplates)(ID3DXFileSaveObject *save_obj) PURE; }; #undef INTERFACE diff --git a/include/d3dx9xof.h b/include/d3dx9xof.h index 8e08cca..593fca5 100644 --- a/include/d3dx9xof.h +++ b/include/d3dx9xof.h @@ -78,7 +78,8 @@ DECLARE_INTERFACE_IID_(ID3DXFile,IUnknown,"cef08cf9-7b4f-4429-9624-2a690a933201" /*** ID3DXFile methods ***/ STDMETHOD(CreateEnumObject)(THIS_ const void *src, D3DXF_FILELOADOPTIONS type, struct ID3DXFileEnumObject **enum_obj) PURE; - STDMETHOD(CreateSaveObject)(THIS_ LPCVOID, D3DXF_FILESAVEOPTIONS, D3DXF_FILEFORMAT, LPD3DXFILESAVEOBJECT*) PURE; + STDMETHOD(CreateSaveObject)(THIS_ const void *data, D3DXF_FILESAVEOPTIONS flags, + D3DXF_FILEFORMAT format, struct ID3DXFileSaveObject **save_obj) PURE; STDMETHOD(RegisterTemplates)(THIS_ LPCVOID, SIZE_T) PURE; STDMETHOD(RegisterEnumTemplates)(THIS_ struct ID3DXFileEnumObject *enum_obj) PURE; }; @@ -107,7 +108,7 @@ DECLARE_INTERFACE_IID_(ID3DXFileSaveData,IUnknown,"cef08cfb-7b4f-4429-9624-2a690 STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; /*** ID3DXFileSaveObject methods ***/ - STDMETHOD(GetSave)(THIS_ LPD3DXFILESAVEOBJECT*) PURE; + STDMETHOD(GetSave)(THIS_ ID3DXFileSaveObject **save_obj) PURE; STDMETHOD(GetName)(THIS_ LPSTR, SIZE_T*) PURE; STDMETHOD(GetId)(THIS_ LPGUID) PURE; STDMETHOD(GetType)(THIS_ GUID*) PURE;

1 0

Francois Gouget : server: Print the usage to stdout when invoked with --help.
by Alexandre Julliard 23 Nov '12

23 Nov '12

Module: wine Branch: master Commit: e32647094977deac99976337c94a2a8a82525c73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e32647094977deac99976337c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Nov 22 18:39:45 2012 +0100 server: Print the usage to stdout when invoked with --help. --- server/main.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/server/main.c b/server/main.c index 2d841e8..7aed338 100644 --- a/server/main.c +++ b/server/main.c @@ -46,18 +46,18 @@ const char *server_argv0; /* parse-line args */ -static void usage(void) +static void usage( FILE *fh ) { - fprintf(stderr, "Usage: %s [options]\n\n", server_argv0); - fprintf(stderr, "Options:\n"); - fprintf(stderr, " -d[n], --debug[=n] set debug level to n or +1 if n not specified\n"); - fprintf(stderr, " -f, --foreground remain in the foreground for debugging\n"); - fprintf(stderr, " -h, --help display this help message\n"); - fprintf(stderr, " -k[n], --kill[=n] kill the current wineserver, optionally with signal n\n"); - fprintf(stderr, " -p[n], --persistent[=n] make server persistent, optionally for n seconds\n"); - fprintf(stderr, " -v, --version display version information and exit\n"); - fprintf(stderr, " -w, --wait wait until the current wineserver terminates\n"); - fprintf(stderr, "\n"); + fprintf(fh, "Usage: %s [options]\n\n", server_argv0); + fprintf(fh, "Options:\n"); + fprintf(fh, " -d[n], --debug[=n] set debug level to n or +1 if n not specified\n"); + fprintf(fh, " -f, --foreground remain in the foreground for debugging\n"); + fprintf(fh, " -h, --help display this help message\n"); + fprintf(fh, " -k[n], --kill[=n] kill the current wineserver, optionally with signal n\n"); + fprintf(fh, " -p[n], --persistent[=n] make server persistent, optionally for n seconds\n"); + fprintf(fh, " -v, --version display version information and exit\n"); + fprintf(fh, " -w, --wait wait until the current wineserver terminates\n"); + fprintf(fh, "\n"); } static void parse_args( int argc, char *argv[] ) @@ -92,7 +92,7 @@ static void parse_args( int argc, char *argv[] ) foreground = 1; break; case 'h': - usage(); + usage(stdout); exit(0); break; case 'k': @@ -114,7 +114,7 @@ static void parse_args( int argc, char *argv[] ) wait_for_lock(); exit(0); default: - usage(); + usage(stderr); exit(1); } }

1 0

Francois Gouget : winegstreamer: Make the GST_QualityControl methods static .
by Alexandre Julliard 23 Nov '12

23 Nov '12

Module: wine Branch: master Commit: 86c3f683031ca077c1b0a7a03846d644966e9e93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86c3f683031ca077c1b0a7a03… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Nov 22 18:38:51 2012 +0100 winegstreamer: Make the GST_QualityControl methods static. --- dlls/winegstreamer/gstdemux.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index dd160eb..41158ff 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1400,19 +1400,19 @@ static inline GSTOutPin *impl_from_IQualityControl( IQualityControl *iface ) return (GSTOutPin*)CONTAINING_RECORD(iface, GSTOutPin, IQualityControl_iface); } -HRESULT WINAPI GST_QualityControl_QueryInterface(IQualityControl *iface, REFIID riid, void **ppv) +static HRESULT WINAPI GST_QualityControl_QueryInterface(IQualityControl *iface, REFIID riid, void **ppv) { GSTOutPin *pin = impl_from_IQualityControl(iface); return IPin_QueryInterface((IPin*)pin, riid, ppv); } -ULONG WINAPI GST_QualityControl_AddRef(IQualityControl *iface) +static ULONG WINAPI GST_QualityControl_AddRef(IQualityControl *iface) { GSTOutPin *pin = impl_from_IQualityControl(iface); return IPin_AddRef((IPin*)pin); } -ULONG WINAPI GST_QualityControl_Release(IQualityControl *iface) +static ULONG WINAPI GST_QualityControl_Release(IQualityControl *iface) { GSTOutPin *pin = impl_from_IQualityControl(iface); return IPin_Release((IPin*)pin); @@ -1427,7 +1427,7 @@ static HRESULT WINAPI GST_QualityControl_Notify(IQualityControl *iface, IBaseFil return S_OK; } -HRESULT WINAPI GST_QualityControl_SetSink(IQualityControl *iface, IQualityControl *tonotify) +static HRESULT WINAPI GST_QualityControl_SetSink(IQualityControl *iface, IQualityControl *tonotify) { /* Do nothing */ return S_OK;

1 0

Francois Gouget : msvcp60: Make some codecvt_xxx() functions static or remove them.
by Alexandre Julliard 23 Nov '12

23 Nov '12

Module: wine Branch: master Commit: ebd28d5034c2a19d3ae7cd380a71e8a01c05095e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebd28d5034c2a19d3ae7cd380… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Nov 22 18:38:39 2012 +0100 msvcp60: Make some codecvt_xxx() functions static or remove them. --- dlls/msvcp60/locale.c | 22 +--------------------- dlls/msvcp60/msvcp.h | 3 --- 2 files changed, 1 insertions(+), 24 deletions(-) diff --git a/dlls/msvcp60/locale.c b/dlls/msvcp60/locale.c index 1ad21ae..80920c0 100644 --- a/dlls/msvcp60/locale.c +++ b/dlls/msvcp60/locale.c @@ -2551,15 +2551,6 @@ int __thiscall codecvt_char_do_unshift(const codecvt_char *this, return CODECVT_noconv; } -/* ?unshift@?$codecvt@DDH@std@@QBEHAAHPAD1AAPAD@Z */ -/* ?unshift@?$codecvt@DDH@std@@QEBAHAEAHPEAD1AEAPEAD@Z */ -int codecvt_char_unshift(const codecvt_char *this, - int *state, char *to, char *to_end, char **to_next) -{ - TRACE("(%p %p %p %p %p)\n", this, state, to, to_end, to_next); - return call_codecvt_char_do_unshift(this, state, to, to_end, to_next); -} - /* ?do_length@?$codecvt@DDH@std@@MBEHABHPBD1I@Z */ /* ?do_length@?$codecvt@DDH@std@@MEBAHAEBHPEBD1_K@Z */ #define call_codecvt_char_do_length(this, state, from, from_end, max) CALL_VTBL_FUNC(this, 28, \ @@ -2696,7 +2687,7 @@ static MSVCP_size_t codecvt_wchar__Getcat(const locale_facet **facet, const loca return LC_CTYPE; } -codecvt_wchar* codecvt_wchar_use_facet(const locale *loc) +static codecvt_wchar* codecvt_wchar_use_facet(const locale *loc) { static codecvt_wchar *obj = NULL; @@ -2926,17 +2917,6 @@ int __thiscall codecvt_wchar_do_unshift(const codecvt_wchar *this, return CODECVT_ok; } -/* ?unshift@?$codecvt@GDH@std@@QBEHAAHPAD1AAPAD@Z */ -/* ?unshift@?$codecvt@GDH@std@@QEBAHAEAHPEAD1AEAPEAD@Z */ -/* ?unshift@?$codecvt@_WDH@std@@QBEHAAHPAD1AAPAD@Z */ -/* ?unshift@?$codecvt@_WDH@std@@QEBAHAEAHPEAD1AEAPEAD@Z */ -int codecvt_wchar_unshift(const codecvt_wchar *this, - int *state, char *to, char *to_end, char **to_next) -{ - TRACE("(%p %p %p %p %p)\n", this, state, to, to_end, to_next); - return call_codecvt_wchar_do_unshift(this, state, to, to_end, to_next); -} - /* ?do_length@?$codecvt@GDH@std@@MBEHABHPBD1I@Z */ /* ?do_length@?$codecvt@GDH@std@@MEBAHAEBHPEBD1_K@Z */ /* ?do_length@?$codecvt@_WDH@std@@MBEHABHPBD1I@Z */ diff --git a/dlls/msvcp60/msvcp.h b/dlls/msvcp60/msvcp.h index da23e31..cc0e688 100644 --- a/dlls/msvcp60/msvcp.h +++ b/dlls/msvcp60/msvcp.h @@ -107,7 +107,6 @@ typedef struct { } codecvt_char; MSVCP_bool __thiscall codecvt_base_always_noconv(const codecvt_base*); -int codecvt_char_unshift(const codecvt_char*, int*, char*, char*, char**); int __thiscall codecvt_char_out(const codecvt_char*, int*, const char*, const char*, const char**, char*, char*, char**); int __thiscall codecvt_char_in(const codecvt_char*, int*, const char*, @@ -125,7 +124,6 @@ typedef struct { _Cvtvec cvt; } codecvt_wchar; -int codecvt_wchar_unshift(const codecvt_wchar*, int*, char*, char*, char**); int __thiscall codecvt_wchar_out(const codecvt_wchar*, int*, const wchar_t*, const wchar_t*, const wchar_t**, char*, char*, char**); int __thiscall codecvt_wchar_in(const codecvt_wchar*, int*, const char*, @@ -171,7 +169,6 @@ void __thiscall locale_dtor(locale*); void free_locale(void); locale* __thiscall locale__Addfac(locale*, locale_facet*, MSVCP_size_t, MSVCP_size_t); codecvt_char* codecvt_char_use_facet(const locale*); -codecvt_wchar* codecvt_wchar_use_facet(const locale*); codecvt_wchar* codecvt_short_use_facet(const locale*); ctype_char* ctype_char_use_facet(const locale*); ctype_wchar* ctype_wchar_use_facet(const locale*);

1 0

Hans Leidekker : ole32/tests: Add a test to show that CoGetPSClsid is not affected by an override of HKEY_CLASSES_ROOT .
by Alexandre Julliard 22 Nov '12

22 Nov '12

Module: wine Branch: master Commit: 479b7bcf604f40929b1f600f31f8d7dfc8b6c991 URL: http://source.winehq.org/git/wine.git/?a=commit;h=479b7bcf604f40929b1f600f3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 22 17:15:54 2012 +0100 ole32/tests: Add a test to show that CoGetPSClsid is not affected by an override of HKEY_CLASSES_ROOT. --- dlls/ole32/tests/compobj.c | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 9dfc271..048b082 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -41,6 +41,7 @@ static HRESULT (WINAPI * pCoGetObjectContext)(REFIID riid, LPVOID *ppv); static HRESULT (WINAPI * pCoSwitchCallContext)(IUnknown *pObject, IUnknown **ppOldObject); static HRESULT (WINAPI * pCoGetTreatAsClass)(REFCLSID clsidOld, LPCLSID pClsidNew); static HRESULT (WINAPI * pCoGetContextToken)(ULONG_PTR *token); +static LONG (WINAPI * pRegOverridePredefKey)(HKEY key, HKEY override); #define ok_ole_success(hr, func) ok(hr == S_OK, func " failed with error 0x%08x\n", hr) #define ok_more_than_one_lock() ok(cLocks > 0, "Number of locks should be > 0, but actually is %d\n", cLocks) @@ -715,6 +716,8 @@ static void test_CoGetPSClsid(void) { HRESULT hr; CLSID clsid; + HKEY hkey; + LONG res; hr = CoGetPSClsid(&IID_IClassFactory, &clsid); ok(hr == CO_E_NOTINITIALIZED, @@ -736,6 +739,28 @@ static void test_CoGetPSClsid(void) "CoGetPSClsid for null clsid returned 0x%08x instead of E_INVALIDARG\n", hr); + if (!pRegOverridePredefKey) + { + win_skip("RegOverridePredefKey not available\n"); + CoUninitialize(); + return; + } + hr = CoGetPSClsid(&IID_IClassFactory, &clsid); + ok_ole_success(hr, "CoGetPSClsid"); + + res = RegOpenKeyExA(HKEY_CURRENT_USER, "Software\\Classes", 0, KEY_ALL_ACCESS, &hkey); + ok(!res, "RegOpenKeyExA returned %d\n", res); + + res = pRegOverridePredefKey(HKEY_CLASSES_ROOT, hkey); + ok(!res, "RegOverridePredefKey returned %d\n", res); + + hr = CoGetPSClsid(&IID_IClassFactory, &clsid); + todo_wine ok_ole_success(hr, "CoGetPSClsid"); + + res = pRegOverridePredefKey(HKEY_CLASSES_ROOT, NULL); + ok(!res, "RegOverridePredefKey returned %d\n", res); + + RegCloseKey(hkey); CoUninitialize(); } @@ -1512,10 +1537,12 @@ static void test_CoInitializeEx(void) START_TEST(compobj) { HMODULE hOle32 = GetModuleHandle("ole32"); + HMODULE hAdvapi32 = GetModuleHandle("advapi32"); pCoGetObjectContext = (void*)GetProcAddress(hOle32, "CoGetObjectContext"); pCoSwitchCallContext = (void*)GetProcAddress(hOle32, "CoSwitchCallContext"); pCoGetTreatAsClass = (void*)GetProcAddress(hOle32,"CoGetTreatAsClass"); pCoGetContextToken = (void*)GetProcAddress(hOle32, "CoGetContextToken"); + pRegOverridePredefKey = (void*)GetProcAddress(hAdvapi32, "RegOverridePredefKey"); if (!(pCoInitializeEx = (void*)GetProcAddress(hOle32, "CoInitializeEx"))) { trace("You need DCOM95 installed to run this test\n");

1 0

Christian Costa : strmbase: Don' t forget to add ref pUnk in CopyMediaType when pbFormat is null.
by Alexandre Julliard 22 Nov '12

22 Nov '12

Module: wine Branch: master Commit: b8a7ead3a3015ee18843743997c9fbe9503cdbc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8a7ead3a3015ee1884374399… Author: Christian Costa <titan.costa(a)gmail.com> Date: Wed Nov 21 09:48:06 2012 +0100 strmbase: Don't forget to add ref pUnk in CopyMediaType when pbFormat is null. --- dlls/strmbase/mediatype.c | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/strmbase/mediatype.c b/dlls/strmbase/mediatype.c index 7f19791..fef2739 100644 --- a/dlls/strmbase/mediatype.c +++ b/dlls/strmbase/mediatype.c @@ -28,15 +28,18 @@ WINE_DEFAULT_DEBUG_CHANNEL(strmbase); -HRESULT WINAPI CopyMediaType(AM_MEDIA_TYPE * pDest, const AM_MEDIA_TYPE *pSrc) +HRESULT WINAPI CopyMediaType(AM_MEDIA_TYPE *dest, const AM_MEDIA_TYPE *src) { - *pDest = *pSrc; - if (!pSrc->pbFormat) return S_OK; - if (!(pDest->pbFormat = CoTaskMemAlloc(pSrc->cbFormat))) - return E_OUTOFMEMORY; - memcpy(pDest->pbFormat, pSrc->pbFormat, pSrc->cbFormat); - if (pDest->pUnk) - IUnknown_AddRef(pDest->pUnk); + *dest = *src; + if (src->pbFormat) + { + dest->pbFormat = CoTaskMemAlloc(src->cbFormat); + if (!dest->pbFormat) + return E_OUTOFMEMORY; + memcpy(dest->pbFormat, src->pbFormat, src->cbFormat); + } + if (dest->pUnk) + IUnknown_AddRef(dest->pUnk); return S_OK; }

1 0

Christian Costa : strmbase: Use FreeMediaType instead of freeing media type by hand and forgetting pUnk release .
by Alexandre Julliard 22 Nov '12

22 Nov '12

Module: wine Branch: master Commit: 44c6ca992e7094e625a589b104d0e2e61adf79e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44c6ca992e7094e625a589b10… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Nov 16 15:17:33 2012 +0100 strmbase: Use FreeMediaType instead of freeing media type by hand and forgetting pUnk release. --- dlls/strmbase/mediatype.c | 26 ++++++++++++-------------- 1 files changed, 12 insertions(+), 14 deletions(-) diff --git a/dlls/strmbase/mediatype.c b/dlls/strmbase/mediatype.c index 9c76287..7f19791 100644 --- a/dlls/strmbase/mediatype.c +++ b/dlls/strmbase/mediatype.c @@ -122,7 +122,7 @@ HRESULT WINAPI EnumMediaTypes_Construct(BasePin *basePin, BasePin_GetMediaType e pEnumMediaTypes->basePin = basePin; i = 0; - while (enumFunc(basePin,i,&amt) == S_OK) i++; + while (enumFunc(basePin, i, &amt) == S_OK) i++; pEnumMediaTypes->enumMediaDetails.cMediaTypes = i; pEnumMediaTypes->enumMediaDetails.pMediaTypes = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE) * i); @@ -131,10 +131,10 @@ HRESULT WINAPI EnumMediaTypes_Construct(BasePin *basePin, BasePin_GetMediaType e enumFunc(basePin,i,&amt); if (FAILED(CopyMediaType(&pEnumMediaTypes->enumMediaDetails.pMediaTypes[i], &amt))) { - while (i--) - CoTaskMemFree(pEnumMediaTypes->enumMediaDetails.pMediaTypes[i].pbFormat); - CoTaskMemFree(pEnumMediaTypes->enumMediaDetails.pMediaTypes); - return E_OUTOFMEMORY; + while (i--) + FreeMediaType(&pEnumMediaTypes->enumMediaDetails.pMediaTypes[i]); + CoTaskMemFree(pEnumMediaTypes->enumMediaDetails.pMediaTypes); + return E_OUTOFMEMORY; } } *ppEnum = &pEnumMediaTypes->IEnumMediaTypes_iface; @@ -185,8 +185,7 @@ static ULONG WINAPI IEnumMediaTypesImpl_Release(IEnumMediaTypes * iface) { ULONG i; for (i = 0; i < This->enumMediaDetails.cMediaTypes; i++) - if (This->enumMediaDetails.pMediaTypes[i].pbFormat) - CoTaskMemFree(This->enumMediaDetails.pMediaTypes[i].pbFormat); + FreeMediaType(&This->enumMediaDetails.pMediaTypes[i]); CoTaskMemFree(This->enumMediaDetails.pMediaTypes); IPin_Release(&This->basePin->IPin_iface); CoTaskMemFree(This); @@ -255,12 +254,11 @@ static HRESULT WINAPI IEnumMediaTypesImpl_Reset(IEnumMediaTypes * iface) TRACE("()\n"); for (i = 0; i < This->enumMediaDetails.cMediaTypes; i++) - if (This->enumMediaDetails.pMediaTypes[i].pbFormat) - CoTaskMemFree(This->enumMediaDetails.pMediaTypes[i].pbFormat); + FreeMediaType(&This->enumMediaDetails.pMediaTypes[i]); CoTaskMemFree(This->enumMediaDetails.pMediaTypes); i = 0; - while (This->enumMediaFunction(This->basePin, i,&amt) == S_OK) i++; + while (This->enumMediaFunction(This->basePin, i, &amt) == S_OK) i++; This->enumMediaDetails.cMediaTypes = i; This->enumMediaDetails.pMediaTypes = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE) * i); @@ -269,10 +267,10 @@ static HRESULT WINAPI IEnumMediaTypesImpl_Reset(IEnumMediaTypes * iface) This->enumMediaFunction(This->basePin, i,&amt); if (FAILED(CopyMediaType(&This->enumMediaDetails.pMediaTypes[i], &amt))) { - while (i--) - CoTaskMemFree(This->enumMediaDetails.pMediaTypes[i].pbFormat); - CoTaskMemFree(This->enumMediaDetails.pMediaTypes); - return E_OUTOFMEMORY; + while (i--) + FreeMediaType(&This->enumMediaDetails.pMediaTypes[i]); + CoTaskMemFree(This->enumMediaDetails.pMediaTypes); + return E_OUTOFMEMORY; } }

1 0

Henri Verbeet : d3d10core: Implement d3d10_device_RSGetScissorRects().
by Alexandre Julliard 22 Nov '12

22 Nov '12

Module: wine Branch: master Commit: 9e97bff539afbb77d01bd9e24db4b88bed49fdbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e97bff539afbb77d01bd9e24… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 22 13:45:13 2012 +0100 d3d10core: Implement d3d10_device_RSGetScissorRects(). --- dlls/d3d10core/device.c | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index facacbd..78c9d1b 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -742,7 +742,22 @@ static void STDMETHODCALLTYPE d3d10_device_RSGetViewports(ID3D10Device *iface, static void STDMETHODCALLTYPE d3d10_device_RSGetScissorRects(ID3D10Device *iface, UINT *rect_count, D3D10_RECT *rects) { - FIXME("iface %p, rect_count %p, rects %p stub!\n", iface, rect_count, rects); + struct d3d10_device *device = impl_from_ID3D10Device(iface); + + TRACE("iface %p, rect_count %p, rects %p.\n", iface, rect_count, rects); + + if (!rects) + { + *rect_count = 1; + return; + } + + if (!*rect_count) + return; + + wined3d_device_get_scissor_rect(device->wined3d_device, rects); + if (*rect_count > 1) + memset(&rects[1], 0, (*rect_count - 1) * sizeof(*rects)); } static HRESULT STDMETHODCALLTYPE d3d10_device_GetDeviceRemovedReason(ID3D10Device *iface)

1 0

Henri Verbeet : d3d10core: Implement d3d10_device_RSSetScissorRects().
by Alexandre Julliard 22 Nov '12

22 Nov '12

Module: wine Branch: master Commit: 2a8359d44c5cf243c9e498d483dae573868ec259 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a8359d44c5cf243c9e498d48… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 22 13:45:12 2012 +0100 d3d10core: Implement d3d10_device_RSSetScissorRects(). --- dlls/d3d10core/device.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 853c538..facacbd 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -1,5 +1,5 @@ /* - * Copyright 2008-2009 Henri Verbeet for CodeWeavers + * Copyright 2008-2012 Henri Verbeet for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -391,7 +391,17 @@ static void STDMETHODCALLTYPE d3d10_device_RSSetViewports(ID3D10Device *iface, static void STDMETHODCALLTYPE d3d10_device_RSSetScissorRects(ID3D10Device *iface, UINT rect_count, const D3D10_RECT *rects) { - FIXME("iface %p, rect_count %u, rects %p\n", iface, rect_count, rects); + struct d3d10_device *device = impl_from_ID3D10Device(iface); + + TRACE("iface %p, rect_count %u, rects %p.\n", iface, rect_count, rects); + + if (rect_count > 1) + FIXME("Multiple scissor rects not implemented.\n"); + + if (!rect_count) + return; + + wined3d_device_set_scissor_rect(device->wined3d_device, rects); } static void STDMETHODCALLTYPE d3d10_device_CopySubresourceRegion(ID3D10Device *iface,

1 0

Henri Verbeet : d3dx9: Avoid LPD3DXFILESAVEDATA.
by Alexandre Julliard 22 Nov '12

22 Nov '12

Module: wine Branch: master Commit: b698e51c7a75367b7251476b76d20486092841d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b698e51c7a75367b7251476b7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 22 13:45:11 2012 +0100 d3dx9: Avoid LPD3DXFILESAVEDATA. --- include/d3dx9xof.h | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/include/d3dx9xof.h b/include/d3dx9xof.h index 9789ffd..8e08cca 100644 --- a/include/d3dx9xof.h +++ b/include/d3dx9xof.h @@ -93,7 +93,8 @@ DECLARE_INTERFACE_IID_(ID3DXFileSaveObject,IUnknown,"cef08cfa-7b4f-4429-9624-2a6 STDMETHOD_(ULONG,Release)(THIS) PURE; /*** ID3DXFileSaveObject methods ***/ STDMETHOD(GetFile)(THIS_ LPD3DXFILE*) PURE; - STDMETHOD(AddDataObject)(THIS_ REFGUID, LPCSTR, CONST GUID*, SIZE_T, LPCVOID, LPD3DXFILESAVEDATA*) PURE; + STDMETHOD(AddDataObject)(THIS_ REFGUID template_guid, const char *name, const GUID *guid, + SIZE_T data_size, const void *data, struct ID3DXFileSaveData **obj) PURE; STDMETHOD(Save)(THIS) PURE; }; #undef INTERFACE @@ -110,7 +111,8 @@ DECLARE_INTERFACE_IID_(ID3DXFileSaveData,IUnknown,"cef08cfb-7b4f-4429-9624-2a690 STDMETHOD(GetName)(THIS_ LPSTR, SIZE_T*) PURE; STDMETHOD(GetId)(THIS_ LPGUID) PURE; STDMETHOD(GetType)(THIS_ GUID*) PURE; - STDMETHOD(AddDataObject)(THIS_ REFGUID, LPCSTR, CONST GUID*, SIZE_T, LPCVOID, LPD3DXFILESAVEDATA*) PURE; + STDMETHOD(AddDataObject)(THIS_ REFGUID template_guid, const char *name, const GUID *guid, + SIZE_T data_size, const void *data, ID3DXFileSaveData **obj) PURE; STDMETHOD(AddDataReference)(THIS_ LPCSTR, CONST GUID*) PURE; }; #undef INTERFACE

1 0

Henri Verbeet : d3dx9: Avoid LPD3DXFILEENUMOBJECT.
by Alexandre Julliard 22 Nov '12

22 Nov '12

Module: wine Branch: master Commit: 3c4c23f4592a3d713a7e9275f73e120d9e31730d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c4c23f4592a3d713a7e9275f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 22 13:45:10 2012 +0100 d3dx9: Avoid LPD3DXFILEENUMOBJECT. --- include/d3dx9xof.h | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/include/d3dx9xof.h b/include/d3dx9xof.h index f110a1f..9789ffd 100644 --- a/include/d3dx9xof.h +++ b/include/d3dx9xof.h @@ -76,10 +76,11 @@ DECLARE_INTERFACE_IID_(ID3DXFile,IUnknown,"cef08cf9-7b4f-4429-9624-2a690a933201" STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; /*** ID3DXFile methods ***/ - STDMETHOD(CreateEnumObject)(THIS_ LPCVOID, D3DXF_FILELOADOPTIONS, LPD3DXFILEENUMOBJECT*) PURE; + STDMETHOD(CreateEnumObject)(THIS_ const void *src, D3DXF_FILELOADOPTIONS type, + struct ID3DXFileEnumObject **enum_obj) PURE; STDMETHOD(CreateSaveObject)(THIS_ LPCVOID, D3DXF_FILESAVEOPTIONS, D3DXF_FILEFORMAT, LPD3DXFILESAVEOBJECT*) PURE; STDMETHOD(RegisterTemplates)(THIS_ LPCVOID, SIZE_T) PURE; - STDMETHOD(RegisterEnumTemplates)(THIS_ LPD3DXFILEENUMOBJECT) PURE; + STDMETHOD(RegisterEnumTemplates)(THIS_ struct ID3DXFileEnumObject *enum_obj) PURE; }; #undef INTERFACE @@ -139,7 +140,7 @@ DECLARE_INTERFACE_IID_(ID3DXFileData,IUnknown,"cef08cfd-7b4f-4429-9624-2a690a933 STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; /*** ID3DXFileData methods ***/ - STDMETHOD(GetEnum)(THIS_ LPD3DXFILEENUMOBJECT*) PURE; + STDMETHOD(GetEnum)(THIS_ ID3DXFileEnumObject **enum_obj) PURE; STDMETHOD(GetName)(THIS_ LPSTR, SIZE_T*) PURE; STDMETHOD(GetId)(THIS_ LPGUID) PURE; STDMETHOD(Lock)(THIS_ SIZE_T*, LPCVOID*) PURE;

1 0

Henri Verbeet : d3dx9: Avoid LPD3DXFILEDATA.
by Alexandre Julliard 22 Nov '12

22 Nov '12

Module: wine Branch: master Commit: b868105e4b9c87dcc6fbaafb084a69e386c472b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b868105e4b9c87dcc6fbaafb0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 22 13:45:09 2012 +0100 d3dx9: Avoid LPD3DXFILEDATA. --- include/d3dx9anim.h | 6 +++--- include/d3dx9xof.h | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/d3dx9anim.h b/include/d3dx9anim.h index 0c9d7b9..9a25ec8 100644 --- a/include/d3dx9anim.h +++ b/include/d3dx9anim.h @@ -183,9 +183,9 @@ DECLARE_INTERFACE(ID3DXAllocateHierarchy) #define INTERFACE ID3DXLoadUserData DECLARE_INTERFACE(ID3DXLoadUserData) { - STDMETHOD(LoadTopLevelData)(LPD3DXFILEDATA child_data) PURE; - STDMETHOD(LoadFrameChildData)(LPD3DXFRAME frame, LPD3DXFILEDATA child_data) PURE; - STDMETHOD(LoadMeshChildData)(LPD3DXMESHCONTAINER mesh_container, LPD3DXFILEDATA child_data) PURE; + STDMETHOD(LoadTopLevelData)(ID3DXFileData *child_data) PURE; + STDMETHOD(LoadFrameChildData)(D3DXFRAME *frame, ID3DXFileData *child_data) PURE; + STDMETHOD(LoadMeshChildData)(D3DXMESHCONTAINER *mesh_container, ID3DXFileData *child_data) PURE; }; #undef INTERFACE diff --git a/include/d3dx9xof.h b/include/d3dx9xof.h index 123f0ac..f110a1f 100644 --- a/include/d3dx9xof.h +++ b/include/d3dx9xof.h @@ -125,9 +125,9 @@ DECLARE_INTERFACE_IID_(ID3DXFileEnumObject,IUnknown,"cef08cfc-7b4f-4429-9624-2a6 /*** ID3DXFileEnumObject methods ***/ STDMETHOD(GetFile)(THIS_ LPD3DXFILE*) PURE; STDMETHOD(GetChildren)(THIS_ SIZE_T*) PURE; - STDMETHOD(GetChild)(THIS_ SIZE_T, LPD3DXFILEDATA*) PURE; - STDMETHOD(GetDataObjectById)(THIS_ REFGUID, LPD3DXFILEDATA*) PURE; - STDMETHOD(GetDataObjectByName)(THIS_ LPCSTR, LPD3DXFILEDATA*) PURE; + STDMETHOD(GetChild)(THIS_ SIZE_T id, struct ID3DXFileData **child) PURE; + STDMETHOD(GetDataObjectById)(THIS_ REFGUID guid, struct ID3DXFileData **obj) PURE; + STDMETHOD(GetDataObjectByName)(THIS_ const char *name, struct ID3DXFileData **obj) PURE; }; #undef INTERFACE @@ -147,7 +147,7 @@ DECLARE_INTERFACE_IID_(ID3DXFileData,IUnknown,"cef08cfd-7b4f-4429-9624-2a690a933 STDMETHOD(GetType)(THIS_ GUID*) PURE; STDMETHOD_(BOOL,IsReference)(THIS) PURE; STDMETHOD(GetChildren)(THIS_ SIZE_T*) PURE; - STDMETHOD(GetChild)(THIS_ SIZE_T, LPD3DXFILEDATA*) PURE; + STDMETHOD(GetChild)(THIS_ SIZE_T id, ID3DXFileData **child) PURE; }; #undef INTERFACE

1 0

Jacek Caban : advapi32: Added debug trace to RegOverridePredefKey.
by Alexandre Julliard 22 Nov '12

22 Nov '12

Module: wine Branch: master Commit: d331118bfd3f71bd8e336e011c3ce2f0afd16ad4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d331118bfd3f71bd8e336e011… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 22 12:40:40 2012 +0100 advapi32: Added debug trace to RegOverridePredefKey. --- dlls/advapi32/registry.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index d3b8edf..744908f 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -284,6 +284,8 @@ LSTATUS WINAPI RegOverridePredefKey( HKEY hkey, HKEY override ) HKEY old_key; int idx; + TRACE("(%p %p)\n", hkey, override); + if ((hkey < HKEY_SPECIAL_ROOT_FIRST) || (hkey > HKEY_SPECIAL_ROOT_LAST)) return ERROR_INVALID_PARAMETER; idx = (UINT_PTR)hkey - (UINT_PTR)HKEY_SPECIAL_ROOT_FIRST;

1 0

Jacek Caban : atl: Don't forward AtlModule* calls to atl100.dll.
by Alexandre Julliard 22 Nov '12

22 Nov '12

Module: wine Branch: master Commit: fed2d49fd9d69bf597f117f6e36bef9adca78ed5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fed2d49fd9d69bf597f117f6e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 22 12:33:25 2012 +0100 atl: Don't forward AtlModule* calls to atl100.dll. --- dlls/atl/atl.spec | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/atl/atl.spec b/dlls/atl/atl.spec index c043d3e..1de6f0c 100644 --- a/dlls/atl/atl.spec +++ b/dlls/atl/atl.spec @@ -34,10 +34,10 @@ 40 stdcall AtlAxCreateControlEx(ptr ptr ptr ptr ptr ptr ptr) atl100.AtlAxCreateControlEx 41 stdcall AtlAxAttachControl(ptr ptr ptr) atl100.AtlAxAttachControl 42 stdcall AtlAxWinInit() atl100.AtlAxWinInit -43 stdcall AtlModuleAddCreateWndData(ptr ptr ptr) atl100.AtlModuleAddCreateWndData -44 stdcall AtlModuleExtractCreateWndData(ptr) atl100.AtlModuleExtractCreateWndData -45 stdcall AtlModuleRegisterWndClassInfoW(ptr ptr ptr) atl100.AtlModuleRegisterWndClassInfoW -46 stdcall AtlModuleRegisterWndClassInfoA(ptr ptr ptr) atl100.AtlModuleRegisterWndClassInfoA +43 stdcall AtlModuleAddCreateWndData(ptr ptr ptr) +44 stdcall AtlModuleExtractCreateWndData(ptr) +45 stdcall AtlModuleRegisterWndClassInfoW(ptr ptr ptr) +46 stdcall AtlModuleRegisterWndClassInfoA(ptr ptr ptr) 47 stdcall AtlAxGetControl(long ptr) atl100.AtlAxGetControl 48 stdcall AtlAxGetHost(long ptr) atl100.AtlAxGetHost 49 stub AtlRegisterClassCategoriesHelper

1 0

Maarten Lankhorst : dsound: Create a primary_pwfx separately from pwfx.
by Alexandre Julliard 22 Nov '12

22 Nov '12

Module: wine Branch: master Commit: 605cd62c7dc84ef86cbd260139c6875cd0ed8d60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=605cd62c7dc84ef86cbd26013… Author: Maarten Lankhorst <maarten.lankhorst(a)canonical.com> Date: Fri Nov 16 20:35:51 2012 +0100 dsound: Create a primary_pwfx separately from pwfx. --- dlls/dsound/dsound.c | 35 ++++- dlls/dsound/dsound_main.c | 10 -- dlls/dsound/dsound_private.h | 8 +- dlls/dsound/mixer.c | 1 + dlls/dsound/primary.c | 334 ++++++++++++++++++++++-------------------- 5 files changed, 204 insertions(+), 184 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=605cd62c7dc84ef86cbd2…

1 0

Alexandre Julliard : user32: Fix the wait event mask in PeekMessage.
by Alexandre Julliard 22 Nov '12

22 Nov '12

Module: wine Branch: master Commit: a0f039a6049641cc2be8fa32f2afa3c3f394a99b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0f039a6049641cc2be8fa32f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 22 11:57:15 2012 +0100 user32: Fix the wait event mask in PeekMessage. --- dlls/user32/message.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index ba37a3a..8ca259b 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -3690,7 +3690,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH PeekMessageW( MSG *msg_out, HWND hwnd, UINT first, if (flags & PM_NOYIELD) ret = USER_Driver->pMsgWaitForMultipleObjectsEx( 0, NULL, 0, QS_ALLINPUT, 0 ); else - ret = wow_handlers.wait_message( 0, NULL, 0, 0, 0 ); + ret = wow_handlers.wait_message( 0, NULL, 0, QS_ALLINPUT, 0 ); /* if we received driver events, check again for a pending message */ if (ret == WAIT_TIMEOUT || !peek_message( &msg, hwnd, first, last, flags, 0 )) return FALSE;

1 0

Dmitry Timoshkov : windowscodecs: Implement QueryCapability in the GIF decoder.
by Alexandre Julliard 22 Nov '12

22 Nov '12

Module: wine Branch: master Commit: 7baf4ecd064a0c226ce3ceb2b83182a70328d65e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7baf4ecd064a0c226ce3ceb2b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Nov 22 18:27:22 2012 +0800 windowscodecs: Implement QueryCapability in the GIF decoder. --- dlls/windowscodecs/gifformat.c | 19 +++++++++++++++---- 1 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/gifformat.c b/dlls/windowscodecs/gifformat.c index eb8a37b..d87a6e7 100644 --- a/dlls/windowscodecs/gifformat.c +++ b/dlls/windowscodecs/gifformat.c @@ -1064,11 +1064,22 @@ static ULONG WINAPI GifDecoder_Release(IWICBitmapDecoder *iface) return ref; } -static HRESULT WINAPI GifDecoder_QueryCapability(IWICBitmapDecoder *iface, IStream *pIStream, - DWORD *pdwCapability) +static HRESULT WINAPI GifDecoder_QueryCapability(IWICBitmapDecoder *iface, IStream *stream, + DWORD *capability) { - FIXME("(%p,%p,%p): stub\n", iface, pIStream, pdwCapability); - return E_NOTIMPL; + HRESULT hr; + + TRACE("(%p,%p,%p)\n", iface, stream, capability); + + if (!stream || !capability) return E_INVALIDARG; + + hr = IWICBitmapDecoder_Initialize(iface, stream, WICDecodeMetadataCacheOnDemand); + if (hr != S_OK) return hr; + + *capability = WICBitmapDecoderCapabilityCanDecodeAllImages | + WICBitmapDecoderCapabilityCanDecodeSomeImages | + WICBitmapDecoderCapabilityCanEnumerateMetadata; + return S_OK; } static int _gif_inputfunc(GifFileType *gif, GifByteType *data, int len) {

1 0

Dmitry Timoshkov : windowscodecs: Reimplement GetFrameCount of the GIF decoder.
by Alexandre Julliard 22 Nov '12

22 Nov '12

Module: wine Branch: master Commit: 892c16e6611fa70c28558c93ac3228617fb1fa15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=892c16e6611fa70c28558c93a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Nov 22 18:26:28 2012 +0800 windowscodecs: Reimplement GetFrameCount of the GIF decoder. --- dlls/windowscodecs/gifformat.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/gifformat.c b/dlls/windowscodecs/gifformat.c index 4fa10e0..eb8a37b 100644 --- a/dlls/windowscodecs/gifformat.c +++ b/dlls/windowscodecs/gifformat.c @@ -1241,13 +1241,14 @@ static HRESULT WINAPI GifDecoder_GetFrameCount(IWICBitmapDecoder *iface, UINT *pCount) { GifDecoder *This = impl_from_IWICBitmapDecoder(iface); - TRACE("(%p,%p)\n", iface, pCount); - if (!This->initialized) return WINCODEC_ERR_NOTINITIALIZED; + if (!pCount) return E_INVALIDARG; - *pCount = This->gif->ImageCount; + EnterCriticalSection(&This->lock); + *pCount = This->gif ? This->gif->ImageCount : 0; + LeaveCriticalSection(&This->lock); - TRACE("<- %u\n", *pCount); + TRACE("(%p) <-- %d\n", iface, *pCount); return S_OK; }

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
29
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2012