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

Rob Shearman : oleaut32: For automatic-value-getting in ITypeInfo::Invoke, it doesn't matter what flag(s) the function was executed with, just what type of function is being invoked.
by Alexandre Julliard May 30, 2007

May 30, 2007

Module: wine Branch: master Commit: bacf5c640fe0c6bc05323a6d3f25d32c4bfe2589 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bacf5c640fe0c6bc05323a6d3… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed May 30 08:59:44 2007 +0100 oleaut32: For automatic-value-getting in ITypeInfo::Invoke, it doesn't matter what flag(s) the function was executed with, just what type of function is being invoked. --- dlls/oleaut32/typelib.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index b4dd526..c0615de 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5806,7 +5806,7 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( } if (SUCCEEDED(hres) && pVarResult && (func_desc->cParams == 1) && - (wFlags == INVOKE_PROPERTYGET) && + (func_desc->invkind & INVOKE_PROPERTYGET) && (func_desc->lprgelemdescParam[0].u.paramdesc.wParamFlags & PARAMFLAG_FRETVAL) && (pDispParams->cArgs != 0)) {

1 0

Rob Shearman : include: Fix a typo in wincred.h.
by Alexandre Julliard May 30, 2007

May 30, 2007

Module: wine Branch: master Commit: eb239a47cc3fd91b0565142c0e6bee38928a114d URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb239a47cc3fd91b0565142c0… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed May 30 09:00:26 2007 +0100 include: Fix a typo in wincred.h. The Attribute field of the CREDENTIALA/W structs should instead be Attributes. --- include/wincred.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/wincred.h b/include/wincred.h index 983bcb4..d041bb3 100644 --- a/include/wincred.h +++ b/include/wincred.h @@ -65,7 +65,7 @@ typedef struct _CREDENTIALA LPBYTE CredentialBlob; DWORD Persist; DWORD AttributeCount; - PCREDENTIAL_ATTRIBUTEA Attribute; + PCREDENTIAL_ATTRIBUTEA Attributes; LPSTR TargetAlias; LPSTR UserName; } CREDENTIALA, *PCREDENTIALA; @@ -81,7 +81,7 @@ typedef struct _CREDENTIALW LPBYTE CredentialBlob; DWORD Persist; DWORD AttributeCount; - PCREDENTIAL_ATTRIBUTEW Attribute; + PCREDENTIAL_ATTRIBUTEW Attributes; LPWSTR TargetAlias; LPWSTR UserName; } CREDENTIALW, *PCREDENTIALW;

1 0

Alexander Nicolaysen Sørnes : wordpad: Add program icon.
by Alexandre Julliard May 30, 2007

May 30, 2007

Module: wine Branch: master Commit: db7912ed11b15fd93d40944036a370a8816e2b09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db7912ed11b15fd93d4094403… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue May 29 22:19:36 2007 +0200 wordpad: Add program icon. --- .gitignore | 1 + programs/wordpad/Makefile.in | 3 +- programs/wordpad/resource.h | 2 + programs/wordpad/rsrc.rc | 144 ++++++++++++++++++++++++++++++++++++++++++ programs/wordpad/wordpad.c | 2 +- 5 files changed, 150 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index f40de86..88c8475 100644 --- a/.gitignore +++ b/.gitignore @@ -902,6 +902,7 @@ programs/winver/winver programs/wordpad/rsrc.res programs/wordpad/toolbar.bmp programs/wordpad/wordpad +programs/wordpad/wordpad.ico programs/xcopy/rsrc.res programs/xcopy/xcopy server/wineserver diff --git a/programs/wordpad/Makefile.in b/programs/wordpad/Makefile.in index 284da42..166f14d 100644 --- a/programs/wordpad/Makefile.in +++ b/programs/wordpad/Makefile.in @@ -15,7 +15,8 @@ C_SRCS = \ RC_SRCS = rsrc.rc RC_BINSRC = rsrc.rc RC_BINARIES = \ - toolbar.bmp + toolbar.bmp \ + wordpad.ico @MAKE_PROG_RULES@ diff --git a/programs/wordpad/resource.h b/programs/wordpad/resource.h index 5e996d5..e818e40 100644 --- a/programs/wordpad/resource.h +++ b/programs/wordpad/resource.h @@ -60,6 +60,8 @@ #define IDB_TOOLBAR 100 +#define IDI_WORDPAD 101 + #define STRING_ALL_FILES 1400 #define STRING_TEXT_FILES_TXT 1401 #define STRING_RICHTEXT_FILES_RTF 1402 diff --git a/programs/wordpad/rsrc.rc b/programs/wordpad/rsrc.rc index b8e3f54..94d46d9 100644 --- a/programs/wordpad/rsrc.rc +++ b/programs/wordpad/rsrc.rc @@ -94,7 +94,151 @@ IDB_TOOLBAR BITMAP "toolbar.bmp" '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' '00 00 00 00 00 00 00 00 00 00 00 00 00 00' +} */ +/* BINRES wordpad.ico */ +IDI_WORDPAD ICON "wordpad.ico" +/* { + '00 00 01 00 01 00 20 20 00 00 01 00 08 00 a8 08' + '00 00 16 00 00 00 28 00 00 00 20 00 00 00 40 00' + '00 00 01 00 08 00 00 00 00 00 00 00 00 00 00 00' + '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' + '00 00 33 00 00 00 66 00 00 00 99 00 00 00 cc 00' + '00 00 ff 00 00 00 00 33 00 00 33 33 00 00 66 33' + '00 00 99 33 00 00 cc 33 00 00 ff 33 00 00 00 66' + '00 00 33 66 00 00 66 66 00 00 99 66 00 00 cc 66' + '00 00 ff 66 00 00 00 99 00 00 33 99 00 00 66 99' + '00 00 99 99 00 00 cc 99 00 00 ff 99 00 00 00 cc' + '00 00 33 cc 00 00 66 cc 00 00 99 cc 00 00 cc cc' + '00 00 ff cc 00 00 00 ff 00 00 33 ff 00 00 66 ff' + '00 00 99 ff 00 00 cc ff 00 00 ff ff 00 00 00 00' + '33 00 33 00 33 00 66 00 33 00 99 00 33 00 cc 00' + '33 00 ff 00 33 00 00 33 33 00 33 33 33 00 66 33' + '33 00 99 33 33 00 cc 33 33 00 ff 33 33 00 00 66' + '33 00 33 66 33 00 66 66 33 00 99 66 33 00 cc 66' + '33 00 ff 66 33 00 00 99 33 00 33 99 33 00 66 99' + '33 00 99 99 33 00 cc 99 33 00 ff 99 33 00 00 cc' + '33 00 33 cc 33 00 66 cc 33 00 99 cc 33 00 cc cc' + '33 00 ff cc 33 00 00 ff 33 00 33 ff 33 00 66 ff' + '33 00 99 ff 33 00 cc ff 33 00 ff ff 33 00 00 00' + '66 00 33 00 66 00 66 00 66 00 99 00 66 00 cc 00' + '66 00 ff 00 66 00 00 33 66 00 33 33 66 00 66 33' + '66 00 99 33 66 00 cc 33 66 00 ff 33 66 00 00 66' + '66 00 33 66 66 00 66 66 66 00 99 66 66 00 cc 66' + '66 00 ff 66 66 00 00 99 66 00 33 99 66 00 66 99' + '66 00 99 99 66 00 cc 99 66 00 ff 99 66 00 00 cc' + '66 00 33 cc 66 00 66 cc 66 00 99 cc 66 00 cc cc' + '66 00 ff cc 66 00 00 ff 66 00 33 ff 66 00 66 ff' + '66 00 99 ff 66 00 cc ff 66 00 ff ff 66 00 00 00' + '99 00 33 00 99 00 66 00 99 00 99 00 99 00 cc 00' + '99 00 ff 00 99 00 00 33 99 00 33 33 99 00 66 33' + '99 00 99 33 99 00 cc 33 99 00 ff 33 99 00 00 66' + '99 00 33 66 99 00 66 66 99 00 99 66 99 00 cc 66' + '99 00 ff 66 99 00 00 99 99 00 33 99 99 00 66 99' + '99 00 99 99 99 00 cc 99 99 00 ff 99 99 00 00 cc' + '99 00 33 cc 99 00 66 cc 99 00 99 cc 99 00 cc cc' + '99 00 ff cc 99 00 00 ff 99 00 33 ff 99 00 66 ff' + '99 00 99 ff 99 00 cc ff 99 00 ff ff 99 00 00 00' + 'cc 00 33 00 cc 00 66 00 cc 00 99 00 cc 00 cc 00' + 'cc 00 ff 00 cc 00 00 33 cc 00 33 33 cc 00 66 33' + 'cc 00 99 33 cc 00 cc 33 cc 00 ff 33 cc 00 00 66' + 'cc 00 33 66 cc 00 66 66 cc 00 99 66 cc 00 cc 66' + 'cc 00 ff 66 cc 00 00 99 cc 00 33 99 cc 00 66 99' + 'cc 00 99 99 cc 00 cc 99 cc 00 ff 99 cc 00 00 cc' + 'cc 00 33 cc cc 00 66 cc cc 00 99 cc cc 00 cc cc' + 'cc 00 ff cc cc 00 00 ff cc 00 33 ff cc 00 66 ff' + 'cc 00 99 ff cc 00 cc ff cc 00 ff ff cc 00 00 00' + 'ff 00 33 00 ff 00 66 00 ff 00 99 00 ff 00 cc 00' + 'ff 00 ff 00 ff 00 00 33 ff 00 33 33 ff 00 66 33' + 'ff 00 99 33 ff 00 cc 33 ff 00 ff 33 ff 00 00 66' + 'ff 00 33 66 ff 00 66 66 ff 00 99 66 ff 00 cc 66' + 'ff 00 ff 66 ff 00 00 99 ff 00 33 99 ff 00 66 99' + 'ff 00 99 99 ff 00 cc 99 ff 00 ff 99 ff 00 00 cc' + 'ff 00 33 cc ff 00 66 cc ff 00 99 cc ff 00 cc cc' + 'ff 00 ff cc ff 00 00 ff ff 00 33 ff ff 00 66 ff' + 'ff 00 99 ff ff 00 cc ff ff 00 ff ff ff 00 00 00' + '00 00 ff ff ff 00 ff ff ff 00 ff ff ff 00 ff ff' + 'ff 00 ff ff ff 00 ff ff ff 00 ff ff ff 00 ff ff' + 'ff 00 ff ff ff 00 ff ff ff 00 ff ff ff 00 ff ff' + 'ff 00 ff ff ff 00 ff ff ff 00 ff ff ff 00 ff ff' + 'ff 00 ff ff ff 00 ff ff ff 00 ff ff ff 00 ff ff' + 'ff 00 c0 c0 ff 00 ff ff ff 00 ff ff ff 00 ff ff' + 'ff 00 ff ff ff 00 ff ff ff 00 ff ff ff 00 ff ff' + 'ff 00 ff ff ff 00 ff ff ff 00 ff ff ff 00 ff ff' + 'ff 00 ff ff ff 00 ff ff ff 00 ff ff ff 00 ff ff' + 'ff 00 ff ff ff 00 ff ff ff 00 ff ff ff 00 00 00' + '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' + '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' + '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' + '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' + '00 00 00 d7 d7 d7 d7 d7 d7 d7 d7 d7 d7 d7 d7 d7' + 'd7 d7 d7 d7 d7 d7 00 00 00 00 00 00 00 00 00 00' + '00 81 00 d7 d7 d7 d7 d7 d7 d7 d7 d7 d7 d7 d7 d7' + 'd7 d7 d7 d7 d7 d7 00 00 00 00 00 00 00 00 00 00' + '00 81 00 d7 d7 d7 d7 d7 d7 d7 d7 d7 d7 d7 d7 d7' + 'd7 d7 d7 d7 d7 d7 00 00 00 00 00 00 00 00 00 00' + '00 81 00 d7 d7 d7 d7 81 81 2b d7 d7 d7 d7 d7 d7' + 'd7 d7 d7 d7 d7 d7 00 00 00 00 00 00 00 00 00 00' + '00 81 00 d7 d7 d7 d7 81 d0 d0 2b 81 81 81 81 81' + '81 81 d7 d7 d7 d7 00 00 00 00 00 00 00 00 00 00' + '00 81 00 d7 d7 d7 d7 2b d0 2b 5f 2b d7 d7 d7 d7' + 'd7 d7 d7 d7 d7 d7 00 00 00 00 00 00 00 00 00 00' + '00 81 00 d7 d7 d7 d7 d7 2b 5f 5f 5f 2b d7 d7 d7' + 'd7 d7 d7 d7 d7 d7 00 00 00 00 00 00 00 00 00 00' + '00 81 00 d7 d7 81 81 81 81 2b 5f 5f 5f 2b 81 d7' + 'd7 d7 d7 d7 d7 d7 00 00 00 00 00 00 00 00 00 00' + '00 81 00 d7 d7 d7 d7 d7 d7 d7 2b 5f 5f 5f 2b d7' + 'd7 d7 d7 d7 d7 d7 00 00 00 00 00 00 00 00 00 00' + '00 81 00 d7 d7 d7 d7 d7 d7 d7 d7 2b 5f 5f 5f 2b' + 'd7 d7 d7 d7 d7 d7 00 00 00 00 00 00 00 00 00 00' + '00 81 00 d7 81 81 81 81 81 81 81 81 2b 5f 5f 5f' + '2b 81 81 d7 d7 d7 00 00 00 00 00 00 00 00 00 00' + '00 81 00 d7 d7 d7 d7 d7 d7 d7 d7 d7 d7 2b 5f 5f' + '5f 2b d7 d7 d7 d7 00 00 00 00 00 00 00 00 00 00' + '00 81 00 d7 d7 d7 d7 d7 d7 d7 d7 d7 d7 d7 2b 5f' + '5f 5f 2b d7 d7 d7 00 00 00 00 00 00 00 00 00 00' + '00 81 00 d7 81 81 81 81 81 81 81 81 81 81 81 2b' + '5f 5f 5f 2b d7 d7 00 00 00 00 00 00 00 00 00 00' + '00 81 00 d7 d7 d7 d7 d7 d7 d7 d7 d7 d7 d7 d7 d7' + '2b 5f 5f 5f 2b d7 00 00 00 00 00 00 00 00 00 00' + '00 81 00 d7 d7 81 81 81 81 81 81 81 81 81 81 81' + '81 2b 5f 5f 5f 2b 00 00 00 00 00 00 00 00 00 00' + '00 81 00 d7 d7 d7 d7 d7 d7 d7 d7 d7 d7 d7 d7 d7' + 'd7 d7 2b 5f 5f 5f 2b 00 00 00 00 00 00 00 00 00' + '00 81 00 d7 81 81 81 81 81 81 81 81 81 81 81 81' + 'd7 d7 d7 2b 5f 5f 5f 2b 00 00 00 00 00 00 00 00' + '00 81 00 d7 d7 d7 d7 d7 d7 d7 d7 d7 d7 d7 d7 d7' + 'd7 d7 d7 d7 2b 5f 5f 5f 2b 00 00 00 00 00 00 00' + '00 81 00 d7 d7 d7 d7 d7 d7 d7 d7 d7 d7 d7 d7 d7' + 'd7 d7 d7 d7 d7 2b 5f 5f 5f 2b 00 00 00 00 00 00' + '00 81 00 d7 d7 81 81 81 81 81 81 81 81 81 d7 d7' + 'd7 d7 d7 d7 d7 d7 2b 5f 5f 5f 2b 00 00 00 00 00' + '00 81 00 d7 d7 d7 d7 d7 d7 d7 d7 d7 d7 d7 d7 d7' + 'd7 d7 d7 d7 d7 d7 00 2b 5f 5f 5f 2b 00 00 00 00' + '00 81 00 d7 d7 d7 d7 d7 d7 d7 d7 d7 d7 d7 d7 d7' + 'd7 d7 d7 d7 d7 d7 00 00 2b 5f 5f 5f 2b 00 00 00' + '00 81 00 d7 81 81 81 81 81 81 81 81 81 81 81 81' + '81 81 81 d7 d7 d7 00 00 00 2b 5f 2b 2b 00 00 00' + '00 81 00 d7 d7 d7 d7 d7 d7 d7 d7 d7 d7 d7 d7 d7' + 'd7 d7 d7 d7 d7 d7 00 00 00 00 2b 2b 00 00 00 00' + '00 81 00 00 00 00 00 00 00 00 00 00 00 00 00 00' + '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' + '00 00 81 81 81 81 81 81 81 81 81 81 81 81 81 81' + '81 81 81 81 81 00 00 00 00 00 00 00 00 00 00 00' + '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' + '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' + '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' + '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' + '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' + '00 00 00 00 00 00 00 00 00 00 00 00 00 00 ff ff' + 'ff ff f0 00 00 7f e0 00 00 7f c0 00 00 7f c0 00' + '00 7f c0 00 00 7f c0 00 00 7f c0 00 00 7f c0 00' + '00 7f c0 00 00 7f c0 00 00 7f c0 00 00 7f c0 00' + '00 7f c0 00 00 7f c0 00 00 7f c0 00 00 7f c0 00' + '00 7f c0 00 00 7f c0 00 00 7f c0 00 00 3f c0 00' + '00 1f c0 00 00 0f c0 00 00 07 c0 00 00 03 c0 00' + '00 41 c0 00 00 61 c0 00 00 73 c0 00 00 7f c0 00' + '00 ff c0 00 01 ff ff ff ff ff ff ff ff ff' } */ #include "De.rc" diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index c4f52d8..4655b2d 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -725,7 +725,7 @@ int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hOldInstance, LPSTR szCmdPar wc.cbClsExtra = 0; wc.cbWndExtra = 4; wc.hInstance = hInstance; - wc.hIcon = NULL; + wc.hIcon = LoadIconW(hInstance, MAKEINTRESOURCEW(IDI_WORDPAD)); wc.hCursor = LoadCursor(NULL, IDC_IBEAM); wc.hbrBackground = GetSysColorBrush(COLOR_WINDOW); wc.lpszMenuName = xszMainMenu;

1 0

Juan Lang : wincrypt: Fix typo.
by Alexandre Julliard May 30, 2007

May 30, 2007

Module: wine Branch: master Commit: a1e8343e2e240ef3480b1f7cd5f20dcc92832f64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1e8343e2e240ef3480b1f7cd… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Tue May 29 19:56:25 2007 -0700 wincrypt: Fix typo. --- include/wincrypt.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/wincrypt.h b/include/wincrypt.h index c580d84..f4a15da 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -3725,7 +3725,7 @@ HCRYPTMSG WINAPI CryptMsgOpenToEncode(DWORD dwMsgEncodingType, DWORD dwFlags, DWORD dwMsgType, const void *pvMsgEncodeInfo, LPSTR pszInnerContentObjID, PCMSG_STREAM_INFO pStreamInfo); -HCRYPTMSG WINAPI CryptMsgUpdate(HCRYPTMSG hCryptMsg, const BYTE *pbData, +BOOL WINAPI CryptMsgUpdate(HCRYPTMSG hCryptMsg, const BYTE *pbData, DWORD cbData, BOOL fFinal); BOOL WINAPI CryptMsgVerifyCountersignatureEncoded(HCRYPTPROV hCryptProv,

1 0

Dmitry Timoshkov : gdi32: Make SetDCHook 64-bit safe.
by Alexandre Julliard May 30, 2007

May 30, 2007

Module: wine Branch: master Commit: ab2934781ce250dedce428b98a6add105382b799 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab2934781ce250dedce428b98… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed May 30 12:50:35 2007 +0900 gdi32: Make SetDCHook 64-bit safe. --- dlls/gdi32/dc.c | 15 +++++++-------- dlls/gdi32/gdi_private.h | 2 +- dlls/winex11.drv/dce.c | 12 ++++++------ include/wine/wingdi16.h | 4 ++-- 4 files changed, 16 insertions(+), 17 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index bb1080c..30acc03 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -166,9 +166,9 @@ DC *DC_GetDCUpdate( HDC hdc ) dc->flags &= ~DC_DIRTY; if (proc) { - DWORD data = dc->dwHookData; + DWORD_PTR data = dc->dwHookData; GDI_ReleaseObj( hdc ); - proc( HDC_16(hdc), DCHC_INVALIDVISRGN, data, 0 ); + proc( hdc, DCHC_INVALIDVISRGN, data, 0 ); if (!(dc = DC_GetDCPtr( hdc ))) break; /* otherwise restart the loop in case it became dirty again in the meantime */ } @@ -791,9 +791,9 @@ BOOL WINAPI DeleteDC( HDC hdc ) if (dc->hookThunk) { DCHOOKPROC proc = dc->hookThunk; - DWORD data = dc->dwHookData; + DWORD_PTR data = dc->dwHookData; GDI_ReleaseObj( hdc ); - if (!proc( HDC_16(hdc), DCHC_DELETEDC, data, 0 )) return FALSE; + if (!proc( hdc, DCHC_DELETEDC, data, 0 )) return FALSE; if (!(dc = DC_GetDCPtr( hdc ))) return TRUE; /* deleted by the hook */ } @@ -1328,7 +1328,7 @@ BOOL WINAPI CombineTransform( LPXFORM xformResult, const XFORM *xform1, * * Note: this doesn't exist in Win32, we add it here because user32 needs it. */ -BOOL WINAPI SetDCHook( HDC hdc, DCHOOKPROC hookProc, DWORD dwHookData ) +BOOL WINAPI SetDCHook( HDC hdc, DCHOOKPROC hookProc, DWORD_PTR dwHookData ) { DC *dc = GDI_GetObjPtr( hdc, DC_MAGIC ); @@ -1345,19 +1345,18 @@ BOOL WINAPI SetDCHook( HDC hdc, DCHOOKPROC hookProc, DWORD dwHookData ) /* relay function to call the 16-bit DC hook proc */ -static BOOL16 WINAPI call_dc_hook16( HDC16 hdc16, WORD code, DWORD data, LPARAM lParam ) +static BOOL WINAPI call_dc_hook16( HDC hdc, WORD code, DWORD_PTR data, LPARAM lParam ) { WORD args[6]; DWORD ret; FARPROC16 proc = NULL; - HDC hdc = HDC_32( hdc16 ); DC *dc = DC_GetDCPtr( hdc ); if (!dc) return FALSE; proc = dc->hookProc; GDI_ReleaseObj( hdc ); if (!proc) return FALSE; - args[5] = hdc16; + args[5] = HDC_16(hdc); args[4] = code; args[3] = HIWORD(data); args[2] = LOWORD(data); diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index e43ac30..c6810dd 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -271,7 +271,7 @@ typedef struct tagDC PHYSDEV physDev; /* Physical device (driver-specific) */ INT saveLevel; HDC saved_dc; - DWORD dwHookData; + DWORD_PTR dwHookData; FARPROC16 hookProc; /* the original SEGPTR ... */ DCHOOKPROC hookThunk; /* ... and the thunk to call it */ diff --git a/dlls/winex11.drv/dce.c b/dlls/winex11.drv/dce.c index a0454cb..3b80308 100644 --- a/dlls/winex11.drv/dce.c +++ b/dlls/winex11.drv/dce.c @@ -51,7 +51,7 @@ struct dce static struct list dce_list = LIST_INIT(dce_list); -static BOOL16 CALLBACK dc_hook( HDC16 hDC, WORD code, DWORD data, LPARAM lParam ); +static BOOL CALLBACK dc_hook( HDC hDC, WORD code, DWORD_PTR data, LPARAM lParam ); static CRITICAL_SECTION dce_section; static CRITICAL_SECTION_DEBUG critsect_debug = @@ -224,7 +224,7 @@ static struct dce *alloc_cache_dce(void) SaveDC( dce->hdc ); /* store DCE handle in DC hook data field */ - SetDCHook( dce->hdc, dc_hook, (DWORD)dce ); + SetDCHook( dce->hdc, dc_hook, (DWORD_PTR)dce ); dce->hwnd = 0; dce->clip_rgn = 0; @@ -290,7 +290,7 @@ void alloc_window_dce( struct x11drv_win_data *data ) /* store DCE handle in DC hook data field */ - SetDCHook( dce->hdc, dc_hook, (DWORD)dce ); + SetDCHook( dce->hdc, dc_hook, (DWORD_PTR)dce ); dce->hwnd = data->hwnd; dce->clip_rgn = 0; @@ -593,15 +593,15 @@ INT X11DRV_ReleaseDC( HWND hwnd, HDC hdc, BOOL end_paint ) * * See "Undoc. Windows" for hints (DC, SetDCHook, SetHookFlags).. */ -static BOOL16 CALLBACK dc_hook( HDC16 hDC, WORD code, DWORD data, LPARAM lParam ) +static BOOL CALLBACK dc_hook( HDC hDC, WORD code, DWORD_PTR data, LPARAM lParam ) { BOOL retv = TRUE; struct dce *dce = (struct dce *)data; - TRACE("hDC = %04x, %i\n", hDC, code); + TRACE("hDC = %p, %u\n", hDC, code); if (!dce) return 0; - assert( HDC_16(dce->hdc) == hDC ); + assert( dce->hdc == hDC ); switch( code ) { diff --git a/include/wine/wingdi16.h b/include/wine/wingdi16.h index 85b6798..c8b8ee4 100644 --- a/include/wine/wingdi16.h +++ b/include/wine/wingdi16.h @@ -269,7 +269,7 @@ typedef struct FONTSIGNATURE ntmFontSig; } NEWTEXTMETRICEX16,*LPNEWTEXTMETRICEX16; -typedef BOOL16 (CALLBACK *DCHOOKPROC)(HDC16,WORD,DWORD,LPARAM); +typedef BOOL (CALLBACK *DCHOOKPROC)(HDC,WORD,DWORD_PTR,LPARAM); typedef INT16 (CALLBACK *FONTENUMPROC16)(SEGPTR,SEGPTR,UINT16,LPARAM); typedef VOID (CALLBACK *LINEDDAPROC16)(INT16,INT16,LPARAM); typedef INT16 (CALLBACK *GOBJENUMPROC16)(SEGPTR,LPARAM); @@ -577,7 +577,7 @@ COLORREF WINAPI SetBkColor16(HDC16,COLORREF); INT16 WINAPI SetBkMode16(HDC16,INT16); UINT16 WINAPI SetBoundsRect16(HDC16,const RECT16*,UINT16); DWORD WINAPI SetBrushOrg16(HDC16,INT16,INT16); -BOOL WINAPI SetDCHook(HDC,DCHOOKPROC,DWORD); +BOOL WINAPI SetDCHook(HDC,DCHOOKPROC,DWORD_PTR); BOOL16 WINAPI SetDCHook16(HDC16,FARPROC16,DWORD); DWORD WINAPI SetDCOrg16(HDC16,INT16,INT16); VOID WINAPI SetDCState16(HDC16,HDC16);

1 0

James Hawkins : msi: Set the MsiNTProductType property.
by Alexandre Julliard May 30, 2007

May 30, 2007

Module: wine Branch: master Commit: b8e0b3c1c82a494baddaeceb55844082eab21ed9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8e0b3c1c82a494baddaeceb5… Author: James Hawkins <truiken(a)gmail.com> Date: Tue May 29 14:13:59 2007 -0700 msi: Set the MsiNTProductType property. --- dlls/msi/package.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 655cf8f..77dbaff 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -215,7 +215,7 @@ static VOID set_installer_properties(MSIPACKAGE *package) { WCHAR pth[MAX_PATH]; WCHAR *ptr; - OSVERSIONINFOA OSVersion; + OSVERSIONINFOEXW OSVersion; MEMORYSTATUSEX msex; DWORD verval; WCHAR verstr[10], bufstr[20]; @@ -277,6 +277,7 @@ static VOID set_installer_properties(MSIPACKAGE *package) {'1',0}; static const WCHAR v9x[] = { 'V','e','r','s','i','o','n','9','X',0 }; static const WCHAR vNT[] = { '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 szWinBuild[] = {'W','i','n','d','o','w','s','B','u','i','l','d', 0 }; @@ -414,8 +415,8 @@ static VOID set_installer_properties(MSIPACKAGE *package) MSI_SetPropertyW(package, szAllUsers, szOne); /* set the os things */ - OSVersion.dwOSVersionInfoSize = sizeof(OSVERSIONINFOA); - GetVersionExA(&OSVersion); + OSVersion.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEXW); + GetVersionExW((OSVERSIONINFOW *)&OSVersion); verval = OSVersion.dwMinorVersion+OSVersion.dwMajorVersion*100; sprintfW(verstr,szFormat,verval); switch (OSVersion.dwPlatformId) @@ -425,6 +426,8 @@ static VOID set_installer_properties(MSIPACKAGE *package) break; case VER_PLATFORM_WIN32_NT: MSI_SetPropertyW(package,vNT,verstr); + sprintfW(verstr,szFormat,OSVersion.wProductType); + MSI_SetPropertyW(package,szMsiNTProductType,verstr); break; } sprintfW(verstr,szFormat,OSVersion.dwBuildNumber);

1 0

James Hawkins : msi: Perform a forced reboot if a custom action returns ERROR_INSTALL_SUSPEND.
by Alexandre Julliard May 30, 2007

May 30, 2007

Module: wine Branch: master Commit: c2e91588e9bb470e109e3990799df451b47b0cd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2e91588e9bb470e109e39907… Author: James Hawkins <truiken(a)gmail.com> Date: Tue May 29 12:03:05 2007 -0700 msi: Perform a forced reboot if a custom action returns ERROR_INSTALL_SUSPEND. --- dlls/msi/action.c | 2 +- dlls/msi/custom.c | 7 +++++-- dlls/msi/msipriv.h | 1 + 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 689f9c4..41c474f 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -3851,7 +3851,7 @@ static UINT ACTION_InstallFinalize(MSIPACKAGE *package) return rc; } -static UINT ACTION_ForceReboot(MSIPACKAGE *package) +UINT ACTION_ForceReboot(MSIPACKAGE *package) { static const WCHAR RunOnce[] = { 'S','o','f','t','w','a','r','e','\\', diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index c8d889e..eaf5ce9 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -389,7 +389,7 @@ static UINT custom_get_process_return( HANDLE process ) return ERROR_SUCCESS; } -static UINT custom_get_thread_return( HANDLE thread ) +static UINT custom_get_thread_return( MSIPACKAGE *package, HANDLE thread ) { DWORD rc = 0; @@ -404,6 +404,9 @@ static UINT custom_get_thread_return( HANDLE thread ) return rc; case ERROR_NO_MORE_ITEMS: return ERROR_SUCCESS; + case ERROR_INSTALL_SUSPEND: + ACTION_ForceReboot( package ); + return ERROR_SUCCESS; default: ERR("Invalid Return Code %d\n",rc); return ERROR_INSTALL_FAILURE; @@ -475,7 +478,7 @@ static UINT wait_thread_handle( msi_custom_action_info *info ) msi_dialog_check_messages( info->handle ); if (!(info->type & msidbCustomActionTypeContinue)) - rc = custom_get_thread_return( info->handle ); + rc = custom_get_thread_return( info->package, info->handle ); free_custom_action_data( info ); } diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index bcb7512..f8f1d3d 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -580,6 +580,7 @@ extern void append_storage_to_db( MSIDATABASE *db, IStorage *stg ); extern UINT MSI_InstallPackage( MSIPACKAGE *, LPCWSTR, LPCWSTR ); extern void ACTION_free_package_structures( MSIPACKAGE* ); extern UINT ACTION_DialogBox( MSIPACKAGE*, LPCWSTR); +extern UINT ACTION_ForceReboot(MSIPACKAGE *package); extern UINT MSI_Sequence( MSIPACKAGE *package, LPCWSTR szTable, INT iSequenceMode ); extern UINT MSI_SetFeatureStates( MSIPACKAGE *package );

1 0

James Hawkins : msi: Fall back to checking if the cab exists if the volume name doesn't match.
by Alexandre Julliard May 30, 2007

May 30, 2007

Module: wine Branch: master Commit: 44649d2ff869394c1fa3ef89fdc43395b2214fc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44649d2ff869394c1fa3ef89f… Author: James Hawkins <truiken(a)gmail.com> Date: Tue May 29 10:43:50 2007 -0700 msi: Fall back to checking if the cab exists if the volume name doesn't match. --- dlls/msi/files.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index f807069..42f954c 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -615,6 +615,9 @@ static UINT ready_media(MSIPACKAGE *package, MSIFILE *file, struct media_info *m if (type == DRIVE_CDROM || type == DRIVE_REMOVABLE) found = source_matches_volume(mi, source_dir); + if (!found) + found = GetFileAttributesW(mi->cabinet) != INVALID_FILE_ATTRIBUTES; + msi_free(source_dir); }

1 0

Rob Shearman : server: When starting a new process, use the token from the calling process, if one exists.
by Alexandre Julliard May 30, 2007

May 30, 2007

Module: wine Branch: master Commit: ec8624352152ff19c7976f3115ae4032d303816e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec8624352152ff19c7976f311… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon May 28 18:41:51 2007 +0100 server: When starting a new process, use the token from the calling process, if one exists. --- server/process.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/server/process.c b/server/process.c index 092718f..d733031 100644 --- a/server/process.c +++ b/server/process.c @@ -282,7 +282,7 @@ struct thread *create_process( int fd, struct thread *parent_thread, int inherit process->ldt_copy = NULL; process->winstation = 0; process->desktop = 0; - process->token = token_create_admin(); + process->token = NULL; process->trace_data = 0; list_init( &process->thread_list ); list_init( &process->locks ); @@ -301,15 +301,22 @@ struct thread *create_process( int fd, struct thread *parent_thread, int inherit if (!(process->msg_fd = create_anonymous_fd( &process_fd_ops, fd, &process->obj, 0 ))) goto error; /* create the handle table */ - if (!parent_thread) process->handles = alloc_handle_table( process, 0 ); + if (!parent_thread) + { + process->handles = alloc_handle_table( process, 0 ); + process->token = token_create_admin(); + } else { struct process *parent = parent_thread->process; process->parent = (struct process *)grab_object( parent ); process->handles = inherit_all ? copy_handle_table( process, parent ) : alloc_handle_table( process, 0 ); + /* Note: for security reasons, starting a new process does not attempt + * to use the current impersonation token for the new process */ + process->token = token_duplicate( parent->token, TRUE, 0 ); } - if (!process->handles) goto error; + if (!process->handles || !process->token) goto error; /* create the main thread */ if (pipe( request_pipe ) == -1)

1 0

James Hawkins : msi: Create the destination directory if it doesn' t exist when duplicating files.
by Alexandre Julliard May 30, 2007

May 30, 2007

Module: wine Branch: master Commit: 1aa0082558050daed4852ad29cc0a12c531a35e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1aa0082558050daed4852ad29… Author: James Hawkins <truiken(a)gmail.com> Date: Tue May 29 10:09:44 2007 -0700 msi: Create the destination directory if it doesn't exist when duplicating files. --- dlls/msi/files.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 9717537..f807069 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -899,6 +899,8 @@ static UINT ITERATE_DuplicateFiles(MSIRECORD *row, LPVOID param) TRACE("Duplicating file %s to %s\n",debugstr_w(file->TargetPath), debugstr_w(dest)); + CreateDirectoryW(dest_path, NULL); + if (strcmpW(file->TargetPath,dest)) rc = !CopyFileW(file->TargetPath,dest,TRUE); else

1 0