wine-commits May 2011

wine-commits@winehq.org

2 participants
945 discussions

Alexandre Julliard : shdocvw: Delete the temporary storage file on release.
by Alexandre Julliard 26 May '11

26 May '11

Module: wine Branch: master Commit: 2e1736d0eb38e60e76a68e50d96ddabc29a308b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e1736d0eb38e60e76a68e50d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 26 13:27:55 2011 +0200 shdocvw: Delete the temporary storage file on release. --- dlls/shdocvw/intshcut.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/intshcut.c b/dlls/shdocvw/intshcut.c index 4a2dd6a..f83aa52 100644 --- a/dlls/shdocvw/intshcut.c +++ b/dlls/shdocvw/intshcut.c @@ -816,7 +816,8 @@ static InternetShortcut *create_shortcut(void) newshortcut->IPersistFile_iface.lpVtbl = &persistFileVtbl; newshortcut->IPropertySetStorage_iface.lpVtbl = &propertySetStorageVtbl; newshortcut->refCount = 0; - hr = StgCreateStorageEx(NULL, STGM_CREATE | STGM_READWRITE | STGM_SHARE_EXCLUSIVE, STGFMT_STORAGE, 0, NULL, NULL, &IID_IPropertySetStorage, (void **) &newshortcut->property_set_storage); + hr = StgCreateStorageEx(NULL, STGM_CREATE | STGM_READWRITE | STGM_SHARE_EXCLUSIVE | STGM_DELETEONRELEASE, + STGFMT_STORAGE, 0, NULL, NULL, &IID_IPropertySetStorage, (void **) &newshortcut->property_set_storage); if FAILED(hr) { TRACE("Failed to create the storage object needed for the shortcut.\n");

1 0

Alexandre Julliard : ole32: Delete the transacted storage scratch file on release.
by Alexandre Julliard 26 May '11

26 May '11

Module: wine Branch: master Commit: 7efe6d98950d0ecba69a7da87e3600d166ceb9e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7efe6d98950d0ecba69a7da87… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 26 13:27:41 2011 +0200 ole32: Delete the transacted storage scratch file on release. --- dlls/ole32/storage32.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index fa9c06f..44adaed 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -5062,7 +5062,7 @@ static HRESULT TransactedSnapshotImpl_Construct(StorageBaseImpl *parentStorage, (*result)->base.openFlags = parentStorage->openFlags; /* Create a new temporary storage to act as the scratch file. */ - hr = StgCreateDocfile(NULL, STGM_READWRITE|STGM_SHARE_EXCLUSIVE|STGM_CREATE, + hr = StgCreateDocfile(NULL, STGM_READWRITE|STGM_SHARE_EXCLUSIVE|STGM_CREATE|STGM_DELETEONRELEASE, 0, (IStorage**)&(*result)->scratch); if (SUCCEEDED(hr))

1 0

Alexandre Julliard : libport: Don't clear the buffer on failure in mkstemps .
by Alexandre Julliard 26 May '11

26 May '11

Module: wine Branch: master Commit: 57765b8c307d49a909cb563ea88141c69ff226e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57765b8c307d49a909cb563ea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 26 12:21:02 2011 +0200 libport: Don't clear the buffer on failure in mkstemps. --- libs/port/mkstemps.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/libs/port/mkstemps.c b/libs/port/mkstemps.c index 1a091a7..3ca71e8 100644 --- a/libs/port/mkstemps.c +++ b/libs/port/mkstemps.c @@ -133,7 +133,5 @@ mkstemps ( value += 7777; } - /* We return the null string if we can't find a unique file name. */ - template[0] = '\0'; return -1; }

1 0

Alexandre Julliard : winebuild: Fix the creation of temp files in /tmp.
by Alexandre Julliard 26 May '11

26 May '11

Module: wine Branch: master Commit: 2f4f9ee1cbf61e4540abbfe56e7d765fad6c8d08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f4f9ee1cbf61e4540abbfe56… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 26 12:20:37 2011 +0200 winebuild: Fix the creation of temp files in /tmp. --- tools/winebuild/utils.c | 25 +++++++++++++++---------- 1 files changed, 15 insertions(+), 10 deletions(-) diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index acd6915..2edb9e3 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -410,25 +410,30 @@ const char *get_nm_command(void) char *get_temp_file_name( const char *prefix, const char *suffix ) { char *name; - const char *ext; + const char *ext, *basename; int fd; if (!nb_tmp_files && !save_temps) atexit( cleanup_tmp_files ); if (!prefix || !prefix[0]) prefix = "winebuild"; if (!suffix) suffix = ""; - if (!(ext = strchr( prefix, '.' ))) ext = prefix + strlen(prefix); + if ((basename = strrchr( prefix, '/' ))) basename++; + else basename = prefix; + if (!(ext = strchr( basename, '.' ))) ext = prefix + strlen(prefix); name = xmalloc( sizeof("/tmp/") + (ext - prefix) + sizeof(".XXXXXX") + strlen(suffix) ); - strcpy( name, "/tmp/" ); - memcpy( name + 5, prefix, ext - prefix ); - strcpy( name + 5 + (ext - prefix), ".XXXXXX" ); + memcpy( name, prefix, ext - prefix ); + strcpy( name + (ext - prefix), ".XXXXXX" ); strcat( name, suffix ); - /* first try without the /tmp/ prefix */ - if ((fd = mkstemps( name + 5, strlen(suffix) )) != -1) - name += 5; - else if ((fd = mkstemps( name, strlen(suffix) )) == -1) - fatal_error( "could not generate a temp file\n" ); + if ((fd = mkstemps( name, strlen(suffix) )) == -1) + { + strcpy( name, "/tmp/" ); + memcpy( name + 5, basename, ext - basename ); + strcpy( name + 5 + (ext - basename), ".XXXXXX" ); + strcat( name, suffix ); + if ((fd = mkstemps( name, strlen(suffix) )) == -1) + fatal_error( "could not generate a temp file\n" ); + } close( fd ); if (nb_tmp_files >= max_tmp_files)

1 0

Alexandre Julliard : configure: Make sure the winetest directory exists before building tests.
by Alexandre Julliard 26 May '11

26 May '11

Module: wine Branch: master Commit: dbbed381d0e477dfbac33d60a7df358dc913de29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbbed381d0e477dfbac33d60a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 26 12:04:45 2011 +0200 configure: Make sure the winetest directory exists before building tests. --- aclocal.m4 | 2 +- configure | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 8793e4b..ca227f4 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -396,7 +396,7 @@ wine_fn_config_test () AS_VAR_IF([enable_tests],[no],,[wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ "all: $ac_dir .PHONY: $ac_dir -$ac_dir: $ac_dir/Makefile __builddeps__ dummy +$ac_dir: $ac_dir/Makefile programs/winetest/Makefile __builddeps__ dummy @cd $ac_dir && \$(MAKE) programs/winetest: $ac_dir check test: $ac_dir/__test__ diff --git a/configure b/configure index ea832b5..b07b77d 100755 --- a/configure +++ b/configure @@ -14771,7 +14771,7 @@ else wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ "all: $ac_dir .PHONY: $ac_dir -$ac_dir: $ac_dir/Makefile __builddeps__ dummy +$ac_dir: $ac_dir/Makefile programs/winetest/Makefile __builddeps__ dummy @cd $ac_dir && \$(MAKE) programs/winetest: $ac_dir check test: $ac_dir/__test__

1 0

Alexandre Julliard : widl: Set the correct stack size for parameters in the proc format string.
by Alexandre Julliard 26 May '11

26 May '11

Module: wine Branch: master Commit: 52cb5b20f794cd328587f4adabfa1e0bb62ce8a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52cb5b20f794cd328587f4ada… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 25 20:32:12 2011 +0200 widl: Set the correct stack size for parameters in the proc format string. --- tools/widl/typegen.c | 28 +++++++++++++++++++++++++++- 1 files changed, 27 insertions(+), 1 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 4bdc94c..36358a8 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -342,6 +342,31 @@ static int get_padding(const var_list_t *fields) return ROUNDING(offset, salign); } +static unsigned int get_stack_size( const type_t *type, const attr_list_t *attrs, int *by_value ) +{ + unsigned int stack_size; + int by_val; + + switch (typegen_detect_type( type, attrs, TDT_ALL_TYPES )) + { + case TGT_BASIC: + case TGT_ENUM: + case TGT_RANGE: + case TGT_STRUCT: + case TGT_UNION: + case TGT_USER_TYPE: + stack_size = type_memsize( type ); + by_val = (pointer_size < 8 || stack_size <= pointer_size); /* FIXME: should be platform-specific */ + break; + default: + by_val = 0; + break; + } + if (!by_val) stack_size = pointer_size; + if (by_value) *by_value = by_val; + return ROUND_SIZE( stack_size, pointer_size ); +} + unsigned char get_struct_fc(const type_t *type) { int has_pointer = 0; @@ -871,7 +896,8 @@ static unsigned int write_procformatstring_type(FILE *file, int indent, else print_file(file, indent, "0x4d, /* FC_IN_PARAM */\n"); - print_file(file, indent, "0x01,\n"); + size = get_stack_size( type, attrs, NULL ); + print_file(file, indent, "0x%02x,\n", size / pointer_size ); print_file(file, indent, "NdrFcShort(0x%x), /* type offset = %u */\n", type->typestring_offset, type->typestring_offset); size = 4; /* includes param type prefix */

1 0

Alexandre Julliard : widl: Allow using fixed size arrays as strings.
by Alexandre Julliard 26 May '11

26 May '11

Module: wine Branch: master Commit: 56e65b453456ef49595e4194b1313753d9b7e5ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=56e65b453456ef49595e4194b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 25 19:34:26 2011 +0200 widl: Allow using fixed size arrays as strings. --- tools/widl/parser.y | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 3850e65..fc1076f 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -2560,11 +2560,14 @@ static void check_remoting_args(const var_t *func) error_loc_info(&arg->loc_info, "out interface pointer \'%s\' of function \'%s\' is not a double pointer\n", arg->name, funcname); break; case TGT_STRING: - if (is_ptr(type) || - (is_array(type) && - (!type_array_has_conformance(type) || - type_array_get_conformance(type)->type == EXPR_VOID))) - error_loc_info(&arg->loc_info, "out parameter \'%s\' of function \'%s\' cannot be an unsized string\n", arg->name, funcname); + if (is_array(type)) + { + /* needs conformance or fixed dimension */ + if (type_array_has_conformance(type) && + type_array_get_conformance(type)->type != EXPR_VOID) break; + if (!type_array_has_conformance(type) && type_array_get_dim(type)) break; + } + error_loc_info(&arg->loc_info, "out parameter \'%s\' of function \'%s\' cannot be an unsized string\n", arg->name, funcname); break; case TGT_INVALID: /* already error'd before we get here */

1 0

Rico Schüller : d3dx9: Pass objects to functions instead of using the base effect in the parameter .
by Alexandre Julliard 25 May '11

25 May '11

Module: wine Branch: master Commit: 7f426a51d120c5ea790ba330c31db0043fd3e59b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f426a51d120c5ea790ba330c… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed May 25 10:55:13 2011 +0200 d3dx9: Pass objects to functions instead of using the base effect in the parameter. --- dlls/d3dx9_36/effect.c | 67 +++++++++++++++++------------------------------ 1 files changed, 24 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7f426a51d120c5ea790ba…

1 0

Rico Schüller : d3d9/tests: Fix some ok() messages in the visual tests.
by Alexandre Julliard 25 May '11

25 May '11

Module: wine Branch: master Commit: 480259ca2c60576f808391d82f05b7b9ed8ebc24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=480259ca2c60576f808391d82… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed May 25 10:55:01 2011 +0200 d3d9/tests: Fix some ok() messages in the visual tests. --- dlls/d3d9/tests/visual.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 0f7e2ab..79207dd 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -9301,7 +9301,7 @@ static void stream_test(IDirect3DDevice9 *device) ok(SUCCEEDED(hr), "IDirect3DDevice9_SetVertexShader failed hr=%08x\n", hr); hr = IDirect3DDevice9_SetIndices(device, ib); - ok(hr == D3D_OK, "IDirect3DIndexBuffer9_Unlock failed with %08x\n", hr); + ok(hr == D3D_OK, "IDirect3DDevice9_SetIndices failed with %08x\n", hr); /* run all tests */ for( i = 0; i < sizeof(testcases)/sizeof(testcases[0]); ++i) @@ -9327,17 +9327,17 @@ static void stream_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_SetStreamSourceFreq(device, act.strVertex, (D3DSTREAMSOURCE_INDEXEDDATA | act.idxVertex)); ok(hr == D3D_OK, "IDirect3DDevice9_SetStreamSourceFreq failed with %08x (case %i)\n", hr, i); hr = IDirect3DDevice9_SetStreamSource(device, act.strVertex, vb, 0, sizeof(quad[0])); - ok(hr == D3D_OK, "IDirect3DIndexBuffer9_Unlock failed with %08x (case %i)\n", hr, i); + ok(hr == D3D_OK, "IDirect3DDevice9_SetStreamSource failed with %08x (case %i)\n", hr, i); hr = IDirect3DDevice9_SetStreamSourceFreq(device, act.strColor, (D3DSTREAMSOURCE_INDEXEDDATA | act.idxColor)); ok(hr == D3D_OK, "IDirect3DDevice9_SetStreamSourceFreq failed with %08x (case %i)\n", hr, i); hr = IDirect3DDevice9_SetStreamSource(device, act.strColor, vb2, 0, sizeof(vertcolor[0])); - ok(hr == D3D_OK, "IDirect3DIndexBuffer9_Unlock failed with %08x (case %i)\n", hr, i); + ok(hr == D3D_OK, "IDirect3DDevice9_SetStreamSource failed with %08x (case %i)\n", hr, i); hr = IDirect3DDevice9_SetStreamSourceFreq(device, act.strInstance, (D3DSTREAMSOURCE_INSTANCEDATA | act.idxInstance)); ok(hr == D3D_OK, "IDirect3DDevice9_SetStreamSourceFreq failed with %08x (case %i)\n", hr, i); hr = IDirect3DDevice9_SetStreamSource(device, act.strInstance, vb3, 0, sizeof(instancepos[0])); - ok(hr == D3D_OK, "IDirect3DIndexBuffer9_Unlock failed with %08x (case %i)\n", hr, i); + ok(hr == D3D_OK, "IDirect3DDevice9_SetStreamSource failed with %08x (case %i)\n", hr, i); hr = IDirect3DDevice9_DrawIndexedPrimitive(device, D3DPT_TRIANGLELIST, 0, 0, 4, 0, 2); ok(hr == D3D_OK, "IDirect3DDevice9_DrawIndexedPrimitive failed with %08x (case %i)\n", hr, i); @@ -9454,9 +9454,9 @@ static void np2_stretch_rect_test(IDirect3DDevice9 *device) { hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_TEX1); ok(hr == D3D_OK, "IDirect3DDevice9_SetFVF failed with %08x\n", hr); hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1); - ok(hr == D3D_OK, "IDirect3DDevice9_SetTexture failed with %08x\n", hr); + ok(hr == D3D_OK, "IDirect3DDevice9_SetTextureStageState failed with %08x\n", hr); hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLORARG1, D3DTA_TEXTURE); - ok(hr == D3D_OK, "IDirect3DDevice9_SetTexture failed with %08x\n", hr); + ok(hr == D3D_OK, "IDirect3DDevice9_SetTextureStageState failed with %08x\n", hr); hr = IDirect3DDevice9_BeginScene(device); ok(hr == D3D_OK, "IDirect3DDevice9_BeginScene failed with %08x\n", hr);

1 0

Rico Schüller : d3dx9: Pass the device directly to d3dx9_parse_data().
by Alexandre Julliard 25 May '11

25 May '11

Module: wine Branch: master Commit: 088ed09e94c0824d49d708bf24ef20af5db3137c URL: http://source.winehq.org/git/wine.git/?a=commit;h=088ed09e94c0824d49d708bf2… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed May 25 10:54:51 2011 +0200 d3dx9: Pass the device directly to d3dx9_parse_data(). --- dlls/d3dx9_36/effect.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 7608717..712839b 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -3519,7 +3519,7 @@ static HRESULT d3dx9_parse_name(char **name, const char *ptr) return D3D_OK; } -static HRESULT d3dx9_parse_data(struct d3dx_parameter *param, const char **ptr) +static HRESULT d3dx9_parse_data(struct d3dx_parameter *param, const char **ptr, LPDIRECT3DDEVICE9 device) { DWORD size; HRESULT hr; @@ -3549,7 +3549,7 @@ static HRESULT d3dx9_parse_data(struct d3dx_parameter *param, const char **ptr) break; case D3DXPT_VERTEXSHADER: - hr = IDirect3DDevice9_CreateVertexShader(param->base->effect->device, (DWORD *)*ptr, (LPDIRECT3DVERTEXSHADER9 *)param->data); + hr = IDirect3DDevice9_CreateVertexShader(device, (DWORD *)*ptr, (LPDIRECT3DVERTEXSHADER9 *)param->data); if (hr != D3D_OK) { WARN("Failed to create vertex shader\n"); @@ -3558,7 +3558,7 @@ static HRESULT d3dx9_parse_data(struct d3dx_parameter *param, const char **ptr) break; case D3DXPT_PIXELSHADER: - hr = IDirect3DDevice9_CreatePixelShader(param->base->effect->device, (DWORD *)*ptr, (LPDIRECT3DPIXELSHADER9 *)param->data); + hr = IDirect3DDevice9_CreatePixelShader(device, (DWORD *)*ptr, (LPDIRECT3DPIXELSHADER9 *)param->data); if (hr != D3D_OK) { WARN("Failed to create pixel shader\n"); @@ -4252,7 +4252,7 @@ static HRESULT d3dx9_parse_effect(struct ID3DXBaseEffectImpl *base, const char * param = get_parameter_struct(base->objects[id]); - hr = d3dx9_parse_data(param, &ptr); + hr = d3dx9_parse_data(param, &ptr, base->effect->device); if (hr != D3D_OK) { WARN("Failed to parse data\n");

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
95
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 May 2011