August 2006 - Wine-commits - list.winehq.org

Andrew Talbot : shlwapi/tests: Write-strings warnings fix.
by Alexandre Julliard 09 Aug '06

09 Aug '06

Module: wine Branch: refs/heads/master Commit: 5f2558f50631ab804fbc2ea29608520464b790bf URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5f2558f50631ab804fbc2ea… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Tue Aug 8 21:01:38 2006 +0100 shlwapi/tests: Write-strings warnings fix. --- dlls/shlwapi/ordinal.c | 2 +- dlls/shlwapi/tests/ordinal.c | 2 +- dlls/shlwapi/tests/shreg.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 669cff0..e198fba 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -2281,7 +2281,7 @@ BOOL WINAPI FDSA_Destroy(FDSA_info *info * * Insert element into an FDSA array */ -DWORD WINAPI FDSA_InsertItem(FDSA_info *info, DWORD where, void *block) +DWORD WINAPI FDSA_InsertItem(FDSA_info *info, DWORD where, const void *block) { TRACE("(%p 0x%08lx %p)\n", info, where, block); if(where > info->num_items) diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 44873bc..c63b378 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -242,7 +242,7 @@ static void test_fdsa(void) BOOL (WINAPI *pFDSA_Initialize)(DWORD block_size, DWORD inc, FDSA_info *info, void *mem, DWORD init_blocks); BOOL (WINAPI *pFDSA_Destroy)(FDSA_info *info); - DWORD (WINAPI *pFDSA_InsertItem)(FDSA_info *info, DWORD where, void *block); + DWORD (WINAPI *pFDSA_InsertItem)(FDSA_info *info, DWORD where, const void *block); BOOL (WINAPI *pFDSA_DeleteItem)(FDSA_info *info, DWORD where); FDSA_info info; diff --git a/dlls/shlwapi/tests/shreg.c b/dlls/shlwapi/tests/shreg.c index 4c4883b..cb0b3f6 100644 --- a/dlls/shlwapi/tests/shreg.c +++ b/dlls/shlwapi/tests/shreg.c @@ -53,7 +53,7 @@ static DWORD nExpLen2; static const char * sEmptyBuffer ="0123456789"; /* delete key and all its subkeys */ -static DWORD delete_key( HKEY hkey, LPSTR parent, LPSTR keyname ) +static DWORD delete_key( HKEY hkey, LPCSTR parent, LPCSTR keyname ) { HKEY parentKey; DWORD ret;

1 0

Jeff Latimer : usp10: ScriptItemize will break up the string into script_items.
by Alexandre Julliard 08 Aug '06

08 Aug '06

Module: wine Branch: refs/heads/master Commit: ff421fde8e88243b8d78e26969a6e4e86c463de9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ff421fde8e88243b8d78e26… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Tue Aug 8 18:57:37 2006 +1000 usp10: ScriptItemize will break up the string into script_items. --- dlls/usp10/tests/usp10.c | 50 +++++++++++++ dlls/usp10/usp10.c | 171 +++++++++++++++++++++++++++++++++------------- 2 files changed, 173 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=ff421fde8e88243b8d7…

1 0

Juan Lang : rsaenh: Test and fix CryptEncrypt with NULL buffer.
by Alexandre Julliard 08 Aug '06

08 Aug '06

Module: wine Branch: refs/heads/master Commit: e64999426273366d3e4ff3d18290c4d5640c875f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e64999426273366d3e4ff3d… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Tue Aug 8 09:47:32 2006 -0700 rsaenh: Test and fix CryptEncrypt with NULL buffer. --- dlls/rsaenh/rsaenh.c | 8 ++++++++ dlls/rsaenh/tests/rsaenh.c | 17 +++++++++++++++++ 2 files changed, 25 insertions(+), 0 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 02e3e6e..eafc92c 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -1940,12 +1940,20 @@ BOOL WINAPI RSAENH_CPEncrypt(HCRYPTPROV memcpy(in, out, pCryptKey->dwBlockLen); } } else if (GET_ALG_TYPE(pCryptKey->aiAlgid) == ALG_TYPE_STREAM) { + if (pbData == NULL) { + *pdwDataLen = dwBufLen; + return TRUE; + } encrypt_stream_impl(pCryptKey->aiAlgid, &pCryptKey->context, pbData, *pdwDataLen); } else if (GET_ALG_TYPE(pCryptKey->aiAlgid) == ALG_TYPE_RSA) { if (pCryptKey->aiAlgid == CALG_RSA_SIGN) { SetLastError(NTE_BAD_KEY); return FALSE; } + if (!pbData) { + *pdwDataLen = pCryptKey->dwBlockLen; + return TRUE; + } if (dwBufLen < pCryptKey->dwBlockLen) { SetLastError(ERROR_MORE_DATA); return FALSE; diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 01cbb0c..90caeb4 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -303,6 +303,11 @@ static void test_block_cipher_modes(void result = CryptSetKeyParam(hKey, KP_MODE, (BYTE*)&dwMode, 0); ok(result, "%08lx\n", GetLastError()); + dwLen = 23; + result = CryptEncrypt(hKey, (HCRYPTHASH)NULL, TRUE, 0, NULL, &dwLen, 24); + ok(result, "CryptEncrypt failed: %08lx\n", GetLastError()); + ok(dwLen == 24, "Unexpected length %ld\n", dwLen); + SetLastError(ERROR_SUCCESS); dwLen = 23; result = CryptEncrypt(hKey, (HCRYPTHASH)NULL, TRUE, 0, abData, &dwLen, 24); @@ -318,6 +323,11 @@ static void test_block_cipher_modes(void ok(result, "%08lx\n", GetLastError()); dwLen = 23; + result = CryptEncrypt(hKey, (HCRYPTHASH)NULL, TRUE, 0, NULL, &dwLen, 24); + ok(result, "CryptEncrypt failed: %08lx\n", GetLastError()); + ok(dwLen == 24, "Unexpected length %ld\n", dwLen); + + dwLen = 23; result = CryptEncrypt(hKey, (HCRYPTHASH)NULL, TRUE, 0, abData, &dwLen, 24); ok(result && dwLen == 24 && !memcmp(cbc, abData, sizeof(cbc)), "%08lx, dwLen: %ld\n", GetLastError(), dwLen); @@ -596,6 +606,9 @@ static void test_rc4(void) ok(result, "%08lx\n", GetLastError()); dwDataLen = 16; + result = CryptEncrypt(hKey, (HCRYPTHASH)NULL, TRUE, 0, NULL, &dwDataLen, 24); + ok(result, "%08lx\n", GetLastError()); + dwDataLen = 16; result = CryptEncrypt(hKey, (HCRYPTHASH)NULL, TRUE, 0, pbData, &dwDataLen, 24); ok(result, "%08lx\n", GetLastError()); @@ -1105,6 +1118,10 @@ static void test_rsa_encrypt(void) if (!result) return; dwLen = 12; + result = CryptEncrypt(hRSAKey, 0, TRUE, 0, NULL, &dwLen, (DWORD)sizeof(abData)); + ok(result, "CryptEncrypt failed: %08lx\n", GetLastError()); + ok(dwLen == 128, "Unexpected length %ld\n", dwLen); + dwLen = 12; result = CryptEncrypt(hRSAKey, 0, TRUE, 0, abData, &dwLen, (DWORD)sizeof(abData)); ok (result, "%08lx\n", GetLastError()); if (!result) return;

1 0

Roderick Colenbrander : wined3d: Volume texture addressing caps.
by Alexandre Julliard 08 Aug '06

08 Aug '06

Module: wine Branch: refs/heads/master Commit: c856432fab7399ad2d243dab868b8f0b68c89cce URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c856432fab7399ad2d243da… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Tue Aug 8 17:50:33 2006 +0200 wined3d: Volume texture addressing caps. --- dlls/wined3d/directx.c | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 9bc7e71..7720723 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1917,7 +1917,21 @@ #endif *pCaps->TextureAddressCaps |= D3DPTADDRESSCAPS_MIRRORONCE; } - *pCaps->VolumeTextureAddressCaps = 0; + if (GL_SUPPORT(EXT_TEXTURE3D)) { + *pCaps->VolumeTextureAddressCaps = D3DPTADDRESSCAPS_INDEPENDENTUV | + D3DPTADDRESSCAPS_CLAMP | + D3DPTADDRESSCAPS_WRAP; + if (GL_SUPPORT(ARB_TEXTURE_BORDER_CLAMP)) { + *pCaps->VolumeTextureAddressCaps |= D3DPTADDRESSCAPS_BORDER; + } + if (GL_SUPPORT(ARB_TEXTURE_MIRRORED_REPEAT)) { + *pCaps->VolumeTextureAddressCaps |= D3DPTADDRESSCAPS_MIRROR; + } + if (GL_SUPPORT(ATI_TEXTURE_MIRROR_ONCE)) { + *pCaps->VolumeTextureAddressCaps |= D3DPTADDRESSCAPS_MIRRORONCE; + } + } else + *pCaps->VolumeTextureAddressCaps = 0; *pCaps->LineCaps = D3DLINECAPS_TEXTURE | D3DLINECAPS_ZTEST;

1 0

Francois Gouget : configure: Fix the linux/ipx.h detection.
by Alexandre Julliard 08 Aug '06

08 Aug '06

Module: wine Branch: refs/heads/master Commit: faf05dfd3bff183b896a891b6be29a6f7c235536 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=faf05dfd3bff183b896a891… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Aug 7 21:52:36 2006 +0200 configure: Fix the linux/ipx.h detection. --- configure | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++- configure.ac | 11 +++++++- 2 files changed, 93 insertions(+), 3 deletions(-) diff --git a/configure b/configure index a3c54e0..0e6e1e0 100755 --- a/configure +++ b/configure @@ -8844,6 +8844,88 @@ done +for ac_header in linux/ipx.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <sys/types.h> + #ifdef HAVE_ASM_TYPES_H + # include <asm/types.h> + #endif + #if HAVE_SYS_SOCKET_H + # include <sys/socket.h> + #endif + +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_Header=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_Header=no" +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + + for ac_header in resolv.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` @@ -9005,8 +9087,7 @@ done - -for ac_header in linux/ipx.h linux/videodev.h +for ac_header in linux/videodev.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` { echo "$as_me:$LINENO: checking for $ac_header" >&5 diff --git a/configure.ac b/configure.ac index daa79fa..de3151b 100644 --- a/configure.ac +++ b/configure.ac @@ -283,6 +283,15 @@ AC_CHECK_HEADERS([net/if.h net/if_arp.h # include <sys/socket.h> #endif]) +AC_CHECK_HEADERS([linux/ipx.h],,, + [#include <sys/types.h> + #ifdef HAVE_ASM_TYPES_H + # include <asm/types.h> + #endif + #if HAVE_SYS_SOCKET_H + # include <sys/socket.h> + #endif]) + AC_CHECK_HEADERS([resolv.h],,, [#include <sys/types.h> #if HAVE_SYS_SOCKET_H @@ -297,7 +306,7 @@ AC_CHECK_HEADERS([resolv.h],,, AC_CHECK_HEADERS(ucontext.h,,,[#include <signal.h>]) -AC_CHECK_HEADERS([linux/ipx.h linux/videodev.h],,, +AC_CHECK_HEADERS([linux/videodev.h],,, [#ifdef HAVE_SYS_TIME_H #include <sys/time.h> #endif

1 0

Roderick Colenbrander : wined3d: Shader declaration cap fixes.
by Alexandre Julliard 08 Aug '06

08 Aug '06

Module: wine Branch: refs/heads/master Commit: eba1f90ef6f4292592b75e4771eda960de19c3ff URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=eba1f90ef6f4292592b75e4… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Tue Aug 8 17:46:03 2006 +0200 wined3d: Shader declaration cap fixes. --- dlls/wined3d/directx.c | 21 ++++++++++++++++++--- 1 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index dca813e..9bc7e71 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2031,7 +2031,7 @@ #endif WINED3DVTXPCAPS_VERTEXFOG | WINED3DVTXPCAPS_TEXGEN; /* FIXME: Add - D3DVTXPCAPS_TWEENING */ + D3DVTXPCAPS_TWEENING, D3DVTXPCAPS_TEXGEN_SPHEREMAP */ *pCaps->MaxPrimitiveCount = 0xFFFFF; /* For now set 2^20-1 which is used by most >=Geforce3/Radeon8500 cards */ *pCaps->MaxVertexIndex = 0xFFFFF; @@ -2095,12 +2095,27 @@ #endif GLint max_buffers = 1; FIXME("Caps support for directx9 is nonexistent at the moment!\n"); *pCaps->DevCaps2 = 0; - /* TODO: D3DDEVCAPS2_CAN_STRETCHRECT_FROM_TEXTURES */ + /* TODO: D3DDEVCAPS2_CAN_STRETCHRECT_FROM_TEXTURES and VS3.0 needs atleast D3DDEVCAPS2_VERTEXELEMENTSCANSHARESTREAMOFFSET */ *pCaps->MaxNpatchTessellationLevel = 0; *pCaps->MasterAdapterOrdinal = 0; *pCaps->AdapterOrdinalInGroup = 0; *pCaps->NumberOfAdaptersInGroup = 1; - *pCaps->DeclTypes = 0; + + if(*pCaps->VertexShaderVersion >= D3DVS_VERSION(2,0)) { + /* OpenGL supports all formats below perhaps not allways without conversion but it supports them. + Further GLSL doesn't seem to have an official unsigned type as I'm not sure how we handle it + don't advertise iet yet. We might need to add some clamping in the shader engine to support it. + TODO: D3DDTCAPS_USHORT2N, D3DDTCAPS_USHORT4N, D3DDTCAPS_UDEC3, D3DDTCAPS_DEC3N */ + *pCaps->DeclTypes = D3DDTCAPS_UBYTE4 | + D3DDTCAPS_UBYTE4N | + D3DDTCAPS_SHORT2N | + D3DDTCAPS_SHORT4N | + D3DDTCAPS_FLOAT16_2 | + D3DDTCAPS_FLOAT16_4; + + } else + *pCaps->DeclTypes = 0; + #if 0 /*FIXME: Simultaneous render targets*/ GL_MAX_DRAW_BUFFERS_ATI 0x00008824 if (GL_SUPPORT(GL_MAX_DRAW_BUFFERS_ATI)) {

1 0

Roderick Colenbrander : wined3d: Shader cap fixes.
by Alexandre Julliard 08 Aug '06

08 Aug '06

Module: wine Branch: refs/heads/master Commit: 194cdfa4b01bb5876829f3ec4b583326531be098 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=194cdfa4b01bb5876829f3e… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Tue Aug 8 10:57:15 2006 +0200 wined3d: Shader cap fixes. --- dlls/wined3d/directx.c | 118 ++++++++++++++++++++++++++++++++++++++++----- include/wine/wined3d_gl.h | 4 ++ 2 files changed, 110 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=194cdfa4b01bb587682…

1 0

Samuel Lidén Borell : mshtml: Add Swedish translation.
by Alexandre Julliard 08 Aug '06

08 Aug '06

Module: wine Branch: refs/heads/master Commit: 1209e6691b384178d96fdca6e6c5156c92b7d964 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1209e6691b384178d96fdca… Author: Samuel Lidén Borell <samuellb(a)bredband.net> Date: Tue Aug 8 15:33:45 2006 +0200 mshtml: Add Swedish translation. --- dlls/mshtml/Sv.rc | 259 +++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/rsrc.rc | 1 2 files changed, 260 insertions(+), 0 deletions(-) create mode 100644 dlls/mshtml/Sv.rc Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=1209e6691b384178d96…

1 0

Matt Finnicum : riched20: Modify ME_CharFromPoint to work properly with password controls.
by Alexandre Julliard 08 Aug '06

08 Aug '06

Module: wine Branch: refs/heads/master Commit: cba3b122ed952f0569ca0e68ae202c09a0721940 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cba3b122ed952f0569ca0e6… Author: Matt Finnicum <mattfinn(a)gmail.com> Date: Tue Aug 8 11:55:08 2006 -0400 riched20: Modify ME_CharFromPoint to work properly with password controls. --- dlls/riched20/run.c | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index d74d68f..f9b1ef6 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -512,8 +512,20 @@ int ME_CharFromPoint(ME_TextEditor *edit } hDC = GetDC(editor->hWnd); hOldFont = ME_SelectStyleFont(editor, hDC, run->style); - GetTextExtentExPointW(hDC, run->strText->szData, run->strText->nLen, - cx, &fit, NULL, &sz); + + if (editor->cPasswordMask) + { + ME_String *strMasked = ME_MakeStringR(editor->cPasswordMask,ME_StrVLen(run->strText)); + GetTextExtentExPointW(hDC, strMasked->szData, run->strText->nLen, + cx, &fit, NULL, &sz); + ME_DestroyString(strMasked); + } + else + { + GetTextExtentExPointW(hDC, run->strText->szData, run->strText->nLen, + cx, &fit, NULL, &sz); + } + ME_UnselectStyleFont(editor, hDC, run->style, hOldFont); ReleaseDC(editor->hWnd, hDC); return fit;

1 0

James Hawkins : msi: Fix the compressed files logic.
by Alexandre Julliard 08 Aug '06

08 Aug '06

Module: wine Branch: refs/heads/master Commit: f84fa0ce6354827d6b2396ca3119c9a8bb7efcfb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f84fa0ce6354827d6b2396c… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Aug 7 11:37:49 2006 -0700 msi: Fix the compressed files logic. If the compressed file attribute is not set, use the Word Count property to determine if files are compressed. --- dlls/msi/action.c | 16 ++++++++++++++++ dlls/msi/action.h | 1 + dlls/msi/files.c | 6 +++--- dlls/msi/msipriv.h | 8 ++++++++ dlls/msi/package.c | 31 +++++++++++++++++++++++++++++++ 5 files changed, 59 insertions(+), 3 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index e2d78b1..a90096e 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1326,8 +1326,24 @@ static UINT load_file(MSIRECORD *row, LP file->state = msifs_invalid; + /* if the compressed bits are not set in the file attributes, + * then read the information from the package word count property + */ if (file->Attributes & msidbFileAttributesCompressed) { + file->IsCompressed = TRUE; + } + else if (file->Attributes & msidbFileAttributesNoncompressed) + { + file->IsCompressed = FALSE; + } + else + { + file->IsCompressed = package->WordCount & MSIWORDCOUNT_COMPRESSED; + } + + if (file->IsCompressed) + { file->Component->ForceLocalState = TRUE; file->Component->Action = INSTALLSTATE_LOCAL; file->Component->ActionRequest = INSTALLSTATE_LOCAL; diff --git a/dlls/msi/action.h b/dlls/msi/action.h index 93d28c6..22ad1be 100644 --- a/dlls/msi/action.h +++ b/dlls/msi/action.h @@ -120,6 +120,7 @@ typedef struct tagMSIFILE msi_file_state state; LPWSTR SourcePath; LPWSTR TargetPath; + BOOL IsCompressed; } MSIFILE; typedef struct tagMSITEMPFILE diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 36caba7..914b699 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -330,7 +330,7 @@ static BOOL extract_cabinet_file(MSIPACK static VOID set_file_source(MSIPACKAGE* package, MSIFILE* file, MSICOMPONENT* comp, LPCWSTR path) { - if (!(file->Attributes & msidbFileAttributesCompressed)) + if (!file->IsCompressed) { LPWSTR p, path; p = resolve_folder(package, comp->Directory, TRUE, FALSE, NULL); @@ -419,7 +419,7 @@ static UINT ready_media_for_file( MSIPAC msi_free(mi->last_path); mi->last_path = NULL; - if (!(file->Attributes & msidbFileAttributesCompressed)) + if (!file->IsCompressed) { mi->last_path = resolve_folder(package, comp->Directory, TRUE, FALSE, NULL); set_file_source(package,file,comp,mi->last_path); @@ -605,7 +605,7 @@ UINT ACTION_InstallFiles(MSIPACKAGE *pac continue; /* compressed files are extracted in ready_media_for_file */ - if (file->Attributes & msidbFileAttributesCompressed) + if (file->IsCompressed) { if (INVALID_FILE_ATTRIBUTES == GetFileAttributesW(file->TargetPath)) ERR("compressed file wasn't extracted (%s)\n", diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 5d2c21e..c565b67 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -39,6 +39,12 @@ #define MSITYPE_STRING 0x0800 #define MSITYPE_NULLABLE 0x1000 #define MSITYPE_KEY 0x2000 +/* Word Count masks */ +#define MSIWORDCOUNT_SHORTFILENAMES 0x0001 +#define MSIWORDCOUNT_COMPRESSED 0x0002 +#define MSIWORDCOUNT_ADMINISTRATIVE 0x0004 +#define MSIWORDCOUNT_PRIVILEGES 0x0008 + #define MSITYPE_IS_BINARY(type) (((type) & ~MSITYPE_NULLABLE) == (MSITYPE_STRING|MSITYPE_VALID)) struct tagMSITABLE; @@ -223,6 +229,8 @@ typedef struct tagMSIPACKAGE UINT CurrentInstallState; msi_dialog *dialog; LPWSTR next_dialog; + + UINT WordCount; struct list subscriptions; } MSIPACKAGE; diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 283b0a6..4065ffb 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -40,6 +40,7 @@ #include "urlmon.h" #include "shlobj.h" #include "wine/unicode.h" #include "objbase.h" +#include "msidefs.h" #include "msipriv.h" #include "action.h" @@ -376,6 +377,34 @@ static VOID set_installer_properties(MSI ReleaseDC(0, dc); } +static UINT msi_get_word_count( MSIPACKAGE *package ) +{ + UINT rc; + INT word_count; + MSIHANDLE suminfo; + MSIHANDLE hdb = alloc_msihandle( &package->db->hdr ); + + rc = MsiGetSummaryInformationW( hdb, NULL, 0, &suminfo ); + MsiCloseHandle(hdb); + if (rc != ERROR_SUCCESS) + { + ERR("Unable to open Summary Information\n"); + return 0; + } + + rc = MsiSummaryInfoGetPropertyW( suminfo, PID_WORDCOUNT, NULL, + &word_count, NULL, NULL, NULL ); + if (rc != ERROR_SUCCESS) + { + ERR("Unable to query word count\n"); + MsiCloseHandle(suminfo); + return 0; + } + + MsiCloseHandle(suminfo); + return word_count; +} + MSIPACKAGE *MSI_CreatePackage( MSIDATABASE *db ) { static const WCHAR szLevel[] = { 'U','I','L','e','v','e','l',0 }; @@ -411,6 +440,8 @@ MSIPACKAGE *MSI_CreatePackage( MSIDATABA list_init( &package->progids ); list_init( &package->RunningActions ); + package->WordCount = msi_get_word_count( package ); + /* OK, here is where we do a slew of things to the database to * prep for all that is to come as a package */

1 0