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

Jason Edmeades : comctl32: Fix tooltips uninitialized variables plus wrong positioning.
by Alexandre Julliard 15 Aug '07

15 Aug '07

Module: wine Branch: master Commit: 2e72e102a6eb8d3a60fb715c23847251138bcc33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e72e102a6eb8d3a60fb715c2… Author: Jason Edmeades <jason.edmeades(a)googlemail.com> Date: Tue Aug 14 21:48:27 2007 +0100 comctl32: Fix tooltips uninitialized variables plus wrong positioning. --- dlls/comctl32/tooltips.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index 3b41dda..39401eb 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -569,15 +569,18 @@ TOOLTIPS_Show (HWND hwnd, TOOLTIPS_INFO *infoPtr) if (style & TTS_BALLOON) { ptfx = rc.left + ((rc.right - rc.left) / 2); - if(rect.top - size.cy >= 0) + + /* CENTERTIP ballon tooltips default to below the field + if they fit on the screen */ + if(rc.bottom + size.cy > GetSystemMetrics(SM_CYSCREEN)) { - rect.top -= size.cy; + rect.top = rc.top - size.cy; infoPtr->bToolBelow = FALSE; } else { infoPtr->bToolBelow = TRUE; - rect.top += 20; + rect.top = rc.bottom; } rect.left = max(0, rect.left - BALLOON_STEMINDENT); }

1 0

Juan Lang : wintrust: Implement WTHelperGetProvSignerFromChain.
by Alexandre Julliard 15 Aug '07

15 Aug '07

Module: wine Branch: master Commit: 0823c4fc61156540b2c246e334deaccbbe46f23f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0823c4fc61156540b2c246e33… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Aug 14 10:14:54 2007 -0700 wintrust: Implement WTHelperGetProvSignerFromChain. --- dlls/wintrust/wintrust_main.c | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/wintrust/wintrust_main.c b/dlls/wintrust/wintrust_main.c index 66ad322..8e7859d 100644 --- a/dlls/wintrust/wintrust_main.c +++ b/dlls/wintrust/wintrust_main.c @@ -105,9 +105,23 @@ CRYPT_PROVIDER_SGNR * WINAPI WTHelperGetProvSignerFromChain( CRYPT_PROVIDER_DATA *pProvData, DWORD idxSigner, BOOL fCounterSigner, DWORD idxCounterSigner) { - FIXME("%p %d %d %d\n", pProvData, idxSigner, fCounterSigner, + CRYPT_PROVIDER_SGNR *sgnr; + + TRACE("(%p %d %d %d)\n", pProvData, idxSigner, fCounterSigner, idxCounterSigner); - return NULL; + + if (idxSigner >= pProvData->csSigners || !pProvData->pasSigners) + return NULL; + sgnr = &pProvData->pasSigners[idxSigner]; + if (fCounterSigner) + { + if (idxCounterSigner >= sgnr->csCounterSigners || + !sgnr->pasCounterSigners) + return NULL; + sgnr = &sgnr->pasCounterSigners[idxCounterSigner]; + } + TRACE("returning %p\n", sgnr); + return sgnr; } /***********************************************************************

1 0

Juan Lang : wintrust: Implement WTHelperGetProvCertFromChain.
by Alexandre Julliard 15 Aug '07

15 Aug '07

Module: wine Branch: master Commit: f1ec80d13ba7545ae3278248f776e45ccf2d1ccf URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1ec80d13ba7545ae3278248f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Aug 14 10:16:10 2007 -0700 wintrust: Implement WTHelperGetProvCertFromChain. --- dlls/wintrust/wintrust.spec | 2 +- dlls/wintrust/wintrust_main.c | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/wintrust/wintrust.spec b/dlls/wintrust/wintrust.spec index 9242120..b822cbe 100644 --- a/dlls/wintrust/wintrust.spec +++ b/dlls/wintrust/wintrust.spec @@ -80,7 +80,7 @@ @ stub WTHelperGetFileHandle @ stub WTHelperGetFileName @ stub WTHelperGetKnownUsages -@ stub WTHelperGetProvCertFromChain +@ stdcall WTHelperGetProvCertFromChain(ptr long) @ stub WTHelperGetProvPrivateDataFromChain @ stdcall WTHelperGetProvSignerFromChain(ptr long long long) @ stub WTHelperIsInRootStore diff --git a/dlls/wintrust/wintrust_main.c b/dlls/wintrust/wintrust_main.c index 8e7859d..f93cb07 100644 --- a/dlls/wintrust/wintrust_main.c +++ b/dlls/wintrust/wintrust_main.c @@ -125,6 +125,23 @@ CRYPT_PROVIDER_SGNR * WINAPI WTHelperGetProvSignerFromChain( } /*********************************************************************** + * WTHelperGetProvCertFromChain (WINTRUST.@) + */ +CRYPT_PROVIDER_CERT * WINAPI WTHelperGetProvCertFromChain( + CRYPT_PROVIDER_SGNR *pSgnr, DWORD idxCert) +{ + CRYPT_PROVIDER_CERT *cert; + + TRACE("(%p %d)\n", pSgnr, idxCert); + + if (idxCert >= pSgnr->csCertChain || !pSgnr->pasCertChain) + return NULL; + cert = &pSgnr->pasCertChain[idxCert]; + TRACE("returning %p\n", cert); + return cert; +} + +/*********************************************************************** * WTHelperProvDataFromStateData (WINTRUST.@) */ CRYPT_PROVIDER_DATA * WINAPI WTHelperProvDataFromStateData(HANDLE hStateData)

1 0

Jacek Caban : mshtml: Make window.external visible for JavaScript code.
by Alexandre Julliard 15 Aug '07

15 Aug '07

Module: wine Branch: master Commit: 80a1a2f135f493d0d5b5e94b461d2751ef8ff9d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80a1a2f135f493d0d5b5e94b4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 14 22:36:56 2007 +0200 mshtml: Make window.external visible for JavaScript code. --- dlls/mshtml/htmlwindow.c | 102 +++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 3 + dlls/mshtml/nsembed.c | 40 ++++++++++ dlls/mshtml/nsiface.idl | 170 +++++++++++++++++++++++++++++++++++++++++- 4 files changed, 314 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=80a1a2f135f493d0d5b5e…

1 0

Jacek Caban : mshtml: Return wine: URI for protocols handled by MSHTML.
by Alexandre Julliard 15 Aug '07

15 Aug '07

Module: wine Branch: master Commit: 718b771f2a57d0c762d24c6ef62f070eb3647e8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=718b771f2a57d0c762d24c6ef… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 14 22:36:10 2007 +0200 mshtml: Return wine: URI for protocols handled by MSHTML. --- dlls/mshtml/nsio.c | 24 ++++++++++++++++++------ 1 files changed, 18 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 13abe9b..61a6386 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1186,8 +1186,8 @@ static nsresult NSAPI nsURI_GetSpec(nsIWineURI *iface, nsACString *aSpec) TRACE("(%p)->(%p)\n", This, aSpec); if(This->use_wine_url) { - char speca[INTERNET_MAX_URL_LENGTH]; - WideCharToMultiByte(CP_ACP, 0, This->wine_url, -1, speca, sizeof(speca), NULL, NULL); + char speca[INTERNET_MAX_URL_LENGTH] = "wine:"; + WideCharToMultiByte(CP_ACP, 0, This->wine_url, -1, speca+5, sizeof(speca)-5, NULL, NULL); nsACString_SetData(aSpec, speca); return NS_OK; @@ -1956,10 +1956,12 @@ static nsresult NSAPI nsIOService_NewURI(nsIIOService *iface, const nsACString * const char *aOriginCharset, nsIURI *aBaseURI, nsIURI **_retval) { const char *spec = NULL; + nsACString spec_str; NSContainer *nscontainer = NULL; nsIURI *uri = NULL; LPCWSTR base_wine_url = NULL; nsIWineURI *base_wine_uri = NULL, *wine_uri; + BOOL is_wine_uri = FALSE; nsresult nsres; nsACString_GetData(aSpec, &spec, NULL); @@ -1970,6 +1972,11 @@ static nsresult NSAPI nsIOService_NewURI(nsIIOService *iface, const nsACString * if(is_gecko_special_uri(spec)) return nsIIOService_NewURI(nsio, aSpec, aOriginCharset, aBaseURI, _retval); + if(!strncmp(spec, "wine:", 5)) { + spec += 5; + is_wine_uri = TRUE; + } + if(aBaseURI) { nsACString base_uri_str; const char *base_uri = NULL; @@ -1987,7 +1994,9 @@ static nsresult NSAPI nsIOService_NewURI(nsIIOService *iface, const nsACString * nsACString_Finish(&base_uri_str); } + nsACString_Init(&spec_str, spec); nsres = nsIIOService_NewURI(nsio, aSpec, aOriginCharset, aBaseURI, &uri); + nsACString_Finish(&spec_str); if(NS_FAILED(nsres)) TRACE("NewURI failed: %08x\n", nsres); @@ -2009,12 +2018,10 @@ static nsresult NSAPI nsIOService_NewURI(nsIIOService *iface, const nsACString * if(base_wine_url) { WCHAR url[INTERNET_MAX_URL_LENGTH], rel_url[INTERNET_MAX_URL_LENGTH]; - LPCSTR speca; DWORD len; HRESULT hres; - nsACString_GetData(aSpec, &speca, NULL); - MultiByteToWideChar(CP_ACP, 0, speca, -1, rel_url, sizeof(rel_url)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, spec, -1, rel_url, sizeof(rel_url)/sizeof(WCHAR)); hres = CoInternetCombineUrl(base_wine_url, rel_url, URL_ESCAPE_SPACES_ONLY|URL_DONT_ESCAPE_EXTRA_INFO, @@ -2022,7 +2029,12 @@ static nsresult NSAPI nsIOService_NewURI(nsIIOService *iface, const nsACString * if(SUCCEEDED(hres)) nsIWineURI_SetWineURL(wine_uri, url); else - WARN("CoCombineUrl failed: %08x\n", hres); + WARN("CoCombineUrl failed: %08x\n", hres); + }else if(is_wine_uri) { + WCHAR url[INTERNET_MAX_URL_LENGTH]; + + MultiByteToWideChar(CP_ACP, 0, spec, -1, url, sizeof(url)/sizeof(WCHAR)); + nsIWineURI_SetWineURL(wine_uri, url); } if(base_wine_uri)

1 0

Andrew Talbot : riched20: Constify some variables.
by Alexandre Julliard 15 Aug '07

15 Aug '07

Module: wine Branch: master Commit: da68f3943fb8950374baad88849753380fc63b96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da68f3943fb8950374baad888… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Aug 14 21:30:13 2007 +0100 riched20: Constify some variables. --- dlls/riched20/reader.c | 30 +++++++++++++++--------------- dlls/riched20/rtf.h | 26 +++++++++++++------------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/dlls/riched20/reader.c b/dlls/riched20/reader.c index 0cf8ca7..e0a9e1a 100644 --- a/dlls/riched20/reader.c +++ b/dlls/riched20/reader.c @@ -92,7 +92,7 @@ static void RTFPutCodePageChar(RTF_Info *info, int c); /* * Saves a string on the heap and returns a pointer to it. */ -static inline char *RTFStrSave(char *s) +static inline char *RTFStrSave(const char *s) { char *p; @@ -254,7 +254,7 @@ void RTFInit(RTF_Info *info) * to be accurate, only insofar as the calling program makes them so. */ -void RTFSetInputName(RTF_Info *info, char *name) +void RTFSetInputName(RTF_Info *info, const char *name) { info->inputName = RTFStrSave (name); if (info->inputName == NULL) @@ -262,13 +262,13 @@ void RTFSetInputName(RTF_Info *info, char *name) } -char *RTFGetInputName(RTF_Info *info) +char *RTFGetInputName(const RTF_Info *info) { return (info->inputName); } -void RTFSetOutputName(RTF_Info *info, char *name) +void RTFSetOutputName(RTF_Info *info, const char *name) { info->outputName = RTFStrSave (name); if (info->outputName == NULL) @@ -276,7 +276,7 @@ void RTFSetOutputName(RTF_Info *info, char *name) } -char *RTFGetOutputName(RTF_Info *info) +char *RTFGetOutputName(const RTF_Info *info) { return (info->outputName); } @@ -301,7 +301,7 @@ void RTFSetClassCallback(RTF_Info *info, int class, RTFFuncPtr callback) } -RTFFuncPtr RTFGetClassCallback(RTF_Info *info, int class) +RTFFuncPtr RTFGetClassCallback(const RTF_Info *info, int class) { if (class >= 0 && class < rtfMaxClass) return info->ccb[class]; @@ -320,7 +320,7 @@ void RTFSetDestinationCallback(RTF_Info *info, int dest, RTFFuncPtr callback) } -RTFFuncPtr RTFGetDestinationCallback(RTF_Info *info, int dest) +RTFFuncPtr RTFGetDestinationCallback(const RTF_Info *info, int dest) { if (dest >= 0 && dest < rtfMaxDestination) return info->dcb[dest]; @@ -447,7 +447,7 @@ void RTFSetReadHook(RTF_Info *info, RTFFuncPtr f) } -RTFFuncPtr RTFGetReadHook(RTF_Info *info) +RTFFuncPtr RTFGetReadHook(const RTF_Info *info) { return (info->readHook); } @@ -1258,7 +1258,7 @@ static void ReadObjGroup(RTF_Info *info) */ -RTFStyle *RTFGetStyle(RTF_Info *info, int num) +RTFStyle *RTFGetStyle(const RTF_Info *info, int num) { RTFStyle *s; @@ -1273,7 +1273,7 @@ RTFStyle *RTFGetStyle(RTF_Info *info, int num) } -RTFFont *RTFGetFont(RTF_Info *info, int num) +RTFFont *RTFGetFont(const RTF_Info *info, int num) { RTFFont *f; @@ -1288,7 +1288,7 @@ RTFFont *RTFGetFont(RTF_Info *info, int num) } -RTFColor *RTFGetColor(RTF_Info *info, int num) +RTFColor *RTFGetColor(const RTF_Info *info, int num) { RTFColor *c; @@ -2373,19 +2373,19 @@ static int Hash(const char *s) * Token comparison routines */ -int RTFCheckCM(RTF_Info *info, int class, int major) +int RTFCheckCM(const RTF_Info *info, int class, int major) { return (info->rtfClass == class && info->rtfMajor == major); } -int RTFCheckCMM(RTF_Info *info, int class, int major, int minor) +int RTFCheckCMM(const RTF_Info *info, int class, int major, int minor) { return (info->rtfClass == class && info->rtfMajor == major && info->rtfMinor == minor); } -int RTFCheckMM(RTF_Info *info, int major, int minor) +int RTFCheckMM(const RTF_Info *info, int major, int minor) { return (info->rtfMajor == major && info->rtfMinor == minor); } @@ -2661,7 +2661,7 @@ RTFFlushUnicodeOutputBuffer(RTF_Info *info) } static void -RTFPutUnicodeString(RTF_Info *info, WCHAR *string, int length) +RTFPutUnicodeString(RTF_Info *info, const WCHAR *string, int length) { if (info->dwCPOutputCount) RTFFlushCPOutputBuffer(info); diff --git a/dlls/riched20/rtf.h b/dlls/riched20/rtf.h index be36a93..30d40f0 100644 --- a/dlls/riched20/rtf.h +++ b/dlls/riched20/rtf.h @@ -1112,30 +1112,30 @@ struct _RTF_Info { void RTFInit (RTF_Info *); void RTFDestroy(RTF_Info *info); -void RTFSetInputName (RTF_Info *, char *); -char *RTFGetInputName (RTF_Info *); -void RTFSetOutputName (RTF_Info *, char *); -char *RTFGetOutputName (RTF_Info *); +void RTFSetInputName (RTF_Info *, const char *); +char *RTFGetInputName (const RTF_Info *); +void RTFSetOutputName (RTF_Info *, const char *); +char *RTFGetOutputName (const RTF_Info *); void RTFSetClassCallback (RTF_Info *, int, RTFFuncPtr); -RTFFuncPtr RTFGetClassCallback (RTF_Info *, int); +RTFFuncPtr RTFGetClassCallback (const RTF_Info *, int); void RTFSetDestinationCallback (RTF_Info *, int, RTFFuncPtr); -RTFFuncPtr RTFGetDestinationCallback (RTF_Info *, int); +RTFFuncPtr RTFGetDestinationCallback (const RTF_Info *, int); void RTFRead (RTF_Info *); int RTFGetToken (RTF_Info *); /* writer should rarely need this */ void RTFUngetToken (RTF_Info *); int RTFPeekToken (RTF_Info *); void RTFSetToken (RTF_Info *, int, int, int, int, const char *); void RTFSetReadHook (RTF_Info *, RTFFuncPtr); -RTFFuncPtr RTFGetReadHook (RTF_Info *); +RTFFuncPtr RTFGetReadHook (const RTF_Info *); void RTFRouteToken (RTF_Info *); void RTFSkipGroup (RTF_Info *); void RTFExpandStyle (RTF_Info *, int); -int RTFCheckCM (RTF_Info *, int, int); -int RTFCheckCMM (RTF_Info *, int, int, int); -int RTFCheckMM (RTF_Info *, int, int); -RTFFont *RTFGetFont (RTF_Info *, int); -RTFColor *RTFGetColor (RTF_Info *, int); -RTFStyle *RTFGetStyle (RTF_Info *, int); +int RTFCheckCM (const RTF_Info *, int, int); +int RTFCheckCMM (const RTF_Info *, int, int, int); +int RTFCheckMM (const RTF_Info *, int, int); +RTFFont *RTFGetFont (const RTF_Info *, int); +RTFColor *RTFGetColor (const RTF_Info *, int); +RTFStyle *RTFGetStyle (const RTF_Info *, int); int RTFCharToHex ( char); int RTFHexToChar ( int );

1 0

Stefan Dösinger : wined3d: Reorganize stateblock:: capture a bit.
by Alexandre Julliard 15 Aug '07

15 Aug '07

Module: wine Branch: master Commit: 76195d9a49db2635f455c706b05633ae29133477 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76195d9a49db2635f455c706b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Aug 4 14:44:33 2007 +0200 wined3d: Reorganize stateblock::capture a bit. --- dlls/wined3d/stateblock.c | 195 ++++++++++++++++++++++++++++---------------- 1 files changed, 124 insertions(+), 71 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=76195d9a49db2635f455c…

1 0

Aric Stewart : shell32: In SHNameTranslate use the right part of the string for sizing.
by Alexandre Julliard 15 Aug '07

15 Aug '07

Module: wine Branch: master Commit: fdd42046fb58516e54dffdc23b6c6ff70d673265 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdd42046fb58516e54dffdc23… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Aug 14 14:23:15 2007 -0500 shell32: In SHNameTranslate use the right part of the string for sizing. --- dlls/shell32/shlfileop.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index c820569..87bf677 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -830,7 +830,7 @@ static DWORD SHNameTranslate(LPWSTR* wString, LPCWSTR* pWToFrom, BOOL more) aString += size; } while ((size != 1) && more); /* The two sizes might be different in the case of multibyte chars */ - size = MultiByteToWideChar(CP_ACP, 0, aString, aSize, *wString, 0); + size = MultiByteToWideChar(CP_ACP, 0, (LPCSTR)*pWToFrom, aSize, *wString, 0); if (*wString) /* only in the second loop */ { MultiByteToWideChar(CP_ACP, 0, (LPCSTR)*pWToFrom, aSize, *wString, size);

1 0

Jacek Caban : mshtml: Reduce debug traces.
by Alexandre Julliard 15 Aug '07

15 Aug '07

Module: wine Branch: master Commit: dde59f8f3e985876cd7bbb5100aa5b781bc354a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dde59f8f3e985876cd7bbb510… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 14 22:34:35 2007 +0200 mshtml: Reduce debug traces. --- dlls/mshtml/nsio.c | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index e94af28..9d245c3 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1883,15 +1883,9 @@ static nsresult NSAPI nsIOService_QueryInterface(nsIIOService *iface, nsIIDRef r { *result = NULL; - if(IsEqualGUID(&IID_nsISupports, riid)) { - TRACE("(IID_nsISupports %p)\n", result); - *result = iface; - }else if(IsEqualGUID(&IID_nsIIOService, riid)) { - TRACE("(IID_nsIIOService %p)\n", result); + if(IsEqualGUID(&IID_nsISupports, riid) + || IsEqualGUID(&IID_nsIIOService, riid)) { *result = iface; - } - - if(*result) { nsIIOService_AddRef(iface); return S_OK; }

1 0

Jacek Caban : mshtml: Check use_wine_url in nsIURI::GetAsciiSpec.
by Alexandre Julliard 15 Aug '07

15 Aug '07

Module: wine Branch: master Commit: 000c3d429599bf135a81bc29f6a89383c6294335 URL: http://source.winehq.org/git/wine.git/?a=commit;h=000c3d429599bf135a81bc29f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 14 22:35:19 2007 +0200 mshtml: Check use_wine_url in nsIURI::GetAsciiSpec. --- dlls/mshtml/nsio.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 9d245c3..13abe9b 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1528,7 +1528,7 @@ static nsresult NSAPI nsURI_GetAsciiSpec(nsIWineURI *iface, nsACString *aAsciiSp TRACE("(%p)->(%p)\n", This, aAsciiSpec); - if(This->wine_url) + if(This->use_wine_url) return nsIURI_GetSpec(NSURI(This), aAsciiSpec); if(This->uri)

1 0