January 2014 - Wine-commits

André Hentschel : kernel32/tests: Allow more last errors from win8.
by Alexandre Julliard 06 Jan '14

06 Jan '14

Module: wine Branch: master Commit: 6db63a1867c556eaa21f2456b87e428ef5bded23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6db63a1867c556eaa21f2456b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Jan 4 18:35:14 2014 +0100 kernel32/tests: Allow more last errors from win8. --- dlls/kernel32/tests/console.c | 78 +++++++++++++++++++++-------------------- 1 files changed, 40 insertions(+), 38 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index cd7ac23..7c43663 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -1375,7 +1375,7 @@ static void test_WriteConsoleInputA(HANDLE input_handle) INPUT_RECORD event_list[5]; MOUSE_EVENT_RECORD mouse_event = { {0, 0}, 0, 0, MOUSE_MOVED }; KEY_EVENT_RECORD key_event; - DWORD count, console_mode; + DWORD count, console_mode, gle; BOOL ret; int i; @@ -1386,31 +1386,31 @@ static void test_WriteConsoleInputA(HANDLE input_handle) DWORD count; LPDWORD written; DWORD expected_count; - DWORD last_error; + DWORD gle, gle2; int win_crash; } invalid_table[] = { - {NULL, NULL, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, NULL, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 0, 1}, {NULL, NULL, 0, &count, 0, ERROR_INVALID_HANDLE}, - {NULL, NULL, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {NULL, NULL, 1, &count, 0xdeadbeef, ERROR_INVALID_ACCESS}, - {NULL, &event, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, NULL, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 0, 1}, + {NULL, NULL, 1, &count, 0xdeadbeef, ERROR_NOACCESS, ERROR_INVALID_ACCESS}, + {NULL, &event, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 0, 1}, {NULL, &event, 0, &count, 0, ERROR_INVALID_HANDLE}, - {NULL, &event, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, &event, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 0, 1}, {NULL, &event, 1, &count, 0, ERROR_INVALID_HANDLE}, - {INVALID_HANDLE_VALUE, NULL, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, NULL, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 0, 1}, {INVALID_HANDLE_VALUE, NULL, 0, &count, 0, ERROR_INVALID_HANDLE}, - {INVALID_HANDLE_VALUE, NULL, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, NULL, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 0, 1}, {INVALID_HANDLE_VALUE, NULL, 1, &count, 0xdeadbeef, ERROR_INVALID_ACCESS}, - {INVALID_HANDLE_VALUE, &event, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, &event, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 0, 1}, {INVALID_HANDLE_VALUE, &event, 0, &count, 0, ERROR_INVALID_HANDLE}, - {INVALID_HANDLE_VALUE, &event, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, &event, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 0, 1}, {INVALID_HANDLE_VALUE, &event, 1, &count, 0, ERROR_INVALID_HANDLE}, - {input_handle, NULL, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {input_handle, NULL, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {input_handle, NULL, 1, &count, 0xdeadbeef, ERROR_INVALID_ACCESS}, - {input_handle, &event, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {input_handle, &event, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {input_handle, NULL, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 0, 1}, + {input_handle, NULL, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 0, 1}, + {input_handle, NULL, 1, &count, 0xdeadbeef, ERROR_NOACCESS, ERROR_INVALID_ACCESS}, + {input_handle, &event, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 0, 1}, + {input_handle, &event, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 0, 1}, }; /* Suppress external sources of input events for the duration of the test. */ @@ -1455,9 +1455,10 @@ static void test_WriteConsoleInputA(HANDLE input_handle) "[%d] Expected output count to be %u, got %u\n", i, invalid_table[i].expected_count, count); } - ok(GetLastError() == invalid_table[i].last_error, - "[%d] Expected last error to be %u, got %u\n", - i, invalid_table[i].last_error, GetLastError()); + gle = GetLastError(); + ok(gle == invalid_table[i].gle || (gle != 0 && gle == invalid_table[i].gle2), + "[%d] Expected last error to be %u or %u, got %u\n", + i, invalid_table[i].gle, invalid_table[i].gle2, gle); } count = 0xdeadbeef; @@ -1618,7 +1619,7 @@ static void test_WriteConsoleInputW(HANDLE input_handle) INPUT_RECORD event_list[5]; MOUSE_EVENT_RECORD mouse_event = { {0, 0}, 0, 0, MOUSE_MOVED }; KEY_EVENT_RECORD key_event; - DWORD count, console_mode; + DWORD count, console_mode, gle; BOOL ret; int i; @@ -1629,31 +1630,31 @@ static void test_WriteConsoleInputW(HANDLE input_handle) DWORD count; LPDWORD written; DWORD expected_count; - DWORD last_error; + DWORD gle, gle2; int win_crash; } invalid_table[] = { - {NULL, NULL, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, NULL, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 0, 1}, {NULL, NULL, 0, &count, 0, ERROR_INVALID_HANDLE}, - {NULL, NULL, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {NULL, NULL, 1, &count, 0xdeadbeef, ERROR_INVALID_ACCESS}, - {NULL, &event, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, NULL, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 0, 1}, + {NULL, NULL, 1, &count, 0xdeadbeef, ERROR_NOACCESS, ERROR_INVALID_ACCESS}, + {NULL, &event, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 0, 1}, {NULL, &event, 0, &count, 0, ERROR_INVALID_HANDLE}, - {NULL, &event, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, &event, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 0, 1}, {NULL, &event, 1, &count, 0, ERROR_INVALID_HANDLE}, - {INVALID_HANDLE_VALUE, NULL, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, NULL, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 0, 1}, {INVALID_HANDLE_VALUE, NULL, 0, &count, 0, ERROR_INVALID_HANDLE}, - {INVALID_HANDLE_VALUE, NULL, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, NULL, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 0, 1}, {INVALID_HANDLE_VALUE, NULL, 1, &count, 0xdeadbeef, ERROR_INVALID_ACCESS}, - {INVALID_HANDLE_VALUE, &event, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, &event, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 0, 1}, {INVALID_HANDLE_VALUE, &event, 0, &count, 0, ERROR_INVALID_HANDLE}, - {INVALID_HANDLE_VALUE, &event, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, &event, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 0, 1}, {INVALID_HANDLE_VALUE, &event, 1, &count, 0, ERROR_INVALID_HANDLE}, - {input_handle, NULL, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {input_handle, NULL, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {input_handle, NULL, 1, &count, 0xdeadbeef, ERROR_INVALID_ACCESS}, - {input_handle, &event, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {input_handle, &event, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {input_handle, NULL, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 0, 1}, + {input_handle, NULL, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 0, 1}, + {input_handle, NULL, 1, &count, 0xdeadbeef, ERROR_NOACCESS, ERROR_INVALID_ACCESS}, + {input_handle, &event, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 0, 1}, + {input_handle, &event, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 0, 1}, }; /* Suppress external sources of input events for the duration of the test. */ @@ -1698,9 +1699,10 @@ static void test_WriteConsoleInputW(HANDLE input_handle) "[%d] Expected output count to be %u, got %u\n", i, invalid_table[i].expected_count, count); } - ok(GetLastError() == invalid_table[i].last_error, - "[%d] Expected last error to be %u, got %u\n", - i, invalid_table[i].last_error, GetLastError()); + gle = GetLastError(); + ok(gle == invalid_table[i].gle || (gle != 0 && gle == invalid_table[i].gle2), + "[%d] Expected last error to be %u or %u, got %u\n", + i, invalid_table[i].gle, invalid_table[i].gle2, gle); } count = 0xdeadbeef;

1 0

André Hentschel : ws2_32: Don't leak hostname ( Coverity).
by Alexandre Julliard 06 Jan '14

06 Jan '14

Module: wine Branch: master Commit: 57d2e8f3c398e3d02dbac9b17dc6c5a493c65169 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57d2e8f3c398e3d02dbac9b17… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Jan 4 18:36:34 2014 +0100 ws2_32: Don't leak hostname (Coverity). --- dlls/ws2_32/socket.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 12838da..b027d7a 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -5479,6 +5479,7 @@ int WINAPI WS_getaddrinfo(LPCSTR nodename, LPCSTR servname, const struct WS_addr if (punixhints->ai_socktype < 0) { WSASetLastError(WSAESOCKTNOSUPPORT); + HeapFree(GetProcessHeap(), 0, hostname); return SOCKET_ERROR; }

1 0

André Hentschel : msi: Check return value from MSIREG_OpenInstallProps (Coverity).
by Alexandre Julliard 06 Jan '14

06 Jan '14

Module: wine Branch: master Commit: 2d6685f4ecd5c183a42e9e1f9a08017e0efe53d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d6685f4ecd5c183a42e9e1f9… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Jan 4 19:17:01 2014 +0100 msi: Check return value from MSIREG_OpenInstallProps (Coverity). --- dlls/msi/msi.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index f8a1874..5b344ca 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -1138,8 +1138,6 @@ static UINT MSI_GetProductInfo(LPCWSTR szProduct, LPCWSTR szAttribute, context = MSIINSTALLCONTEXT_MACHINE; } - MSIREG_OpenInstallProps(szProduct, context, NULL, &userdata, FALSE); - if (!strcmpW( szAttribute, INSTALLPROPERTY_HELPLINKW ) || !strcmpW( szAttribute, INSTALLPROPERTY_HELPTELEPHONEW ) || !strcmpW( szAttribute, INSTALLPROPERTY_INSTALLDATEW ) || @@ -1162,9 +1160,11 @@ static UINT MSI_GetProductInfo(LPCWSTR szProduct, LPCWSTR szAttribute, r = ERROR_UNKNOWN_PRODUCT; goto done; } - - if (!userdata) - return ERROR_UNKNOWN_PROPERTY; + if (MSIREG_OpenInstallProps(szProduct, context, NULL, &userdata, FALSE)) + { + r = ERROR_UNKNOWN_PROPERTY; + goto done; + } if (!strcmpW( szAttribute, INSTALLPROPERTY_INSTALLEDPRODUCTNAMEW )) szAttribute = display_name; @@ -1174,6 +1174,7 @@ static UINT MSI_GetProductInfo(LPCWSTR szProduct, LPCWSTR szAttribute, val = msi_reg_get_value(userdata, szAttribute, &type); if (!val) val = empty; + RegCloseKey(userdata); } else if (!strcmpW( szAttribute, INSTALLPROPERTY_INSTANCETYPEW ) || !strcmpW( szAttribute, INSTALLPROPERTY_TRANSFORMSW ) || @@ -1266,7 +1267,6 @@ static UINT MSI_GetProductInfo(LPCWSTR szProduct, LPCWSTR szAttribute, done: RegCloseKey(prodkey); - RegCloseKey(userdata); return r; }

1 0

André Hentschel : Assorted spelling fixes.
by Alexandre Julliard 06 Jan '14

06 Jan '14

Module: wine Branch: master Commit: 87c7c961f278af5e994e4774bdc2be17985256b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87c7c961f278af5e994e4774b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jan 6 02:13:41 2014 +0100 Assorted spelling fixes. --- dlls/d3dx9_36/shader.c | 2 +- dlls/d3dx9_36/tests/effect.c | 2 +- dlls/mmdevapi/tests/render.c | 2 +- dlls/ntdll/tests/exception.c | 2 +- dlls/shell32/tests/shellpath.c | 2 +- dlls/winspool.drv/tests/info.c | 2 +- programs/winemenubuilder/winemenubuilder.c | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 460fe5a..955c2ad 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -1029,7 +1029,7 @@ static UINT set(struct ID3DXConstantTableImpl *table, IDirect3DDevice9 *device, UINT l, i, regcount = 1, regsize = 1, cin = 1, rin = 1, ret, last = 0; DWORD tmp; - /* size to small to set anything */ + /* size too small to set anything */ if (*size < desc->Rows * desc->Columns) { *size = 0; diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 54ae9f8..2306f1e 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -1715,7 +1715,7 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) /* check size */ ok(EFFECT_PARAMETER_VALUE_ARRAY_SIZE >= res_desc->Bytes / 4 + (res_desc->Elements ? res_desc->Bytes / 4 / res_desc->Elements : 0), - "%u - %s: Warning: Array size to small\n", i, res_full_name); + "%u - %s: Warning: Array size too small\n", i, res_full_name); test_effect_parameter_value_GetTestGroup(&res[k], effect, &blob[res_value_offset], parameter, i); test_effect_parameter_value_ResetValue(&res[k], effect, &blob[res_value_offset], parameter, i); diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 38495df..4117cb3 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -884,7 +884,7 @@ static void test_clock(int share) hr = IAudioClient_GetDevicePeriod(ac, &defp, &minp); ok(hr == S_OK, "GetDevicePeriod failed: %08x\n", hr); - ok(minp <= period, "desired period %u to small for %u\n", (ULONG)period, (ULONG)minp); + ok(minp <= period, "desired period %u too small for %u\n", (ULONG)period, (ULONG)minp); if (share) { trace("Testing shared mode\n"); diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 2ca1297..b4cbaf5 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -1065,7 +1065,7 @@ static void test_dpe_exceptions(void) DWORD val; ULONG len; - /* Query DEP with len to small */ + /* Query DEP with len too small */ stat = pNtQueryInformationProcess(GetCurrentProcess(), ProcessExecuteFlags, &val, sizeof val - 1, &len); if(stat == STATUS_INVALID_INFO_CLASS) { diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index 8bd5ab0..f3c40a5 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -2597,7 +2597,7 @@ static void test_DoEnvironmentSubst(void) " 0: got %s (expected %s)\n", wine_dbgstr_w(bufferW), wine_dbgstr_w(expectedW)); - /* buffer to small */ + /* Buffer too small */ /* result: FALSE / provided buffer length / the buffer is untouched */ memset(bufferA, '#', MAX_PATH - 1); bufferA[len + 2] = 0; diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index 7a6878a..71bf54b 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -1659,7 +1659,7 @@ static void test_GetPrintProcessorDirectory(void) res = GetPrintProcessorDirectoryA(NULL, NULL, 1, buffer, cbBuf*2, &pcbNeeded); ok(res, "returned %d with %d (expected '!= 0')\n", res, GetLastError()); - /* Buffer to small */ + /* Buffer too small */ buffer[0] = '\0'; SetLastError(0xdeadbeef); res = GetPrintProcessorDirectoryA( NULL, NULL, 1, buffer, cbBuf-1, &pcbNeeded); diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 973bd02..afd3d96 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -820,7 +820,7 @@ static HRESULT open_module16_icon(LPCWSTR szFileName, int nIndex, IStream **ppSt iconDirPtr = (NE_NAMEINFO*)(((BYTE*)iconGroupResources) + sizeof(NE_TYPEINFO) + nIndex*sizeof(NE_NAMEINFO)); if ((((BYTE*)iconDirPtr) + sizeof(NE_NAMEINFO)) > (fileBytes + fileSize)) { - WINE_WARN("file to small for icon group NE_NAMEINFO\n"); + WINE_WARN("file too small for icon group NE_NAMEINFO\n"); goto end; } iconDir = (GRPICONDIR*)(fileBytes + (iconDirPtr->offset << alignmentShiftCount));

1 0

Alexandre Julliard : makedep: Grow the include file array dynamically.
by Alexandre Julliard 06 Jan '14

06 Jan '14

Module: wine Branch: master Commit: 9c2725d5d619b0b76222113a4529cb2dc3a094cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c2725d5d619b0b76222113a4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 4 12:25:56 2014 +0100 makedep: Grow the include file array dynamically. --- tools/makedep.c | 55 ++++++++++++++++++++++++++++++++----------------------- 1 files changed, 32 insertions(+), 23 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 9bd8295..f7e2865 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -35,9 +35,6 @@ #endif #include "wine/list.h" -/* Max first-level includes per file */ -#define MAX_INCLUDES 200 - struct incl_file { struct list entry; @@ -48,7 +45,9 @@ struct incl_file int included_line; /* line where this file was included */ unsigned int flags; /* flags (see below) */ struct incl_file *owner; - struct incl_file *files[MAX_INCLUDES]; + unsigned int files_count; /* files in use */ + unsigned int files_size; /* total allocated size */ + struct incl_file **files; }; #define FLAG_SYSTEM 0x0001 /* is it a system include (#include <name>) */ @@ -550,15 +549,17 @@ static struct incl_file *find_include_file( const char *name ) * * Add an include file if it doesn't already exists. */ -static struct incl_file *add_include( struct incl_file *pFile, const char *name, int system ) +static struct incl_file *add_include( struct incl_file *parent, const char *name, int system ) { struct incl_file *include; char *ext; - int pos; - for (pos = 0; pos < MAX_INCLUDES; pos++) if (!pFile->files[pos]) break; - if (pos >= MAX_INCLUDES) - fatal_error( "too many included files, please fix MAX_INCLUDES\n" ); + if (parent->files_count >= parent->files_size) + { + parent->files_size *= 2; + if (parent->files_size < 16) parent->files_size = 16; + parent->files = xrealloc( parent->files, parent->files_size * sizeof(*parent->files) ); + } /* enforce some rules for the Wine tree */ @@ -567,19 +568,19 @@ static struct incl_file *add_include( struct incl_file *pFile, const char *name, if (!strcmp( name, "config.h" )) { - if ((ext = strrchr( pFile->filename, '.' )) && !strcmp( ext, ".h" )) + if ((ext = strrchr( parent->filename, '.' )) && !strcmp( ext, ".h" )) fatal_error( "config.h must not be included by a header file\n" ); - if (pos) + if (parent->files_count) fatal_error( "config.h must be included before anything else\n" ); } else if (!strcmp( name, "wine/port.h" )) { - if ((ext = strrchr( pFile->filename, '.' )) && !strcmp( ext, ".h" )) + if ((ext = strrchr( parent->filename, '.' )) && !strcmp( ext, ".h" )) fatal_error( "wine/port.h must not be included by a header file\n" ); - if (!pos) fatal_error( "config.h must be included before wine/port.h\n" ); - if (pos > 1) + if (!parent->files_count) fatal_error( "config.h must be included before wine/port.h\n" ); + if (parent->files_count > 1) fatal_error( "wine/port.h must be included before everything except config.h\n" ); - if (strcmp( pFile->files[0]->name, "config.h" )) + if (strcmp( parent->files[0]->name, "config.h" )) fatal_error( "config.h must be included before wine/port.h\n" ); } @@ -589,12 +590,12 @@ static struct incl_file *add_include( struct incl_file *pFile, const char *name, include = xmalloc( sizeof(*include) ); memset( include, 0, sizeof(*include) ); include->name = xstrdup(name); - include->included_by = pFile; + include->included_by = parent; include->included_line = input_line; if (system) include->flags |= FLAG_SYSTEM; list_add_tail( &includes, &include->entry ); found: - pFile->files[pos] = include; + parent->files[parent->files_count++] = include; return include; } @@ -1323,12 +1324,22 @@ static void add_generated_sources(void) if (strendswith( source->name, ".y" )) { file = add_generated_source( replace_extension( source->name, ".y", ".tab.c" ), NULL ); - memcpy( file->files, source->files, sizeof(file->files) ); + /* steal the includes list from the source file */ + file->files_count = source->files_count; + file->files_size = source->files_size; + file->files = source->files; + source->files_count = source->files_size = 0; + source->files = NULL; } if (strendswith( source->name, ".l" )) { file = add_generated_source( replace_extension( source->name, ".l", ".yy.c" ), NULL ); - memcpy( file->files, source->files, sizeof(file->files) ); + /* steal the includes list from the source file */ + file->files_count = source->files_count; + file->files_size = source->files_size; + file->files = source->files; + source->files_count = source->files_size = 0; + source->files = NULL; } } if (get_make_variable( "TESTDLL" )) @@ -1350,8 +1361,7 @@ static void output_include( struct incl_file *pFile, struct incl_file *owner ) if (!pFile->filename) return; pFile->owner = owner; output_filename( pFile->filename ); - for (i = 0; i < MAX_INCLUDES; i++) - if (pFile->files[i]) output_include( pFile->files[i], owner ); + for (i = 0; i < pFile->files_count; i++) output_include( pFile->files[i], owner ); } @@ -1614,8 +1624,7 @@ static struct strarray output_sources(void) free( obj ); free( sourcedep ); - for (i = 0; i < MAX_INCLUDES; i++) - if (source->files[i]) output_include( source->files[i], source ); + for (i = 0; i < source->files_count; i++) output_include( source->files[i], source ); output( "\n" ); }

1 0

Alexandre Julliard : makedep: Don't expand variable references that use ${} .
by Alexandre Julliard 06 Jan '14

06 Jan '14

Module: wine Branch: master Commit: ce25c89585efc345f528a2d82b8856d84be82909 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce25c89585efc345f528a2d82… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 4 20:33:57 2014 +0100 makedep: Don't expand variable references that use ${}. --- Make.vars.in | 5 ++--- dlls/appwiz.cpl/Makefile.in | 2 +- libs/wine/Makefile.in | 12 ++++++------ tools/makedep.c | 6 ++++++ tools/widl/Makefile.in | 2 +- tools/winegcc/Makefile.in | 6 +++--- tools/wrc/Makefile.in | 2 +- 7 files changed, 20 insertions(+), 15 deletions(-) diff --git a/Make.vars.in b/Make.vars.in index 185e656..15ef9c0 100644 --- a/Make.vars.in +++ b/Make.vars.in @@ -6,12 +6,11 @@ bindir = @bindir@ libdir = @libdir@ datarootdir = @datarootdir@ datadir = @datadir@ -infodir = @infodir@ mandir = @mandir@ -fontdir = $(datadir)/wine/fonts +fontdir = ${datadir}/wine/fonts includedir = @includedir@/wine dlldir = @dlldir@ -fakedlldir = $(dlldir)/fakedlls +fakedlldir = ${dlldir}/fakedlls top_srcdir = @top_srcdir@ top_builddir = @top_builddir@ srcdir = @srcdir@ diff --git a/dlls/appwiz.cpl/Makefile.in b/dlls/appwiz.cpl/Makefile.in index b1c3319..4efd915 100644 --- a/dlls/appwiz.cpl/Makefile.in +++ b/dlls/appwiz.cpl/Makefile.in @@ -1,7 +1,7 @@ MODULE = appwiz.cpl IMPORTS = uuid urlmon advpack comctl32 advapi32 shell32 user32 comdlg32 DELAYIMPORTS = msi -EXTRADEFS = -DINSTALL_DATADIR="\"$(datadir)\"" +EXTRADEFS = -DINSTALL_DATADIR="\"${datadir}\"" C_SRCS = \ addons.c \ diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index 5286e85..6b44ea4 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -1,12 +1,12 @@ EXTRALIBS = $(LIBPORT) @LIBDL@ @COREFOUNDATIONLIB@ @CORESERVICESLIB@ EXTRADEFS = -DWINE_UNICODE_API="" \ - -DBINDIR='"$(bindir)"' \ - -DDLLDIR='"$(dlldir)"' \ + -DBINDIR='"${bindir}"' \ + -DDLLDIR='"${dlldir}"' \ -DDLLPREFIX='"$(DLLPREFIX)"' \ - -DLIB_TO_BINDIR=\"`$(MAKEDEP) -R $(libdir) $(bindir)`\" \ - -DLIB_TO_DLLDIR=\"`$(MAKEDEP) -R $(libdir) $(dlldir)`\" \ - -DBIN_TO_DLLDIR=\"`$(MAKEDEP) -R $(bindir) $(dlldir)`\" \ - -DBIN_TO_DATADIR=\"`$(MAKEDEP) -R $(bindir) $(datadir)/wine`\" + -DLIB_TO_BINDIR=\"`$(MAKEDEP) -R ${libdir} ${bindir}`\" \ + -DLIB_TO_DLLDIR=\"`$(MAKEDEP) -R ${libdir} ${dlldir}`\" \ + -DBIN_TO_DLLDIR=\"`$(MAKEDEP) -R ${bindir} ${dlldir}`\" \ + -DBIN_TO_DATADIR=\"`$(MAKEDEP) -R ${bindir} ${datadir}/wine`\" STATICLIB = libwine_static.a C_SRCS = \ diff --git a/tools/makedep.c b/tools/makedep.c index f7e2865..28f60fd 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1157,6 +1157,12 @@ static char *get_expanded_make_variable( const char *name ) tmp = replace_substr( expand, p, end - p, var ? var : "" ); free( var ); } + else if (p[1] == '{') /* don't expand ${} variables */ + { + if (!(end = strchr( p + 2, '}' ))) fatal_error( "syntax error in '%s'\n", expand ); + p = end + 1; + continue; + } else if (p[1] == '$') { tmp = replace_substr( expand, p, 2, "$" ); diff --git a/tools/widl/Makefile.in b/tools/widl/Makefile.in index 4565f54..12d0ea3 100644 --- a/tools/widl/Makefile.in +++ b/tools/widl/Makefile.in @@ -19,7 +19,7 @@ C_SRCS = \ LEX_SRCS = parser.l BISON_SRCS = parser.y -EXTRADEFS = -DDEFAULT_INCLUDE_DIR=\"$(includedir)/windows/\" +EXTRADEFS = -DDEFAULT_INCLUDE_DIR=\"${includedir}/windows/\" @MAKE_RULES@ diff --git a/tools/winegcc/Makefile.in b/tools/winegcc/Makefile.in index 6b72211..7c0c71c 100644 --- a/tools/winegcc/Makefile.in +++ b/tools/winegcc/Makefile.in @@ -1,7 +1,7 @@ EXTRADEFS = \ - -DINCLUDEDIR="\"$(includedir)\"" \ - -DDLLDIR="\"$(dlldir)\"" \ - -DLIBDIR="\"$(libdir)\"" \ + -DINCLUDEDIR="\"${includedir}\"" \ + -DDLLDIR="\"${dlldir}\"" \ + -DLIBDIR="\"${libdir}\"" \ -DCC="\"$(CC)\"" \ -DCPP="\"@CPPBIN@\"" \ -DCXX="\"@CXX@\"" \ diff --git a/tools/wrc/Makefile.in b/tools/wrc/Makefile.in index 9d956b8..2b7a3f4 100644 --- a/tools/wrc/Makefile.in +++ b/tools/wrc/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DINCLUDEDIR="\"$(includedir)\"" +EXTRADEFS = -DINCLUDEDIR="\"${includedir}\"" PROGRAMS = wrc$(EXEEXT) MANPAGES = wrc.man.in ALL_LIBS = @LIBGETTEXTPO@ $(LIBWPP) $(LIBWINE_STATIC) $(LIBPORT)

1 0

Alexandre Julliard : configure: Don't allow overriding INSTALL.
by Alexandre Julliard 06 Jan '14

06 Jan '14

Module: wine Branch: master Commit: 205003f9c09b49e56f4f9df15fe53492d0d8bd7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=205003f9c09b49e56f4f9df15… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 4 19:35:00 2014 +0100 configure: Don't allow overriding INSTALL. --- Make.vars.in | 7 +++---- configure | 14 -------------- configure.ac | 7 ------- 3 files changed, 3 insertions(+), 25 deletions(-) diff --git a/Make.vars.in b/Make.vars.in index 15ef9c0..6bec6979 100644 --- a/Make.vars.in +++ b/Make.vars.in @@ -70,10 +70,9 @@ CROSSWINEGCC = $(TOOLSDIR)/tools/winegcc/winegcc -B$(TOOLSDIR)/tools/winebuil SED_CMD = LC_ALL=C sed -e 's,@bindir\@,$(bindir),g' -e 's,@dlldir\@,$(dlldir),g' -e 's,@PACKAGE_STRING\@,@PACKAGE_STRING@,g' -e 's,@PACKAGE_VERSION\@,@PACKAGE_VERSION@,g' LDRPATH_INSTALL = @LDRPATH_INSTALL@ LDRPATH_LOCAL = @LDRPATH_LOCAL@ -INSTALL = @INSTALL@ $(INSTALL_FLAGS) -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(INSTALL_PROGRAM_FLAGS) -INSTALL_SCRIPT = @INSTALL_SCRIPT@ $(INSTALL_SCRIPT_FLAGS) -INSTALL_DATA = @INSTALL_DATA@ $(INSTALL_DATA_FLAGS) +INSTALL_PROGRAM = STRIPPROG="$(STRIP)" $(top_srcdir)/tools/install-sh $(INSTALL_PROGRAM_FLAGS) +INSTALL_SCRIPT = $(top_srcdir)/tools/install-sh $(INSTALL_SCRIPT_FLAGS) +INSTALL_DATA = $(top_srcdir)/tools/install-sh -m 644 $(INSTALL_DATA_FLAGS) CLEAN_FILES = *.o *.a *.so *.res *.fake *.ok *.tab.[ch] *.yy.c prog_manext = 1 api_manext = 3w diff --git a/configure b/configure index b4dfb47..4603d95 100755 --- a/configure +++ b/configure @@ -719,10 +719,6 @@ RSVG FONTFORGE PKG_CONFIG MSGFMT -INSTALL_DATA -INSTALL_SCRIPT -INSTALL_PROGRAM -INSTALL LDCONFIG MKDIR_P EGREP @@ -5443,16 +5439,6 @@ $as_echo "no" >&6; } fi - -test -z "$INSTALL" && INSTALL="\$(top_srcdir)/tools/install-sh" - -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM="STRIPPROG=\"\$(STRIP)\" \$(INSTALL)" - -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT="\$(INSTALL)" - -test -z "$INSTALL_DATA" && INSTALL_DATA="\$(INSTALL) -m 644" - - for ac_prog in msgfmt do # Extract the first word of "$ac_prog", so it can be a program name with args. diff --git a/configure.ac b/configure.ac index 3c1101c..eb780fa 100644 --- a/configure.ac +++ b/configure.ac @@ -266,13 +266,6 @@ AC_PROG_LN_S AC_PROG_EGREP AC_PROG_MKDIR_P AC_PATH_PROG(LDCONFIG, ldconfig, true, [/sbin /usr/sbin $PATH]) - -dnl Use the correct strip to install programs -test -z "$INSTALL" && AC_SUBST([INSTALL],"\$(top_srcdir)/tools/install-sh") -test -z "$INSTALL_PROGRAM" && AC_SUBST([INSTALL_PROGRAM],"STRIPPROG=\"\$(STRIP)\" \$(INSTALL)") -test -z "$INSTALL_SCRIPT" && AC_SUBST([INSTALL_SCRIPT],"\$(INSTALL)") -test -z "$INSTALL_DATA" && AC_SUBST([INSTALL_DATA],"\$(INSTALL) -m 644") - AC_CHECK_PROGS(MSGFMT, msgfmt, false) WINE_PATH_PKG_CONFIG

1 0

Vincent Povirk : gdiplus: Mark the Graphics object as busy before freeing it.
by Alexandre Julliard 06 Jan '14

06 Jan '14

Module: wine Branch: master Commit: 51b873b3ca03074698ab027f503acd7c1940ad80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51b873b3ca03074698ab027f5… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Jan 3 14:00:10 2014 -0600 gdiplus: Mark the Graphics object as busy before freeing it. --- dlls/gdiplus/graphics.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 122581d..7f892f6 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2409,6 +2409,12 @@ GpStatus WINGDIPAPI GdipDeleteGraphics(GpGraphics *graphics) } GdipDeleteRegion(graphics->clip); + + /* Native returns ObjectBusy on the second free, instead of crashing as we'd + * do otherwise, but we can't have that in the test suite because it means + * accessing freed memory. */ + graphics->busy = TRUE; + GdipFree(graphics); return Ok;

1 0

Bruno Jesus : include: Add some LUP_* definitions to winsock2.h.
by Alexandre Julliard 06 Jan '14

06 Jan '14

Module: wine Branch: master Commit: 000328421a00216de16ea68f660428a878c22f06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=000328421a00216de16ea68f6… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Jan 4 03:25:19 2014 -0200 include: Add some LUP_* definitions to winsock2.h. --- include/winsock2.h | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/include/winsock2.h b/include/winsock2.h index c4e013b..f189f79 100644 --- a/include/winsock2.h +++ b/include/winsock2.h @@ -195,6 +195,18 @@ extern "C" { #define JL_RECEIVER_ONLY 0x02 #define JL_BOTH 0x04 +/* Constants for WSALookupServiceBegin() */ +#define LUP_DEEP 0x0001 +#define LUP_RETURN_NAME 0x0010 +#define LUP_RETURN_TYPE 0x0020 +#define LUP_RETURN_VERSION 0x0040 +#define LUP_RETURN_COMMENT 0x0080 +#define LUP_RETURN_ADDR 0x0100 +#define LUP_RETURN_BLOB 0x0200 +#define LUP_RETURN_ALIASES 0x0400 +#define LUP_RETURN_QUERY_STRING 0x0800 +#define LUP_RETURN_ALL (LUP_RETURN_ADDR|LUP_RETURN_BLOB|LUP_RETURN_ALIASES|LUP_RETURN_QUERY_STRING \ + |LUP_RETURN_NAME|LUP_RETURN_TYPE|LUP_RETURN_VERSION|LUP_RETURN_COMMENT) #ifndef GUID_DEFINED #include <guiddef.h>

1 0

Bruno Jesus : include: Add NLA_BLOB structure and its dependencies in mswsock.h.
by Alexandre Julliard 06 Jan '14

06 Jan '14

Module: wine Branch: master Commit: 4712f361a95d7e0fa66dc2445d73678d039a6646 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4712f361a95d7e0fa66dc2445… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Jan 4 03:25:28 2014 -0200 include: Add NLA_BLOB structure and its dependencies in mswsock.h. --- include/mswsock.h | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 69 insertions(+), 0 deletions(-) diff --git a/include/mswsock.h b/include/mswsock.h index 3e41345..3f0180c 100644 --- a/include/mswsock.h +++ b/include/mswsock.h @@ -164,6 +164,75 @@ typedef struct _WSACMSGHDR { /* followed by UCHAR cmsg_data[] */ } WSACMSGHDR, *PWSACMSGHDR, *LPWSACMSGHDR; +typedef enum _NLA_BLOB_DATA_TYPE { + NLA_RAW_DATA, + NLA_INTERFACE, /* interface name, type and speed */ + NLA_802_1X_LOCATION, /* wireless network info */ + NLA_CONNECTIVITY, /* status on network connectivity */ + NLA_ICS /* internet connection sharing */ +} NLA_BLOB_DATA_TYPE; + +typedef enum _NLA_CONNECTIVITY_TYPE { + NLA_NETWORK_AD_HOC, /* private network */ + NLA_NETWORK_MANAGED, /* network managed by domain */ + NLA_NETWORK_UNMANAGED, + NLA_NETWORK_UNKNOWN +} NLA_CONNECTIVITY_TYPE; + +typedef enum _NLA_INTERNET { + NLA_INTERNET_UNKNOWN, /* can't determine if connected or not */ + NLA_INTERNET_NO, /* not connected to internet */ + NLA_INTERNET_YES /* connected to internet */ +} NLA_INTERNET; + +/* this structure is returned in the lpBlob field during calls to WSALookupServiceNext */ +typedef struct _NLA_BLOB { + /* the header defines the size of the current record and if there is a next record */ + struct { + NLA_BLOB_DATA_TYPE type; + DWORD dwSize; + DWORD nextOffset; /* if it's zero there are no more blobs */ + } header; + + /* the following union interpretation depends on the header.type value + * from the struct above. + * the header.dwSize will be the size of all data, specially useful when + * the last struct field is size [1] */ + union { + /* NLA_RAW_DATA */ + CHAR rawData[1]; + + /* NLA_INTERFACE */ + struct { + DWORD dwType; + DWORD dwSpeed; + CHAR adapterName[1]; + } interfaceData; + + /* NLA_802_1X_LOCATION */ + struct { + CHAR information[1]; + } locationData; + + /* NLA_CONNECTIVITY */ + struct { + NLA_CONNECTIVITY_TYPE type; + NLA_INTERNET internet; + } connectivity; + + /* NLA_ICS */ + struct { + struct { + DWORD speed; + DWORD type; + DWORD state; + WCHAR machineName[256]; + WCHAR sharedAdapterName[256]; + } remote; + } ICS; + } data; +} NLA_BLOB, *PNLA_BLOB; + typedef BOOL (WINAPI * LPFN_ACCEPTEX)(SOCKET, SOCKET, PVOID, DWORD, DWORD, DWORD, LPDWORD, LPOVERLAPPED); typedef BOOL (WINAPI * LPFN_CONNECTEX)(SOCKET, const struct WS(sockaddr) *, int, PVOID, DWORD, LPDWORD, LPOVERLAPPED); typedef BOOL (WINAPI * LPFN_DISCONNECTEX)(SOCKET, LPOVERLAPPED, DWORD, DWORD);

1 0