September 2013 - Wine-commits

Jacek Caban : mshtml: Add trailing null byte to post data.
by Alexandre Julliard 26 Sep '13

26 Sep '13

Module: wine Branch: master Commit: 7bcbb93c5a308c5270dacf265dfc03764a8fd0cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bcbb93c5a308c5270dacf265… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 26 17:35:13 2013 +0200 mshtml: Add trailing null byte to post data. --- dlls/mshtml/navigate.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 539d2c4..be3d1a8 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1022,7 +1022,7 @@ static HRESULT read_post_data_stream(nsIInputStream *stream, BOOL contains_heade if(NS_FAILED(nsres)) return E_FAIL; - post_data = data = GlobalAlloc(0, available); + post_data = data = GlobalAlloc(0, available+1); if(!data) return E_OUTOFMEMORY; @@ -1080,7 +1080,7 @@ static HRESULT read_post_data_stream(nsIInputStream *stream, BOOL contains_heade }else if(post_data != data) { char *new_data; - new_data = GlobalAlloc(0, data_len); + new_data = GlobalAlloc(0, data_len+1); if(new_data) memcpy(new_data, post_data, data_len); GlobalFree(data); @@ -1089,6 +1089,7 @@ static HRESULT read_post_data_stream(nsIInputStream *stream, BOOL contains_heade post_data = new_data; } + post_data[data_len] = 0; request_data->post_data = post_data; request_data->post_data_len = data_len; TRACE("post_data = %s\n", debugstr_an(request_data->post_data, request_data->post_data_len)); @@ -1877,7 +1878,7 @@ HRESULT create_channelbsc(IMoniker *mon, const WCHAR *headers, BYTE *post_data, } if(post_data) { - ret->bsc.request_data.post_data = GlobalAlloc(0, post_data_size); + ret->bsc.request_data.post_data = GlobalAlloc(0, post_data_size+1); if(!ret->bsc.request_data.post_data) { release_request_data(&ret->bsc.request_data); IBindStatusCallback_Release(&ret->bsc.IBindStatusCallback_iface); @@ -1885,6 +1886,7 @@ HRESULT create_channelbsc(IMoniker *mon, const WCHAR *headers, BYTE *post_data, } memcpy(ret->bsc.request_data.post_data, post_data, post_data_size); + ((BYTE*)ret->bsc.request_data.post_data)[post_data_size] = 0; ret->bsc.request_data.post_data_len = post_data_size; }

1 0

André Hentschel : winebuild: Update IMAGE_FILE_MACHINE_ARM64.
by Alexandre Julliard 26 Sep '13

26 Sep '13

Module: wine Branch: master Commit: e99e9d8d82f91c86377436367a4bd69f4b2ba241 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e99e9d8d82f91c86377436367… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Sep 25 20:51:10 2013 +0200 winebuild: Update IMAGE_FILE_MACHINE_ARM64. According to pecoff 8.3. --- include/winnt.h | 4 +--- tools/winebuild/spec32.c | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index be55d9c..a2fcd43 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -2460,6 +2460,7 @@ typedef struct _IMAGE_VXD_HEADER { #define IMAGE_FILE_MACHINE_ARM 0x01c0 #define IMAGE_FILE_MACHINE_THUMB 0x01c2 #define IMAGE_FILE_MACHINE_ARMNT 0x01c4 +#define IMAGE_FILE_MACHINE_ARM64 0xaa64 #define IMAGE_FILE_MACHINE_AM33 0x01d3 #define IMAGE_FILE_MACHINE_POWERPC 0x01f0 #define IMAGE_FILE_MACHINE_POWERPCFP 0x01f1 @@ -2476,9 +2477,6 @@ typedef struct _IMAGE_VXD_HEADER { #define IMAGE_FILE_MACHINE_M32R 0x9041 #define IMAGE_FILE_MACHINE_CEE 0xc0ee -/* Wine extension */ -#define IMAGE_FILE_MACHINE_ARM64 0x01c5 - #define IMAGE_SIZEOF_FILE_HEADER 20 #define IMAGE_SIZEOF_ROM_OPTIONAL_HEADER 56 #define IMAGE_SIZEOF_STD_OPTIONAL_HEADER 28 diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index ae739d8..0ed38ed 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -37,8 +37,7 @@ #define IMAGE_FILE_MACHINE_POWERPC 0x01f0 #define IMAGE_FILE_MACHINE_AMD64 0x8664 #define IMAGE_FILE_MACHINE_ARMNT 0x01C4 -/* Wine extension */ -#define IMAGE_FILE_MACHINE_ARM64 0x01C5 +#define IMAGE_FILE_MACHINE_ARM64 0xaa64 #define IMAGE_SIZEOF_NT_OPTIONAL32_HEADER 224 #define IMAGE_SIZEOF_NT_OPTIONAL64_HEADER 240

1 0

Michael Stefaniuc : include: Avoid using CONST in d3d8.h.
by Alexandre Julliard 26 Sep '13

26 Sep '13

Module: wine Branch: master Commit: df64b0fbe2e8a4a6e284ff07ac493bfaa025a9d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df64b0fbe2e8a4a6e284ff07a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Sep 25 23:07:52 2013 +0200 include: Avoid using CONST in d3d8.h. --- include/d3d8.h | 87 +++++++++++++++++++++++++++++++------------------------ 1 files changed, 49 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=df64b0fbe2e8a4a6e284f…

1 0

Henri Verbeet : wined3d: Initialize the default state in device_init().
by Alexandre Julliard 26 Sep '13

26 Sep '13

Module: wine Branch: master Commit: 6793fa71575ec840d902e453e3f68478066abf7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6793fa71575ec840d902e453e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 26 09:31:53 2013 +0200 wined3d: Initialize the default state in device_init(). --- dlls/wined3d/device.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 2014338..bcafa9f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -896,8 +896,6 @@ HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, goto err_out; } device->swapchains[0] = swapchain; - - state_init_default(&device->state, device); device_init_swapchain_state(device, swapchain); context = context_acquire(device, swapchain->front_buffer); @@ -4984,6 +4982,7 @@ HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d, wined3d_decref(device->wined3d); return hr; } + state_init_default(&device->state, device); device->update_state = &device->state; return WINED3D_OK;

1 0

Henri Verbeet : wined3d: Initialize the fb state pointer in state_init().
by Alexandre Julliard 26 Sep '13

26 Sep '13

Module: wine Branch: master Commit: abbc595fc127298dce07ba20fc5aeeb9708c0628 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abbc595fc127298dce07ba20f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 26 09:31:54 2013 +0200 wined3d: Initialize the fb state pointer in state_init(). --- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/stateblock.c | 9 +++++---- dlls/wined3d/wined3d_private.h | 3 ++- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index bcafa9f..ab3364d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4708,7 +4708,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, if (device->d3d_initialized) delete_opengl_contexts(device, swapchain); - if (FAILED(hr = state_init(&device->state, &device->adapter->d3d_info))) + if (FAILED(hr = state_init(&device->state, &device->fb, &device->adapter->d3d_info))) ERR("Failed to initialize device state, hr %#x.\n", hr); state_init_default(&device->state, device); device->update_state = &device->state; @@ -4972,7 +4972,7 @@ HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d, device->blitter = adapter->blitter; - if (FAILED(hr = state_init(&device->state, &adapter->d3d_info))) + if (FAILED(hr = state_init(&device->state, &device->fb, &adapter->d3d_info))) { ERR("Failed to initialize device state, hr %#x.\n", hr); for (i = 0; i < sizeof(device->multistate_funcs) / sizeof(device->multistate_funcs[0]); ++i) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 6bdbb1b..5c90c22 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -598,10 +598,13 @@ void state_cleanup(struct wined3d_state *state) HeapFree(GetProcessHeap(), 0, state->ps_consts_f); } -HRESULT state_init(struct wined3d_state *state, const struct wined3d_d3d_info *d3d_info) +HRESULT state_init(struct wined3d_state *state, struct wined3d_fb_state *fb, + const struct wined3d_d3d_info *d3d_info) { unsigned int i; + state->fb = fb; + for (i = 0; i < LIGHTMAP_SIZE; i++) { list_init(&state->light_map[i]); @@ -1199,8 +1202,6 @@ void state_init_default(struct wined3d_state *state, struct wined3d_device *devi state->transforms[WINED3D_TS_WORLD_MATRIX(i)] = identity; } - state->fb = &device->fb; - TRACE("Render states\n"); /* Render states: */ state->render_states[WINED3D_RS_ZENABLE] = WINED3D_ZB_TRUE; @@ -1386,7 +1387,7 @@ static HRESULT stateblock_init(struct wined3d_stateblock *stateblock, stateblock->ref = 1; stateblock->device = device; - if (FAILED(hr = state_init(&stateblock->state, d3d_info))) + if (FAILED(hr = state_init(&stateblock->state, NULL, d3d_info))) return hr; if (FAILED(hr = stateblock_allocate_shader_constants(stateblock))) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5525dd9..515079a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2447,7 +2447,8 @@ struct wined3d_stateblock void stateblock_init_contained_states(struct wined3d_stateblock *stateblock) DECLSPEC_HIDDEN; void state_cleanup(struct wined3d_state *state) DECLSPEC_HIDDEN; -HRESULT state_init(struct wined3d_state *state, const struct wined3d_d3d_info *d3d_info) DECLSPEC_HIDDEN; +HRESULT state_init(struct wined3d_state *state, struct wined3d_fb_state *fb, + const struct wined3d_d3d_info *d3d_info) DECLSPEC_HIDDEN; void state_init_default(struct wined3d_state *state, struct wined3d_device *device) DECLSPEC_HIDDEN; void state_unbind_resources(struct wined3d_state *state) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Explicitly pass gl_info to state_init_default().
by Alexandre Julliard 26 Sep '13

26 Sep '13

Module: wine Branch: master Commit: 4a9da034ab1ddc16cf0ffe7cc2a792cea4b7a44a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a9da034ab1ddc16cf0ffe7cc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 26 09:31:55 2013 +0200 wined3d: Explicitly pass gl_info to state_init_default(). --- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/stateblock.c | 5 ++--- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ab3364d..34ceaa7 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4710,7 +4710,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, if (FAILED(hr = state_init(&device->state, &device->fb, &device->adapter->d3d_info))) ERR("Failed to initialize device state, hr %#x.\n", hr); - state_init_default(&device->state, device); + state_init_default(&device->state, &device->adapter->gl_info); device->update_state = &device->state; device_init_swapchain_state(device, swapchain); @@ -4982,7 +4982,7 @@ HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d, wined3d_decref(device->wined3d); return hr; } - state_init_default(&device->state, device); + state_init_default(&device->state, &adapter->gl_info); device->update_state = &device->state; return WINED3D_OK; diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 5c90c22..c990e7d 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1171,9 +1171,8 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) TRACE("Applied stateblock %p.\n", stateblock); } -void state_init_default(struct wined3d_state *state, struct wined3d_device *device) +void state_init_default(struct wined3d_state *state, const struct wined3d_gl_info *gl_info) { - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; union { struct wined3d_line_pattern lp; @@ -1192,7 +1191,7 @@ void state_init_default(struct wined3d_state *state, struct wined3d_device *devi 0.0f, 0.0f, 0.0f, 1.0f, }}}; - TRACE("state %p, device %p.\n", state, device); + TRACE("state %p, gl_info %p.\n", state, gl_info); /* Set some of the defaults for lights, transforms etc */ state->transforms[WINED3D_TS_PROJECTION] = identity; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 515079a..9b979dc 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2449,7 +2449,7 @@ void stateblock_init_contained_states(struct wined3d_stateblock *stateblock) DEC void state_cleanup(struct wined3d_state *state) DECLSPEC_HIDDEN; HRESULT state_init(struct wined3d_state *state, struct wined3d_fb_state *fb, const struct wined3d_d3d_info *d3d_info) DECLSPEC_HIDDEN; -void state_init_default(struct wined3d_state *state, struct wined3d_device *device) DECLSPEC_HIDDEN; +void state_init_default(struct wined3d_state *state, const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; void state_unbind_resources(struct wined3d_state *state) DECLSPEC_HIDDEN; /* Direct3D terminology with little modifications. We do not have an issued state

1 0

Henri Verbeet : d3dx9: Get rid of the ID3DXFileImpl typedef.
by Alexandre Julliard 26 Sep '13

26 Sep '13

Module: wine Branch: master Commit: 177aa5c26fa55acfbe54a5173f6a5568bda3b616 URL: http://source.winehq.org/git/wine.git/?a=commit;h=177aa5c26fa55acfbe54a5173… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 26 09:31:56 2013 +0200 d3dx9: Get rid of the ID3DXFileImpl typedef. --- dlls/d3dx9_36/xfile.c | 111 +++++++++++++++++++++++-------------------------- 1 files changed, 52 insertions(+), 59 deletions(-) diff --git a/dlls/d3dx9_36/xfile.c b/dlls/d3dx9_36/xfile.c index 9c57277..8c14353 100644 --- a/dlls/d3dx9_36/xfile.c +++ b/dlls/d3dx9_36/xfile.c @@ -46,11 +46,12 @@ static HRESULT error_dxfile_to_d3dxfile(HRESULT error) } } -typedef struct { +struct d3dx9_file +{ ID3DXFile ID3DXFile_iface; LONG ref; IDirectXFile *dxfile; -} ID3DXFileImpl; +}; typedef struct { ID3DXFileEnumObject ID3DXFileEnumObject_iface; @@ -69,9 +70,9 @@ typedef struct { } ID3DXFileDataImpl; -static inline ID3DXFileImpl* impl_from_ID3DXFile(ID3DXFile *iface) +static inline struct d3dx9_file *impl_from_ID3DXFile(ID3DXFile *iface) { - return CONTAINING_RECORD(iface, ID3DXFileImpl, ID3DXFile_iface); + return CONTAINING_RECORD(iface, struct d3dx9_file, ID3DXFile_iface); } static inline ID3DXFileEnumObjectImpl* impl_from_ID3DXFileEnumObject(ID3DXFileEnumObject *iface) @@ -493,60 +494,54 @@ static const ID3DXFileEnumObjectVtbl ID3DXFileEnumObject_Vtbl = ID3DXFileEnumObjectImpl_GetDataObjectByName }; - -/*** IUnknown methods ***/ - -static HRESULT WINAPI ID3DXFileImpl_QueryInterface(ID3DXFile *iface, REFIID riid, void **ret_iface) +static HRESULT WINAPI d3dx9_file_QueryInterface(ID3DXFile *iface, REFIID riid, void **out) { - TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ret_iface); + TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); - if (IsEqualGUID(riid, &IID_IUnknown) || - IsEqualGUID(riid, &IID_ID3DXFile)) + if (IsEqualGUID(riid, &IID_ID3DXFile) + || IsEqualGUID(riid, &IID_IUnknown)) { iface->lpVtbl->AddRef(iface); - *ret_iface = iface; + *out = iface; return S_OK; } - WARN("(%p)->(%s, %p), not found\n", iface, debugstr_guid(riid), ret_iface); - *ret_iface = NULL; + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + + *out = NULL; return E_NOINTERFACE; } - -static ULONG WINAPI ID3DXFileImpl_AddRef(ID3DXFile *iface) +static ULONG WINAPI d3dx9_file_AddRef(ID3DXFile *iface) { - ID3DXFileImpl *This = impl_from_ID3DXFile(iface); - ULONG ref = InterlockedIncrement(&This->ref); + struct d3dx9_file *file = impl_from_ID3DXFile(iface); + ULONG refcount = InterlockedIncrement(&file->ref); - TRACE("(%p)->(): new ref = %u\n", iface, ref); + TRACE("%p increasing refcount to %u.\n", file, refcount); - return ref; + return refcount; } - -static ULONG WINAPI ID3DXFileImpl_Release(ID3DXFile *iface) +static ULONG WINAPI d3dx9_file_Release(ID3DXFile *iface) { - ID3DXFileImpl *This = impl_from_ID3DXFile(iface); - ULONG ref = InterlockedDecrement(&This->ref); + struct d3dx9_file *file = impl_from_ID3DXFile(iface); + ULONG refcount = InterlockedDecrement(&file->ref); - TRACE("(%p)->(): new ref = %u\n", iface, ref); + TRACE("%p decreasing refcount to %u.\n", file, refcount); - if (!ref) + if (!refcount) { - IDirectXFile_Release(This->dxfile); - HeapFree(GetProcessHeap(), 0, This); + IDirectXFile_Release(file->dxfile); + HeapFree(GetProcessHeap(), 0, file); } - return ref; + return refcount; } - -/*** ID3DXFile methods ***/ - -static HRESULT WINAPI ID3DXFileImpl_CreateEnumObject(ID3DXFile *iface, const void *source, D3DXF_FILELOADOPTIONS options, ID3DXFileEnumObject **enum_object) +static HRESULT WINAPI d3dx9_file_CreateEnumObject(ID3DXFile *iface, const void *source, + D3DXF_FILELOADOPTIONS options, ID3DXFileEnumObject **enum_object) { - ID3DXFileImpl *This = impl_from_ID3DXFile(iface); + struct d3dx9_file *file = impl_from_ID3DXFile(iface); ID3DXFileEnumObjectImpl *object; IDirectXFileEnumObject *dxfile_enum_object; void *dxfile_source; @@ -556,7 +551,7 @@ static HRESULT WINAPI ID3DXFileImpl_CreateEnumObject(ID3DXFile *iface, const voi IDirectXFileData *data_object; HRESULT ret; - TRACE("(%p)->(%p, %x, %p)\n", iface, source, options, enum_object); + TRACE("iface %p, source %p, options %#x, enum_object %p.\n", iface, source, options, enum_object); if (!enum_object) return E_POINTER; @@ -600,7 +595,7 @@ static HRESULT WINAPI ID3DXFileImpl_CreateEnumObject(ID3DXFile *iface, const voi object->ID3DXFileEnumObject_iface.lpVtbl = &ID3DXFileEnumObject_Vtbl; object->ref = 1; - ret = IDirectXFile_CreateEnumObject(This->dxfile, dxfile_source, dxfile_options, &dxfile_enum_object); + ret = IDirectXFile_CreateEnumObject(file->dxfile, dxfile_source, dxfile_options, &dxfile_enum_object); if (ret != S_OK) { @@ -638,23 +633,23 @@ static HRESULT WINAPI ID3DXFileImpl_CreateEnumObject(ID3DXFile *iface, const voi return S_OK; } - -static HRESULT WINAPI ID3DXFileImpl_CreateSaveObject(ID3DXFile *iface, const void *data, D3DXF_FILESAVEOPTIONS options, D3DXF_FILEFORMAT format, ID3DXFileSaveObject **save_object) +static HRESULT WINAPI d3dx9_file_CreateSaveObject(ID3DXFile *iface, const void *data, + D3DXF_FILESAVEOPTIONS options, D3DXF_FILEFORMAT format, ID3DXFileSaveObject **save_object) { - FIXME("(%p)->(%p, %x, %u, %p): stub\n", iface, data, options, format, save_object); + FIXME("iface %p, data %p, options %#x, format %#x, save_object %p stub!\n", + iface, data, options, format, save_object); return E_NOTIMPL; } - -static HRESULT WINAPI ID3DXFileImpl_RegisterTemplates(ID3DXFile *iface, const void *data, SIZE_T size) +static HRESULT WINAPI d3dx9_file_RegisterTemplates(ID3DXFile *iface, const void *data, SIZE_T size) { - ID3DXFileImpl *This = impl_from_ID3DXFile(iface); + struct d3dx9_file *file = impl_from_ID3DXFile(iface); HRESULT ret; - TRACE("(%p)->(%p, %lu)\n", iface, data, size); + TRACE("iface %p, data %p, size %lu.\n", iface, data, size); - ret = IDirectXFile_RegisterTemplates(This->dxfile, (void*)data, size); + ret = IDirectXFile_RegisterTemplates(file->dxfile, (void *)data, size); if (ret != DXFILE_OK) { WARN("Error %#x\n", ret); @@ -664,32 +659,30 @@ static HRESULT WINAPI ID3DXFileImpl_RegisterTemplates(ID3DXFile *iface, const vo return S_OK; } - -static HRESULT WINAPI ID3DXFileImpl_RegisterEnumTemplates(ID3DXFile *iface, ID3DXFileEnumObject *enum_object) +static HRESULT WINAPI d3dx9_file_RegisterEnumTemplates(ID3DXFile *iface, ID3DXFileEnumObject *enum_object) { - FIXME("(%p)->(%p): stub\n", iface, enum_object); + FIXME("iface %p, enum_object %p stub!\n", iface, enum_object); return E_NOTIMPL; } - -static const ID3DXFileVtbl ID3DXFile_Vtbl = +static const ID3DXFileVtbl d3dx9_file_vtbl = { - ID3DXFileImpl_QueryInterface, - ID3DXFileImpl_AddRef, - ID3DXFileImpl_Release, - ID3DXFileImpl_CreateEnumObject, - ID3DXFileImpl_CreateSaveObject, - ID3DXFileImpl_RegisterTemplates, - ID3DXFileImpl_RegisterEnumTemplates + d3dx9_file_QueryInterface, + d3dx9_file_AddRef, + d3dx9_file_Release, + d3dx9_file_CreateEnumObject, + d3dx9_file_CreateSaveObject, + d3dx9_file_RegisterTemplates, + d3dx9_file_RegisterEnumTemplates, }; HRESULT WINAPI D3DXFileCreate(ID3DXFile **d3dxfile) { - ID3DXFileImpl *object; + struct d3dx9_file *object; HRESULT ret; - TRACE("(%p)\n", d3dxfile); + TRACE("d3dxfile %p.\n", d3dxfile); if (!d3dxfile) return E_POINTER; @@ -709,7 +702,7 @@ HRESULT WINAPI D3DXFileCreate(ID3DXFile **d3dxfile) return E_FAIL; } - object->ID3DXFile_iface.lpVtbl = &ID3DXFile_Vtbl; + object->ID3DXFile_iface.lpVtbl = &d3dx9_file_vtbl; object->ref = 1; *d3dxfile = &object->ID3DXFile_iface;

1 0

Henri Verbeet : d3dx9: Get rid of the ID3DXFileEnumObjectImpl typedef.
by Alexandre Julliard 26 Sep '13

26 Sep '13

Module: wine Branch: master Commit: 38871d842fd97d48dd11b7e479f0090fa2a16ee6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38871d842fd97d48dd11b7e47… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 26 09:31:57 2013 +0200 d3dx9: Get rid of the ID3DXFileEnumObjectImpl typedef. --- dlls/d3dx9_36/xfile.c | 120 +++++++++++++++++++++++------------------------- 1 files changed, 58 insertions(+), 62 deletions(-) diff --git a/dlls/d3dx9_36/xfile.c b/dlls/d3dx9_36/xfile.c index 8c14353..1138587 100644 --- a/dlls/d3dx9_36/xfile.c +++ b/dlls/d3dx9_36/xfile.c @@ -53,12 +53,13 @@ struct d3dx9_file IDirectXFile *dxfile; }; -typedef struct { +struct d3dx9_file_enum_object +{ ID3DXFileEnumObject ID3DXFileEnumObject_iface; LONG ref; ULONG nb_children; ID3DXFileData **children; -} ID3DXFileEnumObjectImpl; +}; typedef struct { ID3DXFileData ID3DXFileData_iface; @@ -75,9 +76,9 @@ static inline struct d3dx9_file *impl_from_ID3DXFile(ID3DXFile *iface) return CONTAINING_RECORD(iface, struct d3dx9_file, ID3DXFile_iface); } -static inline ID3DXFileEnumObjectImpl* impl_from_ID3DXFileEnumObject(ID3DXFileEnumObject *iface) +static inline struct d3dx9_file_enum_object *impl_from_ID3DXFileEnumObject(ID3DXFileEnumObject *iface) { - return CONTAINING_RECORD(iface, ID3DXFileEnumObjectImpl, ID3DXFileEnumObject_iface); + return CONTAINING_RECORD(iface, struct d3dx9_file_enum_object, ID3DXFileEnumObject_iface); } static inline ID3DXFileDataImpl* impl_from_ID3DXFileData(ID3DXFileData *iface) @@ -374,124 +375,119 @@ static HRESULT ID3DXFileDataImpl_Create(IDirectXFileObject *dxfile_object, ID3DX return S_OK; } - -/*** IUnknown methods ***/ - -static HRESULT WINAPI ID3DXFileEnumObjectImpl_QueryInterface(ID3DXFileEnumObject *iface, REFIID riid, void **ret_iface) +static HRESULT WINAPI d3dx9_file_enum_object_QueryInterface(ID3DXFileEnumObject *iface, REFIID riid, void **out) { - TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ret_iface); + TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); - if (IsEqualGUID(riid, &IID_IUnknown) || - IsEqualGUID(riid, &IID_ID3DXFileEnumObject)) + if (IsEqualGUID(riid, &IID_ID3DXFileEnumObject) + || IsEqualGUID(riid, &IID_IUnknown)) { iface->lpVtbl->AddRef(iface); - *ret_iface = iface; + *out = iface; return S_OK; } - WARN("(%p)->(%s, %p), not found\n", iface, debugstr_guid(riid), ret_iface); - *ret_iface = NULL; + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + + *out = NULL; return E_NOINTERFACE; } -static ULONG WINAPI ID3DXFileEnumObjectImpl_AddRef(ID3DXFileEnumObject *iface) +static ULONG WINAPI d3dx9_file_enum_object_AddRef(ID3DXFileEnumObject *iface) { - ID3DXFileEnumObjectImpl *This = impl_from_ID3DXFileEnumObject(iface); - ULONG ref = InterlockedIncrement(&This->ref); + struct d3dx9_file_enum_object *file_enum = impl_from_ID3DXFileEnumObject(iface); + ULONG refcount = InterlockedIncrement(&file_enum->ref); - TRACE("(%p)->(): new ref = %u\n", iface, ref); + TRACE("%p increasing refcount to %u.\n", file_enum, refcount); - return ref; + return refcount; } -static ULONG WINAPI ID3DXFileEnumObjectImpl_Release(ID3DXFileEnumObject *iface) +static ULONG WINAPI d3dx9_file_enum_object_Release(ID3DXFileEnumObject *iface) { - ID3DXFileEnumObjectImpl *This = impl_from_ID3DXFileEnumObject(iface); - ULONG ref = InterlockedDecrement(&This->ref); + struct d3dx9_file_enum_object *file_enum = impl_from_ID3DXFileEnumObject(iface); + ULONG refcount = InterlockedDecrement(&file_enum->ref); - TRACE("(%p)->(): new ref = %u\n", iface, ref); + TRACE("%p decreasing refcount to %u.\n", file_enum, refcount); - if (!ref) + if (!refcount) { ULONG i; - for (i = 0; i < This->nb_children; i++) - (This->children[i])->lpVtbl->Release(This->children[i]); - HeapFree(GetProcessHeap(), 0, This->children); - HeapFree(GetProcessHeap(), 0, This); + for (i = 0; i < file_enum->nb_children; ++i) + { + ID3DXFileData *child = file_enum->children[i]; + child->lpVtbl->Release(child); + } + HeapFree(GetProcessHeap(), 0, file_enum->children); + HeapFree(GetProcessHeap(), 0, file_enum); } - return ref; + return refcount; } - -/*** ID3DXFileEnumObject methods ***/ - -static HRESULT WINAPI ID3DXFileEnumObjectImpl_GetFile(ID3DXFileEnumObject *iface, ID3DXFile **file) +static HRESULT WINAPI d3dx9_file_enum_object_GetFile(ID3DXFileEnumObject *iface, ID3DXFile **file) { - FIXME("(%p)->(%p): stub\n", iface, file); + FIXME("iface %p, file %p stub!\n", iface, file); return E_NOTIMPL; } - -static HRESULT WINAPI ID3DXFileEnumObjectImpl_GetChildren(ID3DXFileEnumObject *iface, SIZE_T *children) +static HRESULT WINAPI d3dx9_file_enum_object_GetChildren(ID3DXFileEnumObject *iface, SIZE_T *children) { - ID3DXFileEnumObjectImpl *This = impl_from_ID3DXFileEnumObject(iface); + struct d3dx9_file_enum_object *file_enum = impl_from_ID3DXFileEnumObject(iface); - TRACE("(%p)->(%p)\n", iface, children); + TRACE("iface %p, children %p.\n", iface, children); if (!children) return E_POINTER; - *children = This->nb_children; + *children = file_enum->nb_children; return S_OK; } - -static HRESULT WINAPI ID3DXFileEnumObjectImpl_GetChild(ID3DXFileEnumObject *iface, SIZE_T id, ID3DXFileData **object) +static HRESULT WINAPI d3dx9_file_enum_object_GetChild(ID3DXFileEnumObject *iface, SIZE_T id, ID3DXFileData **object) { - ID3DXFileEnumObjectImpl *This = impl_from_ID3DXFileEnumObject(iface); + struct d3dx9_file_enum_object *file_enum = impl_from_ID3DXFileEnumObject(iface); - TRACE("(%p)->(%lu, %p)\n", iface, id, object); + TRACE("iface %p, id %#lx, object %p.\n", iface, id, object); if (!object) return E_POINTER; - *object = This->children[id]; + *object = file_enum->children[id]; (*object)->lpVtbl->AddRef(*object); return S_OK; } - -static HRESULT WINAPI ID3DXFileEnumObjectImpl_GetDataObjectById(ID3DXFileEnumObject *iface, REFGUID guid, ID3DXFileData **object) +static HRESULT WINAPI d3dx9_file_enum_object_GetDataObjectById(ID3DXFileEnumObject *iface, + REFGUID guid, ID3DXFileData **object) { - FIXME("(%p)->(%s, %p): stub\n", iface, debugstr_guid(guid), object); + FIXME("iface %p, guid %s, object %p stub!\n", iface, debugstr_guid(guid), object); return E_NOTIMPL; } - -static HRESULT WINAPI ID3DXFileEnumObjectImpl_GetDataObjectByName(ID3DXFileEnumObject *iface, const char *name, ID3DXFileData **object) +static HRESULT WINAPI d3dx9_file_enum_object_GetDataObjectByName(ID3DXFileEnumObject *iface, + const char *name, ID3DXFileData **object) { - FIXME("(%p)->(%s, %p): stub\n", iface, debugstr_a(name), object); + FIXME("iface %p, name %s, object %p stub!\n", iface, debugstr_a(name), object); return E_NOTIMPL; } - -static const ID3DXFileEnumObjectVtbl ID3DXFileEnumObject_Vtbl = +static const ID3DXFileEnumObjectVtbl d3dx9_file_enum_object_vtbl = { - ID3DXFileEnumObjectImpl_QueryInterface, - ID3DXFileEnumObjectImpl_AddRef, - ID3DXFileEnumObjectImpl_Release, - ID3DXFileEnumObjectImpl_GetFile, - ID3DXFileEnumObjectImpl_GetChildren, - ID3DXFileEnumObjectImpl_GetChild, - ID3DXFileEnumObjectImpl_GetDataObjectById, - ID3DXFileEnumObjectImpl_GetDataObjectByName + d3dx9_file_enum_object_QueryInterface, + d3dx9_file_enum_object_AddRef, + d3dx9_file_enum_object_Release, + d3dx9_file_enum_object_GetFile, + d3dx9_file_enum_object_GetChildren, + d3dx9_file_enum_object_GetChild, + d3dx9_file_enum_object_GetDataObjectById, + d3dx9_file_enum_object_GetDataObjectByName, }; static HRESULT WINAPI d3dx9_file_QueryInterface(ID3DXFile *iface, REFIID riid, void **out) @@ -542,7 +538,7 @@ static HRESULT WINAPI d3dx9_file_CreateEnumObject(ID3DXFile *iface, const void * D3DXF_FILELOADOPTIONS options, ID3DXFileEnumObject **enum_object) { struct d3dx9_file *file = impl_from_ID3DXFile(iface); - ID3DXFileEnumObjectImpl *object; + struct d3dx9_file_enum_object *object; IDirectXFileEnumObject *dxfile_enum_object; void *dxfile_source; DXFILELOADOPTIONS dxfile_options; @@ -592,7 +588,7 @@ static HRESULT WINAPI d3dx9_file_CreateEnumObject(ID3DXFile *iface, const void * if (!object) return E_OUTOFMEMORY; - object->ID3DXFileEnumObject_iface.lpVtbl = &ID3DXFileEnumObject_Vtbl; + object->ID3DXFileEnumObject_iface.lpVtbl = &d3dx9_file_enum_object_vtbl; object->ref = 1; ret = IDirectXFile_CreateEnumObject(file->dxfile, dxfile_source, dxfile_options, &dxfile_enum_object);

1 0

Dmitry Timoshkov : ntdll: Make asynchronous WaitCommEvent report correct number of bytes returned.
by Alexandre Julliard 26 Sep '13

26 Sep '13

Module: wine Branch: master Commit: a20b07c558d8702b3923e2ed1a3f2afa364efb0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a20b07c558d8702b3923e2ed1… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Sep 26 11:51:40 2013 +0900 ntdll: Make asynchronous WaitCommEvent report correct number of bytes returned. --- dlls/kernel32/tests/comm.c | 2 -- dlls/ntdll/serial.c | 11 ++++++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/comm.c b/dlls/kernel32/tests/comm.c index 4e7fee5..7ec5fc5 100644 --- a/dlls/kernel32/tests/comm.c +++ b/dlls/kernel32/tests/comm.c @@ -863,7 +863,6 @@ todo_wine { res = GetOverlappedResult(hcom, &ovl_wait, &bytes, FALSE); ok(res, "GetOverlappedResult reported error %d\n", GetLastError()); -todo_wine ok(bytes == sizeof(evtmask), "expected %u, written %u\n", (UINT)sizeof(evtmask), bytes); res = TRUE; } @@ -2135,7 +2134,6 @@ todo_wine last_event_time = after; ret = GetOverlappedResult(hcom, &ovl_wait, &bytes, FALSE); ok(ret, "GetOverlappedResult reported error %d\n", GetLastError()); -todo_wine ok(bytes == sizeof(evtmask), "expected sizeof(evtmask), got %u\n", bytes); ok(evtmask & EV_RXCHAR, "EV_RXCHAR should be set\n"); diff --git a/dlls/ntdll/serial.c b/dlls/ntdll/serial.c index 5e6eaf4..db618f8 100644 --- a/dlls/ntdll/serial.c +++ b/dlls/ntdll/serial.c @@ -947,7 +947,16 @@ static DWORD CALLBACK wait_for_event(LPVOID arg) } if (needs_close) close( fd ); } - if (commio->iosb) commio->iosb->u.Status = *commio->events ? STATUS_SUCCESS : STATUS_CANCELLED; + if (commio->iosb) + { + if (*commio->events) + { + commio->iosb->u.Status = STATUS_SUCCESS; + commio->iosb->Information = sizeof(DWORD); + } + else + commio->iosb->u.Status = STATUS_CANCELLED; + } if (commio->hEvent) NtSetEvent(commio->hEvent, NULL); RtlFreeHeap(GetProcessHeap(), 0, commio); return 0;

1 0

Dmitry Timoshkov : ntdll: Make set_line_control() for a serial device print slightly more informative messages.
by Alexandre Julliard 26 Sep '13

26 Sep '13

Module: wine Branch: master Commit: a63be0823a8e4c7d0d873c73ed303a38fbb56a9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a63be0823a8e4c7d0d873c73e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Sep 26 11:52:48 2013 +0900 ntdll: Make set_line_control() for a serial device print slightly more informative messages. --- dlls/ntdll/serial.c | 26 ++++++++++++-------------- 1 files changed, 12 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/serial.c b/dlls/ntdll/serial.c index db618f8..6738009 100644 --- a/dlls/ntdll/serial.c +++ b/dlls/ntdll/serial.c @@ -575,35 +575,33 @@ static NTSTATUS set_line_control(int fd, const SERIAL_LINE_CONTROL* slc) { struct termios port; unsigned bytesize, stopbits; - + if (tcgetattr(fd, &port) == -1) { ERR("tcgetattr error '%s'\n", strerror(errno)); return FILE_GetNtStatus(); } - + #ifdef IMAXBEL port.c_iflag &= ~(ISTRIP|BRKINT|IGNCR|ICRNL|INLCR|PARMRK|IMAXBEL); #else port.c_iflag &= ~(ISTRIP|BRKINT|IGNCR|ICRNL|INLCR|PARMRK); #endif port.c_iflag |= IGNBRK | INPCK; - port.c_oflag &= ~(OPOST); - port.c_cflag &= ~(HUPCL); port.c_cflag |= CLOCAL | CREAD; - + /* * on FreeBSD, turning off ICANON does not disable IEXTEN, * so we must turn it off explicitly. No harm done on Linux. */ port.c_lflag &= ~(ICANON|ECHO|ISIG|IEXTEN); port.c_lflag |= NOFLSH; - + bytesize = slc->WordLength; stopbits = slc->StopBits; - + #ifdef CMSPAR port.c_cflag &= ~(PARENB | PARODD | CMSPAR); #else @@ -633,7 +631,7 @@ static NTSTATUS set_line_control(int fd, const SERIAL_LINE_CONTROL* slc) } else { - ERR("Cannot set MARK Parity\n"); + FIXME("Cannot set MARK Parity\n"); return STATUS_NOT_SUPPORTED; } break; @@ -645,16 +643,16 @@ static NTSTATUS set_line_control(int fd, const SERIAL_LINE_CONTROL* slc) } else { - ERR("Cannot set SPACE Parity\n"); + FIXME("Cannot set SPACE Parity\n"); return STATUS_NOT_SUPPORTED; } break; #endif default: - ERR("Parity\n"); + FIXME("Parity %d is not supported\n", slc->Parity); return STATUS_NOT_SUPPORTED; } - + port.c_cflag &= ~CSIZE; switch (bytesize) { @@ -663,17 +661,17 @@ static NTSTATUS set_line_control(int fd, const SERIAL_LINE_CONTROL* slc) case 7: port.c_cflag |= CS7; break; case 8: port.c_cflag |= CS8; break; default: - ERR("ByteSize\n"); + FIXME("ByteSize %d is not supported\n", bytesize); return STATUS_NOT_SUPPORTED; } - + switch (stopbits) { case ONESTOPBIT: port.c_cflag &= ~CSTOPB; break; case ONE5STOPBITS: /* will be selected if bytesize is 5 */ case TWOSTOPBITS: port.c_cflag |= CSTOPB; break; default: - ERR("StopBits\n"); + FIXME("StopBits %d is not supported\n", stopbits); return STATUS_NOT_SUPPORTED; } /* otherwise it hangs with pending input*/

1 0