January 2009 - Wine-Commits

Henri Verbeet : wined3d: Fix and unify shader creation error handling.
by Alexandre Julliard Jan. 12, 2009

Jan. 12, 2009

Module: wine Branch: master Commit: b069321650bacaec545fb143129c627f01db30ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=b069321650bacaec545fb1431… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 12 10:17:50 2009 +0100 wined3d: Fix and unify shader creation error handling. --- dlls/wined3d/device.c | 29 +++++++++++++++++------------ 1 files changed, 17 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 09f2db5..18dbcdd 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1890,24 +1890,25 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexShader(IWineD3DDevice *ifac object->lpVtbl = &IWineD3DVertexShader_Vtbl; object->parent = parent; shader_init(&object->baseShader, iface, IWineD3DVertexShaderImpl_shader_ins); + list_add_head(&This->shaders, &object->baseShader.shader_list_entry); *ppVertexShader = (IWineD3DVertexShader *)object; - TRACE("(%p) : Created Vertex shader %p\n", This, *ppVertexShader); + TRACE("(%p) : Created vertex shader %p\n", This, *ppVertexShader); if (vertex_declaration) { IWineD3DVertexShader_FakeSemantics(*ppVertexShader, vertex_declaration); } hr = IWineD3DVertexShader_SetFunction(*ppVertexShader, pFunction); - - if (WINED3D_OK != hr) { - FIXME("(%p) : Failed to set the function, returning WINED3DERR_INVALIDCALL\n", iface); + if (FAILED(hr)) + { + WARN("(%p) : Failed to set function, returning %#x\n", iface, hr); IWineD3DVertexShader_Release(*ppVertexShader); - return WINED3DERR_INVALIDCALL; + *ppVertexShader = NULL; + return hr; } - list_add_head(&This->shaders, &object->baseShader.shader_list_entry); - return WINED3D_OK; + return hr; } static HRESULT WINAPI IWineD3DDeviceImpl_CreatePixelShader(IWineD3DDevice *iface, CONST DWORD *pFunction, IWineD3DPixelShader **ppPixelShader, IUnknown *parent) { @@ -1928,14 +1929,18 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreatePixelShader(IWineD3DDevice *iface object->lpVtbl = &IWineD3DPixelShader_Vtbl; object->parent = parent; shader_init(&object->baseShader, iface, IWineD3DPixelShaderImpl_shader_ins); + list_add_head(&This->shaders, &object->baseShader.shader_list_entry); *ppPixelShader = (IWineD3DPixelShader *)object; + TRACE("(%p) : Created pixel shader %p\n", This, *ppPixelShader); + hr = IWineD3DPixelShader_SetFunction(*ppPixelShader, pFunction); - if (WINED3D_OK == hr) { - TRACE("(%p) : Created Pixel shader %p\n", This, *ppPixelShader); - list_add_head(&This->shaders, &object->baseShader.shader_list_entry); - } else { - WARN("(%p) : Failed to create pixel shader\n", This); + if (FAILED(hr)) + { + WARN("(%p) : Failed to set function, returning %#x\n", iface, hr); + IWineD3DPixelShader_Release(*ppPixelShader); + *ppPixelShader = NULL; + return hr; } return hr;

1 0

Henri Verbeet : wined3d: Get rid of D3DCREATESHADEROBJECTINSTANCE.
by Alexandre Julliard Jan. 12, 2009

Jan. 12, 2009

Module: wine Branch: master Commit: 894edc49cc1b5159e6801cdfc933099d22d1696a URL: http://source.winehq.org/git/wine.git/?a=commit;h=894edc49cc1b5159e6801cdfc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 12 10:17:50 2009 +0100 wined3d: Get rid of D3DCREATESHADEROBJECTINSTANCE. --- dlls/wined3d/baseshader.c | 9 +++++++++ dlls/wined3d/device.c | 40 +++++++++++++++++++++++++--------------- dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 36 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index ade4586..a270b0c 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -90,6 +90,15 @@ int shader_addline( return 0; } +void shader_init(struct IWineD3DBaseShaderClass *shader, + IWineD3DDevice *device, const SHADER_OPCODE *instruction_table) +{ + shader->ref = 1; + shader->device = device; + shader->shader_ins = instruction_table; + list_init(&shader->linked_programs); +} + const SHADER_OPCODE *shader_get_opcode(const SHADER_OPCODE *opcode_table, DWORD shader_version, DWORD code) { DWORD i = 0; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9fb7485..09f2db5 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -67,17 +67,6 @@ static void IWineD3DDeviceImpl_AddResource(IWineD3DDevice *iface, IWineD3DResour *pp##type = (IWineD3D##type *) object; \ } -#define D3DCREATESHADEROBJECTINSTANCE(object, type) { \ - object=HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IWineD3D##type##Impl)); \ - D3DMEMCHECK(object, pp##type); \ - object->lpVtbl = &IWineD3D##type##_Vtbl; \ - object->parent = parent; \ - object->baseShader.ref = 1; \ - object->baseShader.device = (IWineD3DDevice*) This; \ - list_init(&object->baseShader.linked_programs); \ - *pp##type = (IWineD3D##type *) object; \ -} - #define D3DCREATERESOURCEOBJECTINSTANCE(object, type, d3dtype, _size){ \ object=HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IWineD3D##type##Impl)); \ D3DMEMCHECK(object, pp##type); \ @@ -1890,8 +1879,18 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexShader(IWineD3DDevice *ifac if (!pFunction) return WINED3DERR_INVALIDCALL; - D3DCREATESHADEROBJECTINSTANCE(object, VertexShader) - object->baseShader.shader_ins = IWineD3DVertexShaderImpl_shader_ins; + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + if (!object) + { + ERR("Out of memory\n"); + *ppVertexShader = NULL; + return WINED3DERR_OUTOFVIDEOMEMORY; + } + + object->lpVtbl = &IWineD3DVertexShader_Vtbl; + object->parent = parent; + shader_init(&object->baseShader, iface, IWineD3DVertexShaderImpl_shader_ins); + *ppVertexShader = (IWineD3DVertexShader *)object; TRACE("(%p) : Created Vertex shader %p\n", This, *ppVertexShader); @@ -1918,8 +1917,19 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreatePixelShader(IWineD3DDevice *iface if (!pFunction) return WINED3DERR_INVALIDCALL; - D3DCREATESHADEROBJECTINSTANCE(object, PixelShader) - object->baseShader.shader_ins = IWineD3DPixelShaderImpl_shader_ins; + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + if (!object) + { + ERR("Out of memory\n"); + *ppPixelShader = NULL; + return WINED3DERR_OUTOFVIDEOMEMORY; + } + + object->lpVtbl = &IWineD3DPixelShader_Vtbl; + object->parent = parent; + shader_init(&object->baseShader, iface, IWineD3DPixelShaderImpl_shader_ins); + *ppPixelShader = (IWineD3DPixelShader *)object; + hr = IWineD3DPixelShader_SetFunction(*ppPixelShader, pFunction); if (WINED3D_OK == hr) { TRACE("(%p) : Created Pixel shader %p\n", This, *ppPixelShader); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 03b5242..0b5029f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2243,6 +2243,8 @@ void shader_buffer_free(struct SHADER_BUFFER *buffer); void shader_cleanup(IWineD3DBaseShader *iface); HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, struct shader_reg_maps *reg_maps, struct semantic *semantics_in, struct semantic *semantics_out, const DWORD *byte_code); +void shader_init(struct IWineD3DBaseShaderClass *shader, + IWineD3DDevice *device, const SHADER_OPCODE *instruction_table); void shader_trace_init(const DWORD *byte_code, const SHADER_OPCODE *opcode_table); extern void shader_generate_main(IWineD3DBaseShader *iface, SHADER_BUFFER *buffer,

1 0

Henri Verbeet : wined3d: Get rid of D3DINITIALIZEBASETEXTURE.
by Alexandre Julliard Jan. 12, 2009

Jan. 12, 2009

Module: wine Branch: master Commit: 87627c811e6df1b16eed40ec5b9754a5988fbf29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87627c811e6df1b16eed40ec5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 12 10:17:50 2009 +0100 wined3d: Get rid of D3DINITIALIZEBASETEXTURE. --- dlls/wined3d/basetexture.c | 10 ++++++++++ dlls/wined3d/device.c | 15 +++------------ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index 8622e94..f6189b6 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -27,6 +27,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_texture); #define GLINFO_LOCATION This->resource.wineD3DDevice->adapter->gl_info +void basetexture_init(struct IWineD3DBaseTextureClass *texture, UINT levels, DWORD usage) +{ + texture->levels = levels; + texture->filterType = (usage & WINED3DUSAGE_AUTOGENMIPMAP) ? WINED3DTEXF_LINEAR : WINED3DTEXF_NONE; + texture->LOD = 0; + texture->dirty = TRUE; + texture->is_srgb = FALSE; + texture->srgb_mode_change_count = 0; +} + void basetexture_cleanup(IWineD3DBaseTexture *iface) { IWineD3DBaseTextureImpl *This = (IWineD3DBaseTextureImpl *)iface; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ba9ab1e..9fb7485 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -115,15 +115,6 @@ static void IWineD3DDeviceImpl_AddResource(IWineD3DDevice *iface, IWineD3DResour TRACE("(%p) : Created resource %p\n", This, object); \ } -#define D3DINITIALIZEBASETEXTURE(_basetexture) { \ - _basetexture.levels = Levels; \ - _basetexture.filterType = (Usage & WINED3DUSAGE_AUTOGENMIPMAP) ? WINED3DTEXF_LINEAR : WINED3DTEXF_NONE; \ - _basetexture.LOD = 0; \ - _basetexture.dirty = TRUE; \ - _basetexture.is_srgb = FALSE; \ - _basetexture.srgb_mode_change_count = 0; \ -} - /********************************************************** * Global variable / Constants follow **********************************************************/ @@ -792,7 +783,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateTexture(IWineD3DDevice *iface, U } D3DCREATERESOURCEOBJECTINSTANCE(object, Texture, WINED3DRTYPE_TEXTURE, 0); - D3DINITIALIZEBASETEXTURE(object->baseTexture); + basetexture_init(&object->baseTexture, Levels, Usage); object->width = Width; object->height = Height; @@ -937,7 +928,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVolumeTexture(IWineD3DDevice *ifa } D3DCREATERESOURCEOBJECTINSTANCE(object, VolumeTexture, WINED3DRTYPE_VOLUMETEXTURE, 0); - D3DINITIALIZEBASETEXTURE(object->baseTexture); + basetexture_init(&object->baseTexture, Levels, Usage); TRACE("(%p) : W(%d) H(%d) D(%d), Lvl(%d) Usage(%d), Fmt(%u,%s), Pool(%s)\n", This, Width, Height, Depth, Levels, Usage, Format, debug_d3dformat(Format), debug_d3dpool(Pool)); @@ -1070,7 +1061,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateCubeTexture(IWineD3DDevice *iface } D3DCREATERESOURCEOBJECTINSTANCE(object, CubeTexture, WINED3DRTYPE_CUBETEXTURE, 0); - D3DINITIALIZEBASETEXTURE(object->baseTexture); + basetexture_init(&object->baseTexture, Levels, Usage); TRACE("(%p) Create Cube Texture\n", This); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3b8e1f6..03b5242 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1377,6 +1377,7 @@ WINED3DTEXTUREFILTERTYPE basetexture_get_autogen_filter_type(IWineD3DBaseTexture BOOL basetexture_get_dirty(IWineD3DBaseTexture *iface); DWORD basetexture_get_level_count(IWineD3DBaseTexture *iface); DWORD basetexture_get_lod(IWineD3DBaseTexture *iface); +void basetexture_init(struct IWineD3DBaseTextureClass *texture, UINT levels, DWORD usage); HRESULT basetexture_set_autogen_filter_type(IWineD3DBaseTexture *iface, WINED3DTEXTUREFILTERTYPE filter_type); BOOL basetexture_set_dirty(IWineD3DBaseTexture *iface, BOOL dirty); DWORD basetexture_set_lod(IWineD3DBaseTexture *iface, DWORD new_lod);

1 0

Henri Verbeet : wined3d: Update the pixelshader when the texture type changes.
by Alexandre Julliard Jan. 12, 2009

Jan. 12, 2009

Module: wine Branch: master Commit: 00a4b85fa91c4aa92d5dee69d82bd05e7d85a50e URL: http://source.winehq.org/git/wine.git/?a=commit;h=00a4b85fa91c4aa92d5dee69d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 12 10:17:50 2009 +0100 wined3d: Update the pixelshader when the texture type changes. --- dlls/wined3d/device.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ed343dd..ba9ab1e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4578,8 +4578,15 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetTexture(IWineD3DDevice *iface, DWORD if (NULL != This->updateStateBlock->textures[Stage]) { IWineD3DBaseTextureImpl *new = (IWineD3DBaseTextureImpl *) This->updateStateBlock->textures[Stage]; ULONG bindCount = InterlockedIncrement(&new->baseTexture.bindCount); + UINT dimensions = IWineD3DBaseTexture_GetTextureDimensions(pTexture); IWineD3DBaseTexture_AddRef(This->updateStateBlock->textures[Stage]); + + if (!oldTexture || dimensions != IWineD3DBaseTexture_GetTextureDimensions(oldTexture)) + { + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_PIXELSHADER); + } + if(oldTexture == NULL && Stage < MAX_TEXTURES) { /* The source arguments for color and alpha ops have different meanings when a NULL texture is bound, * so the COLOROP and ALPHAOP have to be dirtified.

1 0

Stefan Leichter : shell32: Rename ordinal 525 to SHFlushSFCache.
by Alexandre Julliard Jan. 12, 2009

Jan. 12, 2009

Module: wine Branch: master Commit: 2ca9f2c5368f33137ac58d5f67a1cda3335cdcb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ca9f2c5368f33137ac58d5f6… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Sun Jan 11 18:17:22 2009 +0100 shell32: Rename ordinal 525 to SHFlushSFCache. --- dlls/shell32/shell32.spec | 2 +- dlls/shell32/shellord.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index a3d76ac..f852e7c 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -231,7 +231,7 @@ 523 stdcall -noname SHFreeShared(long long) 524 stdcall -noname RealDriveType(long long) 525 stub RealDriveTypeFlags - 526 stdcall @() SHELL32_526 + 526 stdcall SHFlushSFCache() 640 stdcall -noname NTSHChangeNotifyRegister(long long long long long long) 641 stdcall -noname NTSHChangeNotifyDeregister(long) diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index 2b7103c..d8a6a0f 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -1994,10 +1994,9 @@ BOOL WINAPI LinkWindow_UnregisterClass(void) } /************************************************************************* - * (SHELL32.526) + * SHFlushSFCache (SHELL32.526) */ -BOOL WINAPI SHELL32_526(void) +void WINAPI SHFlushSFCache(void) { FIXME("()\n"); - return FALSE; }

1 0

Christian Costa : d3dxof: Avoid accessing template/object buffer directly.
by Alexandre Julliard Jan. 12, 2009

Jan. 12, 2009

Module: wine Branch: master Commit: 75ac489ea4dab5475cb38927c7fb22be8588bf15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75ac489ea4dab5475cb38927c… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Sun Jan 11 16:41:56 2009 +0100 d3dxof: Avoid accessing template/object buffer directly. --- dlls/d3dxof/parsing.c | 29 +++++++++++++++++------------ 1 files changed, 17 insertions(+), 12 deletions(-) diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index 4167597..3c4299c 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -155,6 +155,12 @@ BOOL read_bytes(parse_buffer * buf, LPVOID data, DWORD size) return TRUE; } +static void rewind_bytes(parse_buffer * buf, DWORD size) +{ + buf->buffer -= size; + buf->rem_bytes += size; +} + static void dump_TOKEN(WORD token) { #define DUMP_TOKEN(t) case t: TRACE(#t "\n"); break @@ -267,13 +273,15 @@ static WORD get_operator_token(char c) static BOOL is_keyword(parse_buffer* buf, const char* keyword) { + char tmp[9]; /* template keyword size + 1 */ DWORD len = strlen(keyword); - if (!strncasecmp((char*)buf->buffer, keyword,len) && is_separator(*(buf->buffer+len))) + read_bytes(buf, tmp, len+1); + if (!strncasecmp(tmp, keyword,len) && is_separator(tmp[len])) { - buf->buffer += len; - buf->rem_bytes -= len; + rewind_bytes(buf, 1); return TRUE; } + rewind_bytes(buf, len+1); return FALSE; } @@ -527,8 +535,7 @@ static WORD parse_TOKEN(parse_buffer * buf) } else { - buf->buffer -= 1; - buf->rem_bytes += 1; + rewind_bytes(buf, 1); if ((token = get_keyword_token(buf))) break; @@ -920,12 +927,12 @@ static BOOL parse_template_parts(parse_buffer * buf) static void go_to_next_definition(parse_buffer * buf) { + char c; while (buf->rem_bytes) { - char c = *buf->buffer; + read_bytes(buf, &c, 1); if ((c == '#') || (c == '/')) { - read_bytes(buf, &c, 1); /* Handle comment (# or //) */ if (c == '/') { @@ -942,13 +949,11 @@ static void go_to_next_definition(parse_buffer * buf) } continue; } - else if (is_space(*buf->buffer)) + else if (!is_space(c)) { - buf->buffer++; - buf->rem_bytes--; - } - else + rewind_bytes(buf, 1); break; + } } }

1 0

Rico Schüller : setupapi: Fix if condition in SetupEnumInfSectionsA/W.
by Alexandre Julliard Jan. 12, 2009

Jan. 12, 2009

Module: wine Branch: master Commit: 619a74ec5f540e0be9eca487b91e8e95cb65097f URL: http://source.winehq.org/git/wine.git/?a=commit;h=619a74ec5f540e0be9eca487b… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Jan 11 16:06:02 2009 +0100 setupapi: Fix if condition in SetupEnumInfSectionsA/W. --- dlls/setupapi/parser.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/parser.c b/dlls/setupapi/parser.c index 00d3373..c94e513 100644 --- a/dlls/setupapi/parser.c +++ b/dlls/setupapi/parser.c @@ -1257,7 +1257,7 @@ BOOL WINAPI SetupEnumInfSectionsA( HINF hinf, UINT index, PSTR buffer, DWORD siz { DWORD len = WideCharToMultiByte( CP_ACP, 0, file->sections[index]->name, -1, NULL, 0, NULL, NULL ); - if (*need) *need = len; + if (need) *need = len; if (!buffer) { if (!size) return TRUE; @@ -1291,7 +1291,7 @@ BOOL WINAPI SetupEnumInfSectionsW( HINF hinf, UINT index, PWSTR buffer, DWORD si if (index < file->nb_sections) { DWORD len = strlenW( file->sections[index]->name ) + 1; - if (*need) *need = len; + if (need) *need = len; if (!buffer) { if (!size) return TRUE;

1 0

Jacek Caban : urlmon: Added https pluggable protocol handler.
by Alexandre Julliard Jan. 12, 2009

Jan. 12, 2009

Module: wine Branch: master Commit: 954e55b55baace603f1ccbeef00ef3069eee4e95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=954e55b55baace603f1ccbeef… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jan 11 21:19:46 2009 +0100 urlmon: Added https pluggable protocol handler. --- dlls/urlmon/http.c | 51 +++++++++++++++++++++++++++++---------------------- 1 files changed, 29 insertions(+), 22 deletions(-) diff --git a/dlls/urlmon/http.c b/dlls/urlmon/http.c index 20e90ed..9ca8306 100644 --- a/dlls/urlmon/http.c +++ b/dlls/urlmon/http.c @@ -63,6 +63,7 @@ typedef struct { const IInternetProtocolVtbl *lpInternetProtocolVtbl; const IInternetPriorityVtbl *lpInternetPriorityVtbl; + BOOL https; DWORD flags, grfBINDF; BINDINFO bind_info; IInternetProtocolSink *protocol_sink; @@ -309,7 +310,8 @@ static HRESULT WINAPI HttpProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl LPOLESTR user_agent = NULL, accept_mimes[257]; HRESULT hres; - static const WCHAR wszHttp[] = {'h','t','t','p',':'}; + static const WCHAR httpW[] = {'h','t','t','p',':'}; + static const WCHAR httpsW[] = {'h','t','t','p','s',':'}; static const WCHAR wszBindVerb[BINDVERB_CUSTOM][5] = {{'G','E','T',0}, {'P','O','S','T',0}, @@ -330,8 +332,9 @@ static HRESULT WINAPI HttpProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl goto done; } - if (strlenW(szUrl) < sizeof(wszHttp)/sizeof(WCHAR) - || memcmp(szUrl, wszHttp, sizeof(wszHttp))) + if(This->https + ? strncmpW(szUrl, httpsW, sizeof(httpsW)/sizeof(WCHAR)) + : strncmpW(szUrl, httpW, sizeof(httpW)/sizeof(WCHAR))) { hres = MK_E_SYNTAX; goto done; @@ -351,7 +354,7 @@ static HRESULT WINAPI HttpProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl user = strndupW(url.lpszUserName, url.dwUserNameLength); pass = strndupW(url.lpszPassword, url.dwPasswordLength); if (!url.nPort) - url.nPort = INTERNET_DEFAULT_HTTP_PORT; + url.nPort = This->https ? INTERNET_DEFAULT_HTTPS_PORT : INTERNET_DEFAULT_HTTP_PORT; if(!(This->grfBINDF & BINDF_FROMURLMON)) IInternetProtocolSink_ReportProgress(This->protocol_sink, BINDSTATUS_DIRECTBIND, NULL); @@ -397,7 +400,9 @@ static HRESULT WINAPI HttpProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl InternetSetStatusCallbackW(This->internet, HTTPPROTOCOL_InternetStatusCallback); This->connect = InternetConnectW(This->internet, host, url.nPort, user, - pass, INTERNET_SERVICE_HTTP, 0, (DWORD_PTR)This); + pass, INTERNET_SERVICE_HTTP, + This->https ? INTERNET_FLAG_SECURE : 0, + (DWORD_PTR)This); if (!This->connect) { WARN("InternetConnect failed: %d\n", GetLastError()); @@ -421,6 +426,8 @@ static HRESULT WINAPI HttpProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl request_flags |= INTERNET_FLAG_NO_CACHE_WRITE; if (This->grfBINDF & BINDF_NEEDFILE) request_flags |= INTERNET_FLAG_NEED_FILE; + if (This->https) + request_flags |= INTERNET_FLAG_SECURE; This->request = HttpOpenRequestW(This->connect, This->bind_info.dwBindVerb < BINDVERB_CUSTOM ? wszBindVerb[This->bind_info.dwBindVerb] : This->bind_info.szCustomVerb, @@ -923,36 +930,36 @@ static const IInternetProtocolVtbl HttpProtocolVtbl = { HttpProtocol_UnlockRequest }; -HRESULT HttpProtocol_Construct(IUnknown *pUnkOuter, LPVOID *ppobj) +HRESULT create_http_protocol(BOOL https, void **ppobj) { HttpProtocol *ret; - TRACE("(%p %p)\n", pUnkOuter, ppobj); - - URLMON_LockModule(); - - ret = heap_alloc(sizeof(HttpProtocol)); + ret = heap_alloc_zero(sizeof(HttpProtocol)); + if(!ret) + return E_OUTOFMEMORY; ret->lpInternetProtocolVtbl = &HttpProtocolVtbl; ret->lpInternetPriorityVtbl = &HttpPriorityVtbl; - ret->flags = ret->grfBINDF = 0; - memset(&ret->bind_info, 0, sizeof(ret->bind_info)); - ret->protocol_sink = 0; - ret->http_negotiate = 0; - ret->internet = ret->connect = ret->request = 0; - ret->full_header = 0; - ret->lock = 0; - ret->current_position = ret->content_length = ret->available_bytes = 0; - ret->priority = 0; + + ret->https = https; ret->ref = 1; *ppobj = PROTOCOL(ret); + URLMON_LockModule(); return S_OK; } +HRESULT HttpProtocol_Construct(IUnknown *pUnkOuter, LPVOID *ppobj) +{ + TRACE("(%p %p)\n", pUnkOuter, ppobj); + + return create_http_protocol(FALSE, ppobj); +} + HRESULT HttpSProtocol_Construct(IUnknown *pUnkOuter, LPVOID *ppobj) { - FIXME("(%p %p)\n", pUnkOuter, ppobj); - return E_NOINTERFACE; + TRACE("(%p %p)\n", pUnkOuter, ppobj); + + return create_http_protocol(TRUE, ppobj); }

1 0

Andrew Talbot : qcap: Declare a function static.
by Alexandre Julliard Jan. 12, 2009

Jan. 12, 2009

Module: wine Branch: master Commit: 1e06fcdc8c5cae19f995baff63f54771ca2fe867 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e06fcdc8c5cae19f995baff6… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sun Jan 11 15:28:29 2009 +0000 qcap: Declare a function static. --- dlls/qcap/enummedia.c | 2 +- dlls/qcap/qcap_main.h | 1 - 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/qcap/enummedia.c b/dlls/qcap/enummedia.c index cff4b9f..a4d84b0 100644 --- a/dlls/qcap/enummedia.c +++ b/dlls/qcap/enummedia.c @@ -45,7 +45,7 @@ HRESULT CopyMediaType(AM_MEDIA_TYPE * pDest, const AM_MEDIA_TYPE *pSrc) return S_OK; } -void FreeMediaType(AM_MEDIA_TYPE * pMediaType) +static void FreeMediaType(AM_MEDIA_TYPE * pMediaType) { CoTaskMemFree(pMediaType->pbFormat); pMediaType->pbFormat = NULL; diff --git a/dlls/qcap/qcap_main.h b/dlls/qcap/qcap_main.h index a840655..2b75830 100644 --- a/dlls/qcap/qcap_main.h +++ b/dlls/qcap/qcap_main.h @@ -51,7 +51,6 @@ HRESULT IEnumPinsImpl_Construct(const ENUMPINDETAILS * pDetails, IEnumPins ** pp HRESULT IEnumMediaTypesImpl_Construct(const ENUMMEDIADETAILS * pDetails, IEnumMediaTypes ** ppEnum); HRESULT CopyMediaType(AM_MEDIA_TYPE * pDest, const AM_MEDIA_TYPE *pSrc); -void FreeMediaType(AM_MEDIA_TYPE * pmt); void DeleteMediaType(AM_MEDIA_TYPE * pmt); BOOL CompareMediaTypes(const AM_MEDIA_TYPE * pmt1, const AM_MEDIA_TYPE * pmt2, BOOL bWildcards); void dump_AM_MEDIA_TYPE(const AM_MEDIA_TYPE * pmt);

1 0

Andrew Talbot : ole32: Declare a function static.
by Alexandre Julliard Jan. 12, 2009

Jan. 12, 2009

Module: wine Branch: master Commit: 9e537ae06c57e54202c1c148c877265299037f08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e537ae06c57e54202c1c148c… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sun Jan 11 15:28:26 2009 +0000 ole32: Declare a function static. --- dlls/ole32/ifs.h | 4 ---- dlls/ole32/ole16.c | 2 +- 2 files changed, 1 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/ifs.h b/dlls/ole32/ifs.h index 89ae1e2..4c4287f 100644 --- a/dlls/ole32/ifs.h +++ b/dlls/ole32/ifs.h @@ -59,10 +59,6 @@ DECLARE_INTERFACE_(IMalloc16,IUnknown) /**********************************************************************/ -extern LPMALLOC16 IMalloc16_Constructor(void); - -/**********************************************************************/ - typedef struct ILockBytes16 *LPLOCKBYTES16; #define INTERFACE ILockBytes16 diff --git a/dlls/ole32/ole16.c b/dlls/ole32/ole16.c index a8fa59b..1e1cf45 100644 --- a/dlls/ole32/ole16.c +++ b/dlls/ole32/ole16.c @@ -171,7 +171,7 @@ LPVOID CDECL IMalloc16_fnHeapMinimize(IMalloc16* iface) { /****************************************************************************** * IMalloc16_Constructor [VTABLE] */ -LPMALLOC16 +static LPMALLOC16 IMalloc16_Constructor(void) { static IMalloc16Vtbl vt16;

1 0