May 2011 - Wine-Commits - list.winehq.org

Alexandre Julliard : msi: Remove the temp files after the storage files are closed.
by Alexandre Julliard May 26, 2011

May 26, 2011

Module: wine Branch: master Commit: b79fde445edfc568d3abc777f7c51025e54f0205 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b79fde445edfc568d3abc777f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 26 13:28:27 2011 +0200 msi: Remove the temp files after the storage files are closed. --- dlls/msi/package.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 9d7ab73..c421805 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -159,8 +159,6 @@ static void free_package_structures( MSIPACKAGE *package ) TRACE("Freeing package action data\n"); - remove_tracked_tempfiles(package); - LIST_FOR_EACH_SAFE( item, cursor, &package->features ) { MSIFEATURE *feature = LIST_ENTRY( item, MSIFEATURE, entry ); @@ -339,6 +337,8 @@ static void free_package_structures( MSIPACKAGE *package ) msi_free( package->LastAction ); msi_free( package->langids ); + remove_tracked_tempfiles(package); + /* cleanup control event subscriptions */ ControlEvent_CleanupSubscriptions( package ); }

1 0

Marcus Meissner : wininet: Mark internal symbols with hidden visibility.
by Alexandre Julliard May 26, 2011

May 26, 2011

Module: wine Branch: master Commit: c0ad2d4a9235c14806c24c98d073d062b137f984 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0ad2d4a9235c14806c24c98d… Author: Marcus Meissner <meissner(a)suse.de> Date: Wed May 25 19:09:51 2011 +0200 wininet: Mark internal symbols with hidden visibility. --- dlls/wininet/internet.h | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index aedb265..a7af629 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -47,7 +47,7 @@ #define ioctlsocket ioctl #endif /* __MINGW32__ */ -extern HMODULE WININET_hModule; +extern HMODULE WININET_hModule DECLSPEC_HIDDEN; #ifndef INET6_ADDRSTRLEN #define INET6_ADDRSTRLEN 46 @@ -67,9 +67,9 @@ typedef struct { struct list conn_pool; } server_t; -void server_addref(server_t*); -void server_release(server_t*); -BOOL collect_connections(BOOL); +void server_addref(server_t*) DECLSPEC_HIDDEN; +void server_release(server_t*) DECLSPEC_HIDDEN; +BOOL collect_connections(BOOL) DECLSPEC_HIDDEN; /* used for netconnection.c stuff */ typedef struct

1 0

Alexandre Julliard : kernel32/tests: Delete some temporary files.
by Alexandre Julliard May 26, 2011

May 26, 2011

Module: wine Branch: master Commit: d4b7888dbf49417cf9cd0a8947269821285fd0bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4b7888dbf49417cf9cd0a894… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 26 13:28:55 2011 +0200 kernel32/tests: Delete some temporary files. --- dlls/kernel32/tests/file.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 4e8136a..90b90e8 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -3013,6 +3013,7 @@ static void test_ReplaceFileA(void) ok(!ret && (GetLastError() == ERROR_FILE_NOT_FOUND || GetLastError() == ERROR_ACCESS_DENIED), "ReplaceFileA: unexpected error %d\n", GetLastError()); + DeleteFileA( replacement ); /* * if the first round (w/ backup) worked then as long as there is no @@ -3107,6 +3108,7 @@ static void test_ReplaceFileW(void) ok(!ret && (GetLastError() == ERROR_FILE_NOT_FOUND || GetLastError() == ERROR_ACCESS_DENIED), "ReplaceFileW: unexpected error %d\n", GetLastError()); + DeleteFileW( replacement ); if (removeBackup) {

1 0

Alexandre Julliard : kernel32: Fix a couple of handle leaks.
by Alexandre Julliard May 26, 2011

May 26, 2011

Module: wine Branch: master Commit: 6dc906208667e7e42892c47f1a5f4411985a12bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=6dc906208667e7e42892c47f1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 26 13:28:46 2011 +0200 kernel32: Fix a couple of handle leaks. --- dlls/kernel32/resource.c | 22 +++++++--------------- 1 files changed, 7 insertions(+), 15 deletions(-) diff --git a/dlls/kernel32/resource.c b/dlls/kernel32/resource.c index 81f600e..b9a93c4 100644 --- a/dlls/kernel32/resource.c +++ b/dlls/kernel32/resource.c @@ -903,7 +903,6 @@ struct resource_size_info { struct mapping_info { HANDLE file; - HANDLE mapping; void *base; DWORD size; BOOL read_write; @@ -1062,6 +1061,7 @@ static BOOL read_mapped_resources( QUEUEDUPDATES *updates, void *base, DWORD map static BOOL map_file_into_memory( struct mapping_info *mi ) { DWORD page_attr, perm; + HANDLE mapping; if (mi->read_write) { @@ -1074,15 +1074,13 @@ static BOOL map_file_into_memory( struct mapping_info *mi ) perm = FILE_MAP_READ; } - mi->mapping = CreateFileMappingW( mi->file, NULL, page_attr, 0, 0, NULL ); - if (!mi->mapping) - return FALSE; + mapping = CreateFileMappingW( mi->file, NULL, page_attr, 0, 0, NULL ); + if (!mapping) return FALSE; - mi->base = MapViewOfFile( mi->mapping, perm, 0, 0, mi->size ); - if (!mi->base) - return FALSE; + mi->base = MapViewOfFile( mapping, perm, 0, 0, mi->size ); + CloseHandle( mapping ); - return TRUE; + return mi->base != NULL; } static BOOL unmap_file_from_memory( struct mapping_info *mi ) @@ -1090,9 +1088,6 @@ static BOOL unmap_file_from_memory( struct mapping_info *mi ) if (mi->base) UnmapViewOfFile( mi->base ); mi->base = NULL; - if (mi->mapping) - CloseHandle( mi->mapping ); - mi->mapping = NULL; return TRUE; } @@ -1126,10 +1121,7 @@ static struct mapping_info *create_mapping( LPCWSTR name, BOOL rw ) if (map_file_into_memory( mi )) return mi; } - - unmap_file_from_memory( mi ); - HeapFree( GetProcessHeap(), 0, mi ); - + destroy_mapping( mi ); return NULL; }

1 0

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

May 26, 2011

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 May 26, 2011

May 26, 2011

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 : libport: Don't clear the buffer on failure in mkstemps .
by Alexandre Julliard May 26, 2011

May 26, 2011

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

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

May 25, 2011

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 May 25, 2011

May 25, 2011

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

Gerald Pfeifer : imm32: Simplify CopyCompClauseIMEtoClient and callees by shedding an unused parameter .
by Alexandre Julliard May 25, 2011

May 25, 2011

Module: wine Branch: master Commit: 619f6dccbd62c97e81470c3cc191065668aab8e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=619f6dccbd62c97e81470c3cc… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun May 22 20:54:04 2011 +0200 imm32: Simplify CopyCompClauseIMEtoClient and callees by shedding an unused parameter. --- dlls/imm32/imm.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 28f482c..3122115 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1154,7 +1154,7 @@ static INT CopyCompAttrIMEtoClient(InputContextData *data, LPBYTE source, INT sl return rc; } -static INT CopyCompClauseIMEtoClient(InputContextData *data, LPBYTE source, INT slen, LPBYTE ssource, INT sslen, +static INT CopyCompClauseIMEtoClient(InputContextData *data, LPBYTE source, INT slen, LPBYTE ssource, LPBYTE target, INT tlen, BOOL unicode ) { INT rc; @@ -1265,13 +1265,13 @@ static LONG ImmGetCompositionStringT( HIMC hIMC, DWORD dwIndex, LPVOID lpBuf, case GCS_COMPCLAUSE: TRACE("GCS_COMPCLAUSE\n"); rc = CopyCompClauseIMEtoClient(data, compdata + compstr->dwCompClauseOffset,compstr->dwCompClauseLen, - compdata + compstr->dwCompStrOffset, compstr->dwCompStrLen, + compdata + compstr->dwCompStrOffset, lpBuf, dwBufLen, unicode); break; case GCS_RESULTCLAUSE: TRACE("GCS_RESULTCLAUSE\n"); rc = CopyCompClauseIMEtoClient(data, compdata + compstr->dwResultClauseOffset,compstr->dwResultClauseLen, - compdata + compstr->dwResultStrOffset, compstr->dwResultStrLen, + compdata + compstr->dwResultStrOffset, lpBuf, dwBufLen, unicode); break; case GCS_RESULTREADSTR: @@ -1281,7 +1281,7 @@ static LONG ImmGetCompositionStringT( HIMC hIMC, DWORD dwIndex, LPVOID lpBuf, case GCS_RESULTREADCLAUSE: TRACE("GCS_RESULTREADCLAUSE\n"); rc = CopyCompClauseIMEtoClient(data, compdata + compstr->dwResultReadClauseOffset,compstr->dwResultReadClauseLen, - compdata + compstr->dwResultStrOffset, compstr->dwResultStrLen, + compdata + compstr->dwResultStrOffset, lpBuf, dwBufLen, unicode); break; case GCS_COMPREADSTR: @@ -1297,7 +1297,7 @@ static LONG ImmGetCompositionStringT( HIMC hIMC, DWORD dwIndex, LPVOID lpBuf, case GCS_COMPREADCLAUSE: TRACE("GCS_COMPREADCLAUSE\n"); rc = CopyCompClauseIMEtoClient(data, compdata + compstr->dwCompReadClauseOffset,compstr->dwCompReadClauseLen, - compdata + compstr->dwCompStrOffset, compstr->dwCompStrLen, + compdata + compstr->dwCompStrOffset, lpBuf, dwBufLen, unicode); break; case GCS_CURSORPOS:

1 0