June 2012 - Wine-commits - list.winehq.org

Francois Gouget : d3dcompiler_43: Make debug_dump_ir_constructor() static.
by Alexandre Julliard 13 Jun '12

13 Jun '12

Module: wine Branch: master Commit: 768c38034cf5faee00ccc8edcff7540737420f7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=768c38034cf5faee00ccc8edc… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jun 13 19:46:54 2012 +0200 d3dcompiler_43: Make debug_dump_ir_constructor() static. --- dlls/d3dcompiler_43/utils.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 9c222cd..350a116 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -1139,7 +1139,7 @@ static void debug_dump_ir_constant(const struct hlsl_ir_constant *constant) TRACE("}"); } -void debug_dump_ir_constructor(const struct hlsl_ir_constructor *constructor) +static void debug_dump_ir_constructor(const struct hlsl_ir_constructor *constructor) { struct hlsl_ir_node *arg;

1 0

Francois Gouget : msvcrt: Fix the name of the Portuguese locale alias.
by Alexandre Julliard 13 Jun '12

13 Jun '12

Module: wine Branch: master Commit: d8ed347ab390ccdd2b413df31fa4d62f9e863744 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8ed347ab390ccdd2b413df31… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jun 13 19:47:54 2012 +0200 msvcrt: Fix the name of the Portuguese locale alias. --- dlls/msvcrt/locale.c | 2 +- dlls/msvcrt/tests/locale.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 97b82ec..b26a9c8 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -85,7 +85,7 @@ static const char * const _country_synonyms[] = "german-swiss", "des", "italian-swiss", "its", "german-austrian", "dea", - "portugese", "ptb", + "portuguese", "ptb", "portuguese-brazil", "ptb", "spanish-mexican", "esm", "norwegian-bokmal", "nor", diff --git a/dlls/msvcrt/tests/locale.c b/dlls/msvcrt/tests/locale.c index 8d6a34f..638a3d2 100644 --- a/dlls/msvcrt/tests/locale.c +++ b/dlls/msvcrt/tests/locale.c @@ -472,7 +472,7 @@ static void test_setlocale(void) if(ret) ok(!strcmp(ret, "Polish_Poland.1250"), "ret = %s\n", ret); - ret = setlocale(LC_ALL, "portugese"); + ret = setlocale(LC_ALL, "portuguese"); ok(ret != NULL || broken (ret == NULL), "ret == NULL\n"); if(ret) ok(!strcmp(ret, "Portuguese_Brazil.1252"), "ret = %s\n", ret);

1 0

André Hentschel : d3drm/tests: Add GetClassName tests.
by Alexandre Julliard 13 Jun '12

13 Jun '12

Module: wine Branch: master Commit: 0a0fe20988b041d1885dadc15f95451b397b618d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a0fe20988b041d1885dadc15… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Jun 9 17:34:03 2012 +0200 d3drm/tests: Add GetClassName tests. --- dlls/d3drm/tests/d3drm.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 5f635e2..7ed4394 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -190,6 +190,7 @@ static void test_MeshBuilder(void) char name[10]; DWORD size; D3DCOLOR color; + CHAR cname[64] = {0}; hr = pDirect3DRMCreate(&pD3DRM); ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); @@ -197,6 +198,14 @@ static void test_MeshBuilder(void) hr = IDirect3DRM_CreateMeshBuilder(pD3DRM, &pMeshBuilder); ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder interface (hr = %x)\n", hr); + size = sizeof(cname); + hr = IDirect3DRMMeshBuilder_GetClassName(pMeshBuilder, &size, cname); + todo_wine { + ok(hr == D3DRM_OK, "Cannot get classname (hr = %x)\n", hr); + ok(size != sizeof(cname), "size didn't change: %u\n", size); + ok(!strcmp(cname, "Builder"), "Expected cname to be \"Builder\", but got \"%s\"\n", cname); + } + info.lpMemory = data_bad_version; info.dSize = strlen(data_bad_version); hr = IDirect3DRMMeshBuilder_Load(pMeshBuilder, &info, NULL, D3DRMLOAD_FROMMEMORY, NULL, NULL); @@ -437,6 +446,8 @@ static void test_MeshBuilder3(void) int val; DWORD val1; D3DVALUE valu, valv; + DWORD size; + CHAR cname[64] = {0}; hr = pDirect3DRMCreate(&pD3DRM); ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); @@ -452,6 +463,14 @@ static void test_MeshBuilder3(void) hr = IDirect3DRM3_CreateMeshBuilder(pD3DRM3, &pMeshBuilder3); ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder3 interface (hr = %x)\n", hr); + size = sizeof(cname); + hr = IDirect3DRMMeshBuilder3_GetClassName(pMeshBuilder3, &size, cname); + todo_wine { + ok(hr == D3DRM_OK, "Cannot get classname (hr = %x)\n", hr); + ok(size != sizeof(cname), "size didn't change: %u\n", size); + ok(!strcmp(cname, "Builder"), "Expected cname to be \"Builder\", but got \"%s\"\n", cname); + } + info.lpMemory = data_bad_version; info.dSize = strlen(data_bad_version); hr = IDirect3DRMMeshBuilder3_Load(pMeshBuilder3, &info, NULL, D3DRMLOAD_FROMMEMORY, NULL, NULL); @@ -541,6 +560,7 @@ static void test_Frame(void) LPDIRECT3DRMLIGHT pLightTmp; LPDIRECT3DRMLIGHTARRAY pLightArray; DWORD count; + CHAR cname[64] = {0}; hr = pDirect3DRMCreate(&pD3DRM); ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); @@ -549,6 +569,14 @@ static void test_Frame(void) ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFrame interface (hr = %x)\n", hr); CHECK_REFCOUNT(pFrameC, 1); + count = sizeof(cname); + hr = IDirect3DRMFrame_GetClassName(pFrameC, &count, cname); + todo_wine { + ok(hr == D3DRM_OK, "Cannot get classname (hr = %x)\n", hr); + ok(count != sizeof(cname), "size didn't change: %u\n", count); + ok(!strcmp(cname, "Frame"), "Expected cname to be \"Frame\", but got \"%s\"\n", cname); + } + hr = IDirect3DRMFrame_GetParent(pFrameC, NULL); ok(hr == D3DRMERR_BADVALUE, "Should fail and return D3DRM_BADVALUE (hr = %x)\n", hr); pFrameTmp = (void*)0xdeadbeef; @@ -837,6 +865,8 @@ static void test_Light(void) LPDIRECT3DRMLIGHT pLight; D3DRMLIGHTTYPE type; D3DCOLOR color; + DWORD size; + CHAR cname[64] = {0}; hr = pDirect3DRMCreate(&pD3DRM); ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); @@ -844,6 +874,14 @@ static void test_Light(void) hr = IDirect3DRM_CreateLightRGB(pD3DRM, D3DRMLIGHT_SPOT, 0.5, 0.5, 0.5, &pLight); ok(hr == D3DRM_OK, "Cannot get IDirect3DRMLight interface (hr = %x)\n", hr); + size = sizeof(cname); + hr = IDirect3DRMLight_GetClassName(pLight, &size, cname); + todo_wine { + ok(hr == D3DRM_OK, "Cannot get classname (hr = %x)\n", hr); + ok(size != sizeof(cname), "size didn't change: %u\n", size); + ok(!strcmp(cname, "Light"), "Expected cname to be \"Light\", but got \"%s\"\n", cname); + } + type = IDirect3DRMLight_GetType(pLight); ok(type == D3DRMLIGHT_SPOT, "wrong type (%u)\n", type);

1 0

Huw Davies : winspool: Update the ppd for LPR printers too.
by Alexandre Julliard 13 Jun '12

13 Jun '12

Module: wine Branch: master Commit: f15f359cbf9c12c56415c295f2466bf1e74b855d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f15f359cbf9c12c56415c295f… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jun 13 15:41:38 2012 +0100 winspool: Update the ppd for LPR printers too. --- dlls/winspool.drv/info.c | 48 ++++++++++++++++++++++++++++----------- dlls/winspool.drv/tests/info.c | 1 - 2 files changed, 34 insertions(+), 15 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index ed470bb..330a7a5 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -888,23 +888,34 @@ static BOOL CUPS_LoadPrinters(void) return TRUE; } -static char *get_cups_name( HANDLE printer ) +#endif + +static char *get_queue_name( HANDLE printer, BOOL *cups ) { - WCHAR *port; + WCHAR *port, *name = NULL; DWORD err, needed, type; char *ret = NULL; HKEY key; + *cups = FALSE; + err = WINSPOOL_GetOpenedPrinterRegKey( printer, &key ); if (err) return NULL; err = RegQueryValueExW( key, PortW, 0, &type, NULL, &needed ); - if (err || needed <= sizeof( CUPS_Port )) goto end; + if (err) goto end; port = HeapAlloc( GetProcessHeap(), 0, needed ); if (!port) goto end; RegQueryValueExW( key, PortW, 0, &type, (BYTE*)port, &needed ); - if (!memcmp( port, CUPS_Port, sizeof(CUPS_Port) - sizeof(WCHAR) )) + + if (!strncmpW( port, CUPS_Port, sizeof(CUPS_Port) / sizeof(WCHAR) -1 )) + { + name = port + sizeof(CUPS_Port) / sizeof(WCHAR) - 1; + *cups = TRUE; + } + else if (!strncmpW( port, LPR_Port, sizeof(LPR_Port) / sizeof(WCHAR) -1 )) + name = port + sizeof(LPR_Port) / sizeof(WCHAR) - 1; + if (name) { - WCHAR *name = port + sizeof(CUPS_Port) / sizeof(WCHAR) - 1; needed = WideCharToMultiByte( CP_UNIXCP, 0, name, -1, NULL, 0, NULL, NULL ); ret = HeapAlloc( GetProcessHeap(), 0, needed ); if(ret) WideCharToMultiByte( CP_UNIXCP, 0, name, -1, ret, needed, NULL, NULL ); @@ -914,23 +925,30 @@ end: RegCloseKey( key ); return ret; } -#endif + static BOOL update_driver( HANDLE printer ) { - BOOL ret = FALSE; -#ifdef SONAME_LIBCUPS + BOOL ret, is_cups; const WCHAR *name = get_opened_printer_name( printer ); WCHAR *ppd_dir, *ppd; - char *cups_name; + char *queue_name; if (!name) return FALSE; - cups_name = get_cups_name( printer ); - if (!cups_name) return FALSE; + queue_name = get_queue_name( printer, &is_cups ); + if (!queue_name) return FALSE; ppd_dir = get_ppd_dir(); ppd = get_ppd_filename( ppd_dir, name ); - if (get_cups_ppd( cups_name, ppd )) + +#ifdef SONAME_LIBCUPS + if (is_cups) + ret = get_cups_ppd( queue_name, ppd ); + else +#endif + ret = get_fallback_ppd( queue_name, ppd ); + + if (ret) { TRACE( "updating driver %s\n", debugstr_w( name ) ); ret = add_printer_driver( name, ppd ); @@ -938,8 +956,7 @@ static BOOL update_driver( HANDLE printer ) } HeapFree( GetProcessHeap(), 0, ppd_dir ); HeapFree( GetProcessHeap(), 0, ppd ); - HeapFree( GetProcessHeap(), 0, cups_name ); -#endif + HeapFree( GetProcessHeap(), 0, queue_name ); return ret; } @@ -1024,10 +1041,13 @@ static BOOL PRINTCAP_ParseEntry( const char *pent, BOOL isfirst ) MultiByteToWideChar(CP_ACP, 0, devname, -1, devnameW, sizeof(devnameW) / sizeof(WCHAR)); if(RegOpenKeyA(hkeyPrinters, devname, &hkeyPrinter) == ERROR_SUCCESS) { + DWORD status = get_dword_from_reg( hkeyPrinter, StatusW ); /* Printer already in registry, delete the tag added in WINSPOOL_LoadSystemPrinters and continue */ TRACE("Printer already exists\n"); RegDeleteValueW(hkeyPrinter, May_Delete_Value); + /* flag that the PPD file should be checked for an update */ + set_reg_DWORD( hkeyPrinter, StatusW, status | PRINTER_STATUS_DRIVER_UPDATE_NEEDED ); RegCloseKey(hkeyPrinter); } else { static CHAR data_type[] = "RAW", diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index b9d2201..3aab0e2 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -2596,7 +2596,6 @@ static void test_GetPrinterDriver(void) hf = CreateFileA(di_2->pDataFile, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if(hf != INVALID_HANDLE_VALUE) CloseHandle(hf); - todo_wine ok(hf != INVALID_HANDLE_VALUE, "Could not open %s\n", di_2->pDataFile); hf = CreateFileA(di_2->pConfigFile, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);

1 0

Huw Davies : winspool: Use the helper to set DWORD registry values.
by Alexandre Julliard 13 Jun '12

13 Jun '12

Module: wine Branch: master Commit: 7d615965fcb20443065604bffeeea63467c3a65c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d615965fcb20443065604bff… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jun 13 15:41:39 2012 +0100 winspool: Use the helper to set DWORD registry values. --- dlls/winspool.drv/info.c | 15 +++++---------- 1 files changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 330a7a5..01081c2 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -3029,8 +3029,7 @@ HANDLE WINAPI AddPrinterW(LPWSTR pName, DWORD Level, LPBYTE pPrinter) } set_devices_and_printerports(pi); - RegSetValueExW(hkeyPrinter, AttributesW, 0, REG_DWORD, - (LPBYTE)&pi->Attributes, sizeof(DWORD)); + set_reg_DWORD(hkeyPrinter, AttributesW, pi->Attributes); set_reg_szW(hkeyPrinter, DatatypeW, pi->pDatatype); /* See if we can load the driver. We may need the devmode structure anyway @@ -3076,16 +3075,12 @@ HANDLE WINAPI AddPrinterW(LPWSTR pName, DWORD Level, LPBYTE pPrinter) set_reg_szW(hkeyPrinter, PortW, pi->pPortName); set_reg_szW(hkeyPrinter, Print_ProcessorW, pi->pPrintProcessor); set_reg_szW(hkeyPrinter, Printer_DriverW, pi->pDriverName); - RegSetValueExW(hkeyPrinter, PriorityW, 0, REG_DWORD, - (LPBYTE)&pi->Priority, sizeof(DWORD)); + set_reg_DWORD(hkeyPrinter, PriorityW, pi->Priority); set_reg_szW(hkeyPrinter, Separator_FileW, pi->pSepFile); set_reg_szW(hkeyPrinter, Share_NameW, pi->pShareName); - RegSetValueExW(hkeyPrinter, StartTimeW, 0, REG_DWORD, - (LPBYTE)&pi->StartTime, sizeof(DWORD)); - RegSetValueExW(hkeyPrinter, StatusW, 0, REG_DWORD, - (LPBYTE)&pi->Status, sizeof(DWORD)); - RegSetValueExW(hkeyPrinter, UntilTimeW, 0, REG_DWORD, - (LPBYTE)&pi->UntilTime, sizeof(DWORD)); + set_reg_DWORD(hkeyPrinter, StartTimeW, pi->StartTime); + set_reg_DWORD(hkeyPrinter, StatusW, pi->Status); + set_reg_DWORD(hkeyPrinter, UntilTimeW, pi->UntilTime); RegCloseKey(hkeyPrinter); RegCloseKey(hkeyPrinters);

1 0

Huw Davies : winspool: Set the timeout entries to zero.
by Alexandre Julliard 13 Jun '12

13 Jun '12

Module: wine Branch: master Commit: b5511bd4fe1fc1a94623a119d3eb57ed8cad0b01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5511bd4fe1fc1a94623a119d… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jun 13 15:41:40 2012 +0100 winspool: Set the timeout entries to zero. --- dlls/winspool.drv/info.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 01081c2..512e11f 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -3068,6 +3068,7 @@ HANDLE WINAPI AddPrinterW(LPWSTR pName, DWORD Level, LPBYTE pPrinter) if (!pi->pDevMode) HeapFree( GetProcessHeap(), 0, dm ); set_reg_szW(hkeyPrinter, DescriptionW, pi->pComment); + set_reg_DWORD(hkeyPrinter, dnsTimeoutW, 0); set_reg_szW(hkeyPrinter, LocationW, pi->pLocation); set_reg_szW(hkeyPrinter, NameW, pi->pPrinterName); set_reg_szW(hkeyPrinter, ParametersW, pi->pParameters); @@ -3080,6 +3081,7 @@ HANDLE WINAPI AddPrinterW(LPWSTR pName, DWORD Level, LPBYTE pPrinter) set_reg_szW(hkeyPrinter, Share_NameW, pi->pShareName); set_reg_DWORD(hkeyPrinter, StartTimeW, pi->StartTime); set_reg_DWORD(hkeyPrinter, StatusW, pi->Status); + set_reg_DWORD(hkeyPrinter, txTimeoutW, 0); set_reg_DWORD(hkeyPrinter, UntilTimeW, pi->UntilTime); RegCloseKey(hkeyPrinter);

1 0

Detlef Riekenberg : ntprint: Do not fail when the spooler service was stopped.
by Alexandre Julliard 13 Jun '12

13 Jun '12

Module: wine Branch: master Commit: 0e997674c57f0effa93c7502eb5b1f4e06e5f6e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e997674c57f0effa93c7502e… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Jun 12 21:56:06 2012 +0200 ntprint: Do not fail when the spooler service was stopped. --- dlls/ntprint/tests/ntprint.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/ntprint/tests/ntprint.c b/dlls/ntprint/tests/ntprint.c index cf9853d..7e1ab58 100644 --- a/dlls/ntprint/tests/ntprint.c +++ b/dlls/ntprint/tests/ntprint.c @@ -70,6 +70,10 @@ static void test_PSetupCreateMonitorInfo(VOID) SetLastError(0xdeadbeef); mi = pPSetupCreateMonitorInfo(NULL, NULL, NULL); + if (!mi && (GetLastError() == RPC_S_SERVER_UNAVAILABLE)) { + win_skip("The Service 'Spooler' is required for many test\n"); + return; + } ok( mi != NULL, "got %p with %u (expected '!= NULL')\n", mi, GetLastError()); if (mi) pPSetupDestroyMonitorInfo(mi); @@ -96,6 +100,10 @@ static void test_PSetupDestroyMonitorInfo(VOID) SetLastError(0xdeadbeef); mi = pPSetupCreateMonitorInfo(NULL, NULL, NULL); + if (!mi && (GetLastError() == RPC_S_SERVER_UNAVAILABLE)) { + win_skip("The Service 'Spooler' is required for many test\n"); + return; + } ok( mi != NULL, "got %p with %u (expected '!= NULL')\n", mi, GetLastError()); if (!mi) return;

1 0

Detlef Riekenberg : kernel32/tests: Do not test GetLastError on success.
by Alexandre Julliard 13 Jun '12

13 Jun '12

Module: wine Branch: master Commit: 697cea2f93226537d32afc521d6769cdd52f1de3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=697cea2f93226537d32afc521… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Jun 12 22:36:45 2012 +0200 kernel32/tests: Do not test GetLastError on success. --- dlls/kernel32/tests/version.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/version.c b/dlls/kernel32/tests/version.c index 265eae4..43f42d5 100644 --- a/dlls/kernel32/tests/version.c +++ b/dlls/kernel32/tests/version.c @@ -153,8 +153,6 @@ static void test_GetVersionEx(void) ok(ret || broken(ret == 0), /* win95 */ "Expected GetVersionExA to succeed\n"); - ok(GetLastError() == 0xdeadbeef, - "Expected 0xdeadbeef, got %d\n", GetLastError()); } static void test_VerifyVersionInfo(void)

1 0

Francois Gouget : iphlpapi: Don' t rely on the HAVE_XXX macros having a numeric values.
by Alexandre Julliard 13 Jun '12

13 Jun '12

Module: wine Branch: master Commit: 0f3085c82e2d1c4a5d90d1f4c5253256ad2f4871 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f3085c82e2d1c4a5d90d1f4c… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jun 13 04:53:28 2012 +0200 iphlpapi: Don't rely on the HAVE_XXX macros having a numeric values. --- dlls/iphlpapi/ipstats.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 009dd99..2f8ec90 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -664,9 +664,9 @@ DWORD WINAPI GetIpStatistics(PMIB_IPSTATS stats) int mib[] = {CTL_NET, PF_INET, IPPROTO_IP, IPCTL_STATS}; #define MIB_LEN (sizeof(mib) / sizeof(mib[0])) int ip_ttl, ip_forwarding; -#if HAVE_STRUCT_IPSTAT_IPS_TOTAL +#if defined(HAVE_STRUCT_IPSTAT_IPS_TOTAL) struct ipstat ip_stat; -#elif HAVE_STRUCT_IP_STATS_IPS_TOTAL +#elif defined(HAVE_STRUCT_IP_STATS_IPS_TOTAL) struct ip_stats ip_stat; #endif size_t needed; @@ -812,7 +812,7 @@ DWORD WINAPI GetTcpStatistics(PMIB_TCPSTATS stats) } if (kc) kstat_close( kc ); } -#elif defined(HAVE_SYS_SYSCTL_H) && defined(TCPCTL_STATS) && (HAVE_STRUCT_TCPSTAT_TCPS_CONNATTEMPT || HAVE_STRUCT_TCP_STATS_TCPS_CONNATTEMPT) +#elif defined(HAVE_SYS_SYSCTL_H) && defined(TCPCTL_STATS) && (defined(HAVE_STRUCT_TCPSTAT_TCPS_CONNATTEMPT) || defined(HAVE_STRUCT_TCP_STATS_TCPS_CONNATTEMPT)) { #ifndef TCPTV_MIN /* got removed in Mac OS X for some reason */ #define TCPTV_MIN 2 @@ -821,9 +821,9 @@ DWORD WINAPI GetTcpStatistics(PMIB_TCPSTATS stats) int mib[] = {CTL_NET, PF_INET, IPPROTO_TCP, TCPCTL_STATS}; #define MIB_LEN (sizeof(mib) / sizeof(mib[0])) #define hz 1000 -#if HAVE_STRUCT_TCPSTAT_TCPS_CONNATTEMPT +#if defined(HAVE_STRUCT_TCPSTAT_TCPS_CONNATTEMPT) struct tcpstat tcp_stat; -#elif HAVE_STRUCT_TCP_STATS_TCPS_CONNATTEMPT +#elif defined(HAVE_STRUCT_TCP_STATS_TCPS_CONNATTEMPT) struct tcp_stats tcp_stat; #endif size_t needed = sizeof(tcp_stat);

1 0

Michael Stefaniuc : wer: Use FIELD_OFFSET to calculate the size of a struct with variable length array .
by Alexandre Julliard 13 Jun '12

13 Jun '12

Module: wine Branch: master Commit: 435ac27d8f51bf296ff10c0fd881eb118283a6b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=435ac27d8f51bf296ff10c0fd… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 13 10:39:52 2012 +0200 wer: Use FIELD_OFFSET to calculate the size of a struct with variable length array. --- dlls/wer/main.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/wer/main.c b/dlls/wer/main.c index ae9ab26..78943eb 100644 --- a/dlls/wer/main.c +++ b/dlls/wer/main.c @@ -261,7 +261,6 @@ HRESULT WINAPI WerReportCloseHandle(HREPORT hreport) HRESULT WINAPI WerReportCreate(PCWSTR eventtype, WER_REPORT_TYPE reporttype, PWER_REPORT_INFORMATION reportinfo, HREPORT *phandle) { report_t *report; - DWORD len; TRACE("(%s, %d, %p, %p)\n", debugstr_w(eventtype), reporttype, reportinfo, phandle); if (reportinfo) { @@ -274,9 +273,7 @@ HRESULT WINAPI WerReportCreate(PCWSTR eventtype, WER_REPORT_TYPE reporttype, PWE return E_INVALIDARG; } - len = lstrlenW(eventtype) + 1; - - report = heap_alloc_zero(len * sizeof(WCHAR) + sizeof(report_t)); + report = heap_alloc_zero(FIELD_OFFSET(report_t, eventtype[lstrlenW(eventtype) + 1])); if (!report) return __HRESULT_FROM_WIN32(ERROR_OUTOFMEMORY);

1 0