wine-commits October 2013

wine-commits@winehq.org

2 participants
757 discussions

Nikolay Sivov : msxml3: Set referer in case with no user headers too.
by Alexandre Julliard 28 Oct '13

28 Oct '13

Module: wine Branch: master Commit: 0fc177fe2f06577e9d9657b11cd66856170be99b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fc177fe2f06577e9d9657b11… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 28 17:01:02 2013 +0400 msxml3: Set referer in case with no user headers too. --- dlls/msxml3/httprequest.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index c90cc51..3caecad 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -476,14 +476,18 @@ static HRESULT WINAPI BSCHttpNegotiate_BeginningTransaction(IHttpNegotiate *ifac if (!list_empty(&This->request->reqheaders)) size += This->request->reqheader_size*sizeof(WCHAR); - if (!size) return S_OK; - if (This->request->base_uri) { IUri_GetRawUri(This->request->base_uri, &base_uri); size += SysStringLen(base_uri)*sizeof(WCHAR) + sizeof(refererW) + sizeof(crlfW); } + if (!size) + { + SysFreeString(base_uri); + return S_OK; + } + buff = CoTaskMemAlloc(size); if (!buff) {

1 0

Henri Verbeet : d3drm: Get rid of the IDirect3DRMMaterialImpl typedef.
by Alexandre Julliard 28 Oct '13

28 Oct '13

Module: wine Branch: master Commit: 687e5cd33070cbaa2d8a9f0a03bc96a737c93964 URL: http://source.winehq.org/git/wine.git/?a=commit;h=687e5cd33070cbaa2d8a9f0a0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 28 11:46:43 2013 +0100 d3drm: Get rid of the IDirect3DRMMaterialImpl typedef. --- dlls/d3drm/material.c | 243 +++++++++++++++++++++++-------------------------- 1 files changed, 114 insertions(+), 129 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=687e5cd33070cbaa2d8a9…

1 0

Henri Verbeet : d3drm: Get rid of the IDirect3DRMLightImpl typedef.
by Alexandre Julliard 28 Oct '13

28 Oct '13

Module: wine Branch: master Commit: f4ca38eded43ab1bdf8df7d26f7e39cbb1b8abb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4ca38eded43ab1bdf8df7d26… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 28 11:46:42 2013 +0100 d3drm: Get rid of the IDirect3DRMLightImpl typedef. --- dlls/d3drm/light.c | 314 ++++++++++++++++++++++++---------------------------- 1 files changed, 147 insertions(+), 167 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f4ca38eded43ab1bdf8df…

1 0

Henri Verbeet : d3drm: Initialize the actual array in d3drm_light_array_create() as well.
by Alexandre Julliard 28 Oct '13

28 Oct '13

Module: wine Branch: master Commit: 7dc0738911dad6a95c3d6f39b48e4f3a7749c712 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7dc0738911dad6a95c3d6f39b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 28 11:46:41 2013 +0100 d3drm: Initialize the actual array in d3drm_light_array_create() as well. --- dlls/d3drm/frame.c | 37 +++++++++++++++++++------------------ 1 files changed, 19 insertions(+), 18 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 28e222f..768f347 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -434,15 +434,32 @@ static const struct IDirect3DRMLightArrayVtbl d3drm_light_array_vtbl = d3drm_light_array_GetElement, }; -static struct d3drm_light_array *d3drm_light_array_create(void) +static struct d3drm_light_array *d3drm_light_array_create(unsigned int light_count, IDirect3DRMLight **lights) { struct d3drm_light_array *array; + unsigned int i; if (!(array = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*array)))) return NULL; array->IDirect3DRMLightArray_iface.lpVtbl = &d3drm_light_array_vtbl; array->ref = 1; + array->size = light_count; + + if (light_count) + { + if (!(array->lights = HeapAlloc(GetProcessHeap(), 0, light_count * sizeof(*array->lights)))) + { + HeapFree(GetProcessHeap(), 0, array); + return NULL; + } + + for (i = 0; i < light_count; ++i) + { + array->lights[i] = lights[i]; + IDirect3DRMLight_AddRef(array->lights[i]); + } + } return array; } @@ -1541,25 +1558,9 @@ static HRESULT WINAPI d3drm_frame3_GetLights(IDirect3DRMFrame3 *iface, IDirect3D if (!lights) return D3DRMERR_BADVALUE; - if (!(array = d3drm_light_array_create())) + if (!(array = d3drm_light_array_create(frame->nb_lights, frame->lights))) return E_OUTOFMEMORY; - array->size = frame->nb_lights; - if (frame->nb_lights) - { - ULONG i; - - if (!(array->lights = HeapAlloc(GetProcessHeap(), 0, frame->nb_lights * sizeof(*array->lights)))) - { - HeapFree(GetProcessHeap(), 0, array); - return E_OUTOFMEMORY; - } - for (i = 0; i < frame->nb_lights; ++i) - { - IDirect3DRMLight_QueryInterface(frame->lights[i], &IID_IDirect3DRMLight, (void **)&array->lights[i]); - } - } - *lights = &array->IDirect3DRMLightArray_iface; return D3DRM_OK;

1 0

Henri Verbeet : d3drm: Initialize the actual array in d3drm_visual_array_create() as well.
by Alexandre Julliard 28 Oct '13

28 Oct '13

Module: wine Branch: master Commit: c0d05d9f4f2d7b7d14d8b4f5e49789eb6e9d1882 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0d05d9f4f2d7b7d14d8b4f5e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 28 11:46:40 2013 +0100 d3drm: Initialize the actual array in d3drm_visual_array_create() as well. --- dlls/d3drm/frame.c | 38 +++++++++++++++++++------------------- 1 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 26501c2..28e222f 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -315,15 +315,32 @@ static const struct IDirect3DRMVisualArrayVtbl d3drm_visual_array_vtbl = d3drm_visual_array_GetElement, }; -static struct d3drm_visual_array *d3drm_visual_array_create(void) +static struct d3drm_visual_array *d3drm_visual_array_create(unsigned int visual_count, IDirect3DRMVisual **visuals) { struct d3drm_visual_array *array; + unsigned int i; if (!(array = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*array)))) return NULL; array->IDirect3DRMVisualArray_iface.lpVtbl = &d3drm_visual_array_vtbl; array->ref = 1; + array->size = visual_count; + + if (visual_count) + { + if (!(array->visuals = HeapAlloc(GetProcessHeap(), 0, visual_count * sizeof(*array->visuals)))) + { + HeapFree(GetProcessHeap(), 0, array); + return NULL; + } + + for (i = 0; i < visual_count; ++i) + { + array->visuals[i] = visuals[i]; + IDirect3DRMVisual_AddRef(array->visuals[i]); + } + } return array; } @@ -765,26 +782,9 @@ static HRESULT WINAPI d3drm_frame2_GetVisuals(IDirect3DRMFrame2 *iface, IDirect3 if (!visuals) return D3DRMERR_BADVALUE; - if (!(array = d3drm_visual_array_create())) + if (!(array = d3drm_visual_array_create(frame->nb_visuals, frame->visuals))) return E_OUTOFMEMORY; - array->size = frame->nb_visuals; - if (frame->nb_visuals) - { - ULONG i; - - if (!(array->visuals = HeapAlloc(GetProcessHeap(), 0, frame->nb_visuals * sizeof(*array->visuals)))) - { - HeapFree(GetProcessHeap(), 0, array); - return E_OUTOFMEMORY; - } - for (i = 0; i < frame->nb_visuals; ++i) - { - array->visuals[i] = frame->visuals[i]; - IDirect3DRMVisual_AddRef(frame->visuals[i]); - } - } - *visuals = &array->IDirect3DRMVisualArray_iface; return D3DRM_OK;

1 0

Henri Verbeet : d3drm: Initialize the actual array in d3drm_frame_array_create() as well.
by Alexandre Julliard 28 Oct '13

28 Oct '13

Module: wine Branch: master Commit: bf235a66699b0326c1470b6590d1b8ccbc2331be URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf235a66699b0326c1470b659… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 28 11:46:39 2013 +0100 d3drm: Initialize the actual array in d3drm_frame_array_create() as well. --- dlls/d3drm/frame.c | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 36baf2e..26501c2 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -197,15 +197,31 @@ static const struct IDirect3DRMFrameArrayVtbl d3drm_frame_array_vtbl = d3drm_frame_array_GetElement, }; -static struct d3drm_frame_array *d3drm_frame_array_create(void) +static struct d3drm_frame_array *d3drm_frame_array_create(unsigned int frame_count, IDirect3DRMFrame3 **frames) { struct d3drm_frame_array *array; + unsigned int i; if (!(array = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*array)))) return NULL; array->IDirect3DRMFrameArray_iface.lpVtbl = &d3drm_frame_array_vtbl; array->ref = 1; + array->size = frame_count; + + if (frame_count) + { + if (!(array->frames = HeapAlloc(GetProcessHeap(), 0, frame_count * sizeof(*array->frames)))) + { + HeapFree(GetProcessHeap(), 0, array); + return NULL; + } + + for (i = 0; i < frame_count; ++i) + { + IDirect3DRMFrame3_QueryInterface(frames[i], &IID_IDirect3DRMFrame, (void **)&array->frames[i]); + } + } return array; } @@ -1500,25 +1516,9 @@ static HRESULT WINAPI d3drm_frame3_GetChildren(IDirect3DRMFrame3 *iface, IDirect if (!children) return D3DRMERR_BADVALUE; - if (!(array = d3drm_frame_array_create())) + if (!(array = d3drm_frame_array_create(frame->nb_children, frame->children))) return E_OUTOFMEMORY; - array->size = frame->nb_children; - if (frame->nb_children) - { - ULONG i; - - if (!(array->frames = HeapAlloc(GetProcessHeap(), 0, frame->nb_children * sizeof(*array->frames)))) - { - HeapFree(GetProcessHeap(), 0, array); - return E_OUTOFMEMORY; - } - for (i = 0; i < frame->nb_children; ++i) - { - IDirect3DRMFrame3_QueryInterface(frame->children[i], &IID_IDirect3DRMFrame, (void **)&array->frames[i]); - } - } - *children = &array->IDirect3DRMFrameArray_iface; return D3DRM_OK;

1 0

Nikolay Sivov : wshom.ocx: Implement IWshShell3::ExpandEnvironmentStrings() .
by Alexandre Julliard 28 Oct '13

28 Oct '13

Module: wine Branch: master Commit: 71ecb55661a8cf14a0e19b94749f1d8957c9ab16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71ecb55661a8cf14a0e19b947… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 27 12:28:06 2013 +0400 wshom.ocx: Implement IWshShell3::ExpandEnvironmentStrings(). --- dlls/wshom.ocx/shell.c | 22 +++++++++++++++++++--- dlls/wshom.ocx/tests/wshom.c | 10 ++++++++++ 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index 17d0306..385d2a3 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -745,10 +745,26 @@ static HRESULT WINAPI WshShell3_CreateShortcut(IWshShell3 *iface, BSTR PathLink, return WshShortcut_Create(PathLink, Shortcut); } -static HRESULT WINAPI WshShell3_ExpandEnvironmentStrings(IWshShell3 *iface, BSTR Src, BSTR* out_Dst) +static HRESULT WINAPI WshShell3_ExpandEnvironmentStrings(IWshShell3 *iface, BSTR Src, BSTR* Dst) { - FIXME("(%s %p): stub\n", debugstr_w(Src), out_Dst); - return E_NOTIMPL; + DWORD ret; + + TRACE("(%s %p)\n", debugstr_w(Src), Dst); + + if (!Src || !Dst) return E_POINTER; + + ret = ExpandEnvironmentStringsW(Src, NULL, 0); + *Dst = SysAllocStringLen(NULL, ret); + if (!*Dst) return E_OUTOFMEMORY; + + if (ExpandEnvironmentStringsW(Src, *Dst, ret)) + return S_OK; + else + { + SysFreeString(*Dst); + *Dst = NULL; + return HRESULT_FROM_WIN32(GetLastError()); + } } static HRESULT WINAPI WshShell3_RegRead(IWshShell3 *iface, BSTR Name, VARIANT* out_Value) diff --git a/dlls/wshom.ocx/tests/wshom.c b/dlls/wshom.ocx/tests/wshom.c index b2f60a8..50adb90 100644 --- a/dlls/wshom.ocx/tests/wshom.c +++ b/dlls/wshom.ocx/tests/wshom.c @@ -35,6 +35,7 @@ static void test_wshshell(void) { static const WCHAR desktopW[] = {'D','e','s','k','t','o','p',0}; static const WCHAR lnk1W[] = {'f','i','l','e','.','l','n','k',0}; + static const WCHAR pathW[] = {'%','P','A','T','H','%',0}; IWshShell3 *sh3; IDispatchEx *dispex; IWshCollection *coll; @@ -113,6 +114,15 @@ static void test_wshshell(void) IUnknown_Release(unk); IDispatch_Release(shortcut); + /* ExpandEnvironmentStrings */ + hr = IWshShell3_ExpandEnvironmentStrings(sh3, NULL, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + str = SysAllocString(pathW); + hr = IWshShell3_ExpandEnvironmentStrings(sh3, str, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + SysFreeString(str); + IWshCollection_Release(coll); IDispatch_Release(disp); IWshShell3_Release(sh3);

1 0

Nikolay Sivov : wshom.ocx: Silence failure to query IDispatchEx from IWshShell3.
by Alexandre Julliard 28 Oct '13

28 Oct '13

Module: wine Branch: master Commit: f3c805be67df81713bd7b6130d03dace50688a49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3c805be67df81713bd7b6130… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 27 12:27:45 2013 +0400 wshom.ocx: Silence failure to query IDispatchEx from IWshShell3. --- dlls/wshom.ocx/shell.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index bc6a839..17d0306 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -21,6 +21,7 @@ #include "shellapi.h" #include "shlobj.h" +#include "dispex.h" #include "wine/debug.h" #include "wine/unicode.h" @@ -576,14 +577,21 @@ static HRESULT WINAPI WshShell3_QueryInterface(IWshShell3 *iface, REFIID riid, v { TRACE("(%s, %p)\n", debugstr_guid(riid), ppv); + *ppv = NULL; + if(IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDispatch) || IsEqualGUID(riid, &IID_IWshShell3)) { *ppv = iface; - }else { + } + else if (IsEqualGUID(riid, &IID_IDispatchEx)) + { + return E_NOINTERFACE; + } + else + { FIXME("Unknown iface %s\n", debugstr_guid(riid)); - *ppv = NULL; return E_NOINTERFACE; }

1 0

Nikolay Sivov : shell32/tests: Fix compilation with -D__WINESRC__.
by Alexandre Julliard 28 Oct '13

28 Oct '13

Module: wine Branch: master Commit: fa93dadfa1e20b252d3f30b09dfd8ee24b792012 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa93dadfa1e20b252d3f30b09… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Oct 26 23:10:26 2013 +0400 shell32/tests: Fix compilation with -D__WINESRC__. --- dlls/shell32/tests/Makefile.in | 1 - dlls/shell32/tests/appbar.c | 13 +- dlls/shell32/tests/autocomplete.c | 4 +- dlls/shell32/tests/brsfolder.c | 62 +++++----- dlls/shell32/tests/ebrowser.c | 4 +- dlls/shell32/tests/progman_dde.c | 10 +- dlls/shell32/tests/shelldispatch.c | 1 + dlls/shell32/tests/shelllink.c | 47 ++++---- dlls/shell32/tests/shellpath.c | 1 + dlls/shell32/tests/shlexec.c | 121 +++++++++--------- dlls/shell32/tests/shlfileop.c | 242 ++++++++++++++++++------------------ dlls/shell32/tests/shlfolder.c | 4 +- dlls/shell32/tests/systray.c | 9 +- include/ddeml.h | 47 ++++++-- 14 files changed, 302 insertions(+), 264 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fa93dadfa1e20b252d3f3…

1 0

Alexandre Julliard : sfnt2fnt: Define WINE_UNICODE_API directly in the source.
by Alexandre Julliard 28 Oct '13

28 Oct '13

Module: wine Branch: master Commit: 9c6ab0f365f3576ec88266075e8b27dc28a44861 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c6ab0f365f3576ec88266075… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 28 14:21:33 2013 +0100 sfnt2fnt: Define WINE_UNICODE_API directly in the source. --- tools/Makefile.in | 1 - tools/sfnt2fnt.c | 1 + 2 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/Makefile.in b/tools/Makefile.in index 2cf9165..271a327 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_UNICODE_API="" EXTRAINCL = @FREETYPE_CFLAGS@ FREETYPELIBS = @FREETYPE_LIBS@ diff --git a/tools/sfnt2fnt.c b/tools/sfnt2fnt.c index 1952c5c..925855f 100644 --- a/tools/sfnt2fnt.c +++ b/tools/sfnt2fnt.c @@ -41,6 +41,7 @@ #include FT_TRUETYPE_TABLES_H #include FT_TRUETYPE_TAGS_H +#define WINE_UNICODE_API /* nothing */ #include "wine/unicode.h" #include "wingdi.h" #include "basetsd.h"

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
76
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 October 2013