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

Nikolay Sivov : msxml3: Remove unneeded xmlInitParser call.
by Alexandre Julliard 09 Jul '12

09 Jul '12

Module: wine Branch: master Commit: 9a28ac8f7b9923829f3ae67ff0309772fe042028 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a28ac8f7b9923829f3ae67ff… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jul 8 22:53:20 2012 +0400 msxml3: Remove unneeded xmlInitParser call. --- dlls/msxml3/domdoc.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 5711daf..cbbebf2 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -488,7 +488,6 @@ static xmlDocPtr doparse(domdoc* This, char const* ptr, int len, xmlCharEncoding xmlSAX2EndElementNs, /* endElementNs */ sax_serror /* serror */ }; - xmlInitParser(); pctx = xmlCreateMemoryParserCtxt(ptr, len); if (!pctx)

1 0

Nikolay Sivov : msxml3: Add VT_I1 type to variant dump helper.
by Alexandre Julliard 09 Jul '12

09 Jul '12

Module: wine Branch: master Commit: ec8ec0fa9bf6259331527fd1c2e72ef0ddc5d80b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec8ec0fa9bf6259331527fd1c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jul 8 22:54:20 2012 +0400 msxml3: Add VT_I1 type to variant dump helper. --- dlls/msxml3/main.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c index 6ecfdbc..3debd06 100644 --- a/dlls/msxml3/main.c +++ b/dlls/msxml3/main.c @@ -267,6 +267,8 @@ const char *debugstr_variant(const VARIANT *v) return "{VT_EMPTY}"; case VT_NULL: return "{VT_NULL}"; + case VT_I1: + return wine_dbg_sprintf("{VT_I1: %d}", V_I1(v)); case VT_I2: return wine_dbg_sprintf("{VT_I2: %d}", V_I2(v)); case VT_I4:

1 0

Hans Leidekker : ntdll: Report 3dnow and sse features if the processor supports them.
by Alexandre Julliard 09 Jul '12

09 Jul '12

Module: wine Branch: master Commit: 700eec9687139fa9793ee038393ea8cc8d0e72fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=700eec9687139fa9793ee0383… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jul 9 11:07:05 2012 +0200 ntdll: Report 3dnow and sse features if the processor supports them. --- dlls/ntdll/nt.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index b90672b..6d6e0b0 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -920,9 +920,9 @@ void fill_cpu_info(void) #else #error Unknown CPU #endif - cached_sci.Revision = 0; - cached_sci.Reserved = 0; - cached_sci.FeatureSet = 0x1fff; /* FIXME: set some sensible defaults out of ProcessFeatures[] */ + cached_sci.Revision = 0; + cached_sci.Reserved = 0; + cached_sci.FeatureSet = 0x1fff; NtCurrentTeb()->Peb->NumberOfProcessors = 1; @@ -1049,13 +1049,22 @@ void fill_cpu_info(void) if (strstr(value, "tsc")) user_shared_data->ProcessorFeatures[PF_RDTSC_INSTRUCTION_AVAILABLE] = TRUE; if (strstr(value, "3dnow")) + { user_shared_data->ProcessorFeatures[PF_3DNOW_INSTRUCTIONS_AVAILABLE] = TRUE; + cached_sci.FeatureSet |= CPU_FEATURE_3DNOW; + } /* This will also catch sse2, but we have sse itself * if we have sse2, so no problem */ if (strstr(value, "sse")) + { user_shared_data->ProcessorFeatures[PF_XMMI_INSTRUCTIONS_AVAILABLE] = TRUE; + cached_sci.FeatureSet |= CPU_FEATURE_SSE; + } if (strstr(value, "sse2")) + { user_shared_data->ProcessorFeatures[PF_XMMI64_INSTRUCTIONS_AVAILABLE] = TRUE; + cached_sci.FeatureSet |= CPU_FEATURE_SSE2; + } if (strstr(value, "pni")) user_shared_data->ProcessorFeatures[PF_SSE3_INSTRUCTIONS_AVAILABLE] = TRUE; if (strstr(value, "pae"))

1 0

Hans Leidekker : setupapi: SetupInstallServicesFromInfSection doesn' t fail if there are no AddService or DelService directives in the section.
by Alexandre Julliard 09 Jul '12

09 Jul '12

Module: wine Branch: master Commit: da922769c5536932185d7bfce604ee1b7885b75d URL: http://source.winehq.org/git/wine.git/?a=commit;h=da922769c5536932185d7bfce… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jul 9 11:07:37 2012 +0200 setupapi: SetupInstallServicesFromInfSection doesn't fail if there are no AddService or DelService directives in the section. --- dlls/setupapi/install.c | 13 ++++++++----- dlls/setupapi/tests/install.c | 14 ++++++++++++++ 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c index 874b4a9..1c8236a 100644 --- a/dlls/setupapi/install.c +++ b/dlls/setupapi/install.c @@ -1447,12 +1447,16 @@ BOOL WINAPI SetupInstallServicesFromInfSectionW( HINF hinf, PCWSTR section, DWOR SC_HANDLE scm; INFCONTEXT context; INT section_flags; - BOOL ok, ret = FALSE; + BOOL ok, ret = TRUE; + if (!(ok = SetupFindFirstLineW( hinf, section, NULL, &context ))) + { + SetLastError( ERROR_SECTION_NOT_FOUND ); + return FALSE; + } if (!(scm = OpenSCManagerW( NULL, NULL, SC_MANAGER_ALL_ACCESS ))) return FALSE; - if (!(ok = SetupFindFirstLineW( hinf, section, AddService, &context ))) - SetLastError( ERROR_SECTION_NOT_FOUND ); + ok = SetupFindFirstLineW( hinf, section, AddService, &context ); while (ok) { if (!SetupGetStringFieldW( &context, 1, service_name, MAX_INF_STRING_LENGTH, NULL )) @@ -1465,8 +1469,7 @@ BOOL WINAPI SetupInstallServicesFromInfSectionW( HINF hinf, PCWSTR section, DWOR ok = SetupFindNextMatchLineW( &context, AddService, &context ); } - if (!(ok = SetupFindFirstLineW( hinf, section, DelService, &context ))) - SetLastError( ERROR_SECTION_NOT_FOUND ); + ok = SetupFindFirstLineW( hinf, section, DelService, &context ); while (ok) { if (!SetupGetStringFieldW( &context, 1, service_name, MAX_INF_STRING_LENGTH, NULL )) diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index 1c204b5..a2fa00b 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -322,6 +322,20 @@ static void test_install_svc_from(void) CloseServiceHandle(svc_handle); CloseServiceHandle(scm_handle); + strcpy(inf, "[Version]\nSignature=\"$Chicago$\"\n"); + strcat(inf, "[XSP.InstallPerVer]\n"); + strcat(inf, "AddReg=AspEventlogMsg.Reg,Perf.Reg,AspVersions.Reg,FreeADO.Reg,IndexServer.Reg\n"); + create_inf_file(inffile, inf); + sprintf(path, "%s\\%s", CURR_DIR, inffile); + infhandle = SetupOpenInfFileA(path, NULL, INF_STYLE_WIN4, NULL); + + SetLastError(0xdeadbeef); + ret = SetupInstallServicesFromInfSectionA(infhandle, "XSP.InstallPerVer", 0); + ok(ret, "Expected success\n"); + ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %08x\n", GetLastError()); + SetupCloseInfFile(infhandle); + DeleteFile(inffile); + /* TODO: Test the Flags */ }

1 0

Hans Leidekker : msi: Don' t crash if no working directory is specified for custom action type 34.
by Alexandre Julliard 09 Jul '12

09 Jul '12

Module: wine Branch: master Commit: f55ee1a21291ab1f0ad3c4cf010fecd4d95b5e92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f55ee1a21291ab1f0ad3c4cf0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jul 9 11:08:06 2012 +0200 msi: Don't crash if no working directory is specified for custom action type 34. --- dlls/msi/custom.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index c1aa627..88dcf87 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -935,13 +935,15 @@ static UINT HANDLE_CustomType50(MSIPACKAGE *package, LPCWSTR source, static UINT HANDLE_CustomType34(MSIPACKAGE *package, LPCWSTR source, LPCWSTR target, const INT type, LPCWSTR action) { - const WCHAR *workingdir; + const WCHAR *workingdir = NULL; HANDLE handle; WCHAR *cmd; - workingdir = msi_get_target_folder( package, source ); - if (!workingdir) return ERROR_FUNCTION_FAILED; - + if (source) + { + workingdir = msi_get_target_folder( package, source ); + if (!workingdir) return ERROR_FUNCTION_FAILED; + } deformat_string( package, target, &cmd ); if (!cmd) return ERROR_FUNCTION_FAILED;

1 0

Hans Leidekker : msi: Don't hard-code the ServicePackLevel property.
by Alexandre Julliard 09 Jul '12

09 Jul '12

Module: wine Branch: master Commit: 32fa9db88863485059d2d1aeb55137e81abf7cdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=32fa9db88863485059d2d1aeb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jul 9 11:08:37 2012 +0200 msi: Don't hard-code the ServicePackLevel property. --- dlls/msi/package.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 4944065..1115942 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -666,12 +666,11 @@ done: static VOID set_installer_properties(MSIPACKAGE *package) { - WCHAR pth[MAX_PATH]; WCHAR *ptr; OSVERSIONINFOEXW OSVersion; MEMORYSTATUSEX msex; DWORD verval, len; - WCHAR verstr[10], bufstr[20]; + WCHAR pth[MAX_PATH], verstr[11], bufstr[22]; HDC dc; HKEY hkey; LPWSTR username, companyname; @@ -701,14 +700,13 @@ static VOID set_installer_properties(MSIPACKAGE *package) static const WCHAR szVersion9x[] = {'V','e','r','s','i','o','n','9','X',0}; static const WCHAR szVersionNT[] = {'V','e','r','s','i','o','n','N','T',0}; static const WCHAR szMsiNTProductType[] = {'M','s','i','N','T','P','r','o','d','u','c','t','T','y','p','e',0}; - static const WCHAR szFormat[] = {'%','l','i',0}; + static const WCHAR szFormat[] = {'%','u',0}; + static const WCHAR szFormat2[] = {'%','u','.','%','u',0}; static const WCHAR szWindowsBuild[] = {'W','i','n','d','o','w','s','B','u','i','l','d',0}; static const WCHAR szServicePackLevel[] = {'S','e','r','v','i','c','e','P','a','c','k','L','e','v','e','l',0}; - static const WCHAR szSix[] = {'6',0 }; static const WCHAR szVersionMsi[] = { 'V','e','r','s','i','o','n','M','s','i',0 }; static const WCHAR szVersionDatabase[] = { 'V','e','r','s','i','o','n','D','a','t','a','b','a','s','e',0 }; static const WCHAR szPhysicalMemory[] = { 'P','h','y','s','i','c','a','l','M','e','m','o','r','y',0 }; - static const WCHAR szFormat2[] = {'%','l','i','.','%','l','i',0}; static const WCHAR szScreenX[] = {'S','c','r','e','e','n','X',0}; static const WCHAR szScreenY[] = {'S','c','r','e','e','n','Y',0}; static const WCHAR szColorBits[] = {'C','o','l','o','r','B','i','t','s',0}; @@ -871,8 +869,8 @@ static VOID set_installer_properties(MSIPACKAGE *package) } sprintfW(verstr, szFormat, OSVersion.dwBuildNumber); msi_set_property(package->db, szWindowsBuild, verstr); - /* just fudge this */ - msi_set_property(package->db, szServicePackLevel, szSix); + sprintfW(verstr, szFormat, OSVersion.wServicePackMajor); + msi_set_property(package->db, szServicePackLevel, verstr); sprintfW( bufstr, szFormat2, MSI_MAJORVERSION, MSI_MINORVERSION); msi_set_property( package->db, szVersionMsi, bufstr );

1 0

Huw Davies : winspool: Don't assume that CUPS is available.
by Alexandre Julliard 09 Jul '12

09 Jul '12

Module: wine Branch: master Commit: c4457ec19142392bd06014489cb6bac7cc98b5a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4457ec19142392bd06014489… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jul 9 13:28:32 2012 +0100 winspool: Don't assume that CUPS is available. --- 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 bb530de..8027a1a 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -801,6 +801,8 @@ static http_status_t cupsGetPPD3_wrapper( http_t *http, const char *name, if (pcupsGetPPD3) return pcupsGetPPD3( http, name, modtime, buffer, bufsize ); + if (!pcupsGetPPD) return HTTP_NOT_FOUND; + TRACE( "No cupsGetPPD3 implementation, so calling cupsGetPPD\n" ); *modtime = 0;

1 0

Marcus Meissner : d3dcompiler_43: Fixed small overread possibility ( Coverity).
by Alexandre Julliard 09 Jul '12

09 Jul '12

Module: wine Branch: master Commit: 1f1686fddd05f83d5a444d3795688b6c4ee8b828 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f1686fddd05f83d5a444d379… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Jul 7 11:51:45 2012 +0200 d3dcompiler_43: Fixed small overread possibility (Coverity). --- dlls/d3dcompiler_43/utils.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 350a116..886d506 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -1058,10 +1058,8 @@ static const char *debug_node_type(enum hlsl_ir_node_type type) "HLSL_IR_FUNCTION_DECL", }; - if (type > sizeof(names) / sizeof(names[0])) - { + if (type >= sizeof(names) / sizeof(names[0])) return "Unexpected node type"; - } return names[type]; }

1 0

Marcus Meissner : krnl386.exe16: Do not truncate the strcmp result ( Coverity).
by Alexandre Julliard 09 Jul '12

09 Jul '12

Module: wine Branch: master Commit: aa58bcfec9fc7a917b04c159b1204289ec9eeb3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa58bcfec9fc7a917b04c159b… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Jul 7 11:52:21 2012 +0200 krnl386.exe16: Do not truncate the strcmp result (Coverity). --- dlls/krnl386.exe16/kernel.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/krnl386.exe16/kernel.c b/dlls/krnl386.exe16/kernel.c index a1f7fff..e879507 100644 --- a/dlls/krnl386.exe16/kernel.c +++ b/dlls/krnl386.exe16/kernel.c @@ -254,7 +254,14 @@ SEGPTR WINAPI KERNEL_AnsiLower16( SEGPTR strOrChar ) */ INT16 WINAPI KERNEL_lstrcmp16( LPCSTR str1, LPCSTR str2 ) { - return (INT16)strcmp( str1, str2 ); + int ret = strcmp( str1, str2 ); + + /* Looks too complicated, but in optimized strcpy we might get + * a 32bit wide difference and would truncate it to 16 bit, so + * erroneously returning equality. */ + if (ret < 0) return -1; + if (ret > 0) return 1; + return 0; } /***********************************************************************

1 0

Marcus Meissner : setupx.dll16: Avoid strcmp() result truncation (Coverity) .
by Alexandre Julliard 09 Jul '12

09 Jul '12

Module: wine Branch: master Commit: a181e4dfe9e7a4c9644194fc8a5748d52ba2a53f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a181e4dfe9e7a4c9644194fc8… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Jul 7 11:52:22 2012 +0200 setupx.dll16: Avoid strcmp() result truncation (Coverity). --- dlls/setupx.dll16/virtcopy.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/setupx.dll16/virtcopy.c b/dlls/setupx.dll16/virtcopy.c index a718ac9..141fbd2 100644 --- a/dlls/setupx.dll16/virtcopy.c +++ b/dlls/setupx.dll16/virtcopy.c @@ -591,9 +591,17 @@ static void VCP_UI_RegisterProgressClass(void) static RETERR16 VCP_UI_NodeCompare(LPVIRTNODE vn1, LPVIRTNODE vn2) { LPCSTR file1, file2; + int ret; file1 = vsmGetStringRawName16(vn1->vfsSrc.vhstrFileName); file2 = vsmGetStringRawName16(vn2->vfsSrc.vhstrFileName); - return (RETERR16)strcmp(file1, file2); + + ret = strcmp(file1, file2); + /* Looks too complicated, but in optimized strcpy we might get + * a 32bit wide difference and would truncate it to 16 bit, so + * erroneously returning equality. */ + if (ret < 0) return -1; + if (ret > 0) return 1; + return 0; } static RETERR16 VCP_UI_CopyStart(void)

1 0