February 2008 - Wine-Commits

Mikołaj Zalewski : comctl32: rebar: Image height should be taken into account when computing the band height.
by Alexandre Julliard Feb. 28, 2008

Feb. 28, 2008

Module: wine Branch: master Commit: ecde1c3cc74ab5c83f0e591d3472d6602f3969e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecde1c3cc74ab5c83f0e591d3… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Wed Feb 27 16:56:35 2008 +0100 comctl32: rebar: Image height should be taken into account when computing the band height. --- dlls/comctl32/rebar.c | 10 +++++----- dlls/comctl32/tests/rebar.c | 24 +++++++++++++++++++++++- 2 files changed, 28 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 9ad46f4..54f186d 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -1513,7 +1513,7 @@ REBAR_ValidateBand (const REBAR_INFO *infoPtr, REBAR_BAND *lpBand) /* the internal band structure: cxHeader, cyHeader, cxMinBand, cyMinBand, fStatus */ { UINT header=0; - UINT textheight=0; + UINT textheight=0, imageheight = 0; UINT i, nonfixed; REBAR_BAND *tBand; @@ -1576,11 +1576,11 @@ REBAR_ValidateBand (const REBAR_INFO *infoPtr, REBAR_BAND *lpBand) lpBand->fStatus |= HAS_IMAGE; if (infoPtr->dwStyle & CCS_VERT) { header += (infoPtr->imageSize.cy + REBAR_POST_IMAGE); - lpBand->cyMinBand = infoPtr->imageSize.cx + 2; + imageheight = infoPtr->imageSize.cx + 4; } else { header += (infoPtr->imageSize.cx + REBAR_POST_IMAGE); - lpBand->cyMinBand = infoPtr->imageSize.cy + 2; + imageheight = infoPtr->imageSize.cy + 4; } } @@ -1610,7 +1610,7 @@ REBAR_ValidateBand (const REBAR_INFO *infoPtr, REBAR_BAND *lpBand) /* check if user overrode the header value */ if (!(lpBand->fStyle & RBBS_UNDOC_FIXEDHEADER)) lpBand->cxHeader = header; - lpBand->cyHeader = textheight; + lpBand->cyHeader = max(textheight, imageheight); /* Now compute minimum size of child window */ update_min_band_height(infoPtr, lpBand); /* update lpBand->cyMinBand from cyHeader and cyChild*/ @@ -2633,7 +2633,7 @@ REBAR_SetBandInfoT(REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam, BOOL bUnic REBAR_DumpBand (infoPtr); - if (bChanged && (lprbbi->fMask & (RBBIM_CHILDSIZE | RBBIM_SIZE | RBBIM_STYLE))) { + if (bChanged && (lprbbi->fMask & (RBBIM_CHILDSIZE | RBBIM_SIZE | RBBIM_STYLE | RBBIM_IMAGE))) { REBAR_Layout(infoPtr); InvalidateRect(infoPtr->hwndSelf, 0, 1); } diff --git a/dlls/comctl32/tests/rebar.c b/dlls/comctl32/tests/rebar.c index 1de9cd2..8615cc3 100644 --- a/dlls/comctl32/tests/rebar.c +++ b/dlls/comctl32/tests/rebar.c @@ -17,6 +17,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +/* make sure the structures work with a comctl32 v5.x */ +#define _WIN32_WINNT 0x500 +#define _WIN32_IE 0x500 + #include <assert.h> #include <stdarg.h> @@ -252,6 +256,11 @@ rbsize_result_t rbsize_results[] = { { {328, 0, 511, 20}, 0x00, 183}, { {511, 0, 672, 20}, 0x00, 161}, { { 0, 20, 672, 40}, 0x00, 200}, }, }, + { {0, 0, 672, 56}, 56, 2, {28, 28, }, 5, { + { { 0, 0, 114, 28}, 0x00, 40}, { {114, 0, 328, 28}, 0x00, 214}, + { {328, 0, 511, 28}, 0x00, 183}, { {511, 0, 672, 28}, 0x00, 161}, + { { 0, 28, 672, 56}, 0x00, 200}, + }, }, { {0, 0, 672, 0}, 0, 0, {0, }, 0, {{{0, 0, 0, 0}, 0, 0}, }, }, { {0, 0, 672, 65}, 65, 1, {65, }, 3, { @@ -329,6 +338,8 @@ static void layout_test(void) { HWND hRebar = NULL; REBARBANDINFO rbi; + HIMAGELIST himl; + REBARINFO ri; rebuild_rebar(&hRebar); check_sizes(); @@ -406,6 +417,17 @@ static void layout_test(void) SendMessageA(hRebar, RB_MINIMIZEBAND, 0, 0); check_sizes(); + /* an image will increase the band height */ + himl = ImageList_LoadImage(LoadLibrary("comctl32"), MAKEINTRESOURCE(121), 24, 2, CLR_NONE, IMAGE_BITMAP, LR_DEFAULTCOLOR); + ri.cbSize = sizeof(ri); + ri.fMask = RBIM_IMAGELIST; + ri.himl = himl; + ok(SendMessage(hRebar, RB_SETBARINFO, 0, (LPARAM)&ri), "RB_SETBARINFO failed\n"); + rbi.fMask = RBBIM_IMAGE; + rbi.iImage = 1; + SendMessage(hRebar, RB_SETBANDINFO, 1, (LPARAM)&rbi); + check_sizes(); + /* VARHEIGHT resizing test on a horizontal rebar */ rebuild_rebar(&hRebar); SetWindowLong(hRebar, GWL_STYLE, GetWindowLong(hRebar, GWL_STYLE) | RBS_AUTOSIZE); @@ -793,7 +815,7 @@ START_TEST(rebar) MSG msg; RECT rc; - hComctl32 = GetModuleHandleA("comctl32.dll"); + hComctl32 = LoadLibraryA("comctl32.dll"); pInitCommonControlsEx = (void*)GetProcAddress(hComctl32, "InitCommonControlsEx"); if (!pInitCommonControlsEx) {

1 0

Jacek Caban : shdocvw: Guess URL scheme if not available.
by Alexandre Julliard Feb. 28, 2008

Feb. 28, 2008

Module: wine Branch: master Commit: 81590db3a2b37fd9c025922ec97f75159412dd49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81590db3a2b37fd9c025922ec… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 27 18:56:53 2008 +0100 shdocvw: Guess URL scheme if not available. --- dlls/shdocvw/navigate.c | 39 ++++++++++++++++++++++++++++++++++----- 1 files changed, 34 insertions(+), 5 deletions(-) diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c index 2d46abe..7e8606f 100644 --- a/dlls/shdocvw/navigate.c +++ b/dlls/shdocvw/navigate.c @@ -26,6 +26,8 @@ #include "exdispid.h" #include "shellapi.h" #include "winreg.h" +#include "shlwapi.h" +#include "wininet.h" WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); @@ -550,6 +552,35 @@ static HRESULT http_load_hack(DocHost *This, IMoniker *mon, IBindStatusCallback return IBindStatusCallback_OnStopBinding(callback, hres, NULL); } +static HRESULT create_moniker(LPCWSTR url, IMoniker **mon) +{ + WCHAR new_url[INTERNET_MAX_URL_LENGTH]; + DWORD size; + HRESULT hres; + + if(PathIsURLW(url)) + return CreateURLMoniker(NULL, url, mon); + + if(url[1] == ':') { + size = sizeof(new_url); + hres = UrlCreateFromPathW(url, new_url, &size, 0); + if(FAILED(hres)) { + WARN("UrlCreateFromPathW failed: %08x\n", hres); + return hres; + } + }else { + size = sizeof(new_url); + hres = UrlApplySchemeW(url, new_url, &size, URL_APPLY_GUESSSCHEME); + TRACE("got %s\n", debugstr_w(new_url)); + if(FAILED(hres)) { + WARN("UrlApplyScheme failed: %08x\n", hres); + return hres; + } + } + + return CreateURLMoniker(NULL, new_url, mon); +} + static HRESULT bind_to_object(DocHost *This, IMoniker *mon, LPCWSTR url, IBindCtx *bindctx, IBindStatusCallback *callback) { @@ -564,11 +595,9 @@ static HRESULT bind_to_object(DocHost *This, IMoniker *mon, LPCWSTR url, IBindCt if(mon) { IMoniker_AddRef(mon); }else { - hres = CreateURLMoniker(NULL, url, &mon); - if(FAILED(hres)) { - WARN("CreateURLMoniker failed: %08x\n", hres); + hres = create_moniker(url, &mon); + if(FAILED(hres)) return hres; - } } CoTaskMemFree(This->url); @@ -579,7 +608,7 @@ static HRESULT bind_to_object(DocHost *This, IMoniker *mon, LPCWSTR url, IBindCt IBindCtx_RegisterObjectParam(bindctx, (LPOLESTR)SZ_HTML_CLIENTSITE_OBJECTPARAM, (IUnknown*)CLIENTSITE(This)); - hres = CoInternetParseUrl(url, PARSE_SCHEMA, 0, schema, sizeof(schema)/sizeof(schema[0]), + hres = CoInternetParseUrl(This->url, PARSE_SCHEMA, 0, schema, sizeof(schema)/sizeof(schema[0]), &schema_len, 0); if(SUCCEEDED(hres) && (!strcmpW(schema, httpW) || !strcmpW(schema, httpsW) || !strcmpW(schema, ftpW))) {

1 0

Jacek Caban : shdocvw: Register default URL prefixes.
by Alexandre Julliard Feb. 28, 2008

Feb. 28, 2008

Module: wine Branch: master Commit: 7cb53e0232c03a3b8200377da7798dcda9391459 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cb53e0232c03a3b8200377da… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 27 18:56:38 2008 +0100 shdocvw: Register default URL prefixes. --- dlls/shdocvw/shdocvw.inf | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/shdocvw/shdocvw.inf b/dlls/shdocvw/shdocvw.inf index 57df7cb..5bc37d8 100644 --- a/dlls/shdocvw/shdocvw.inf +++ b/dlls/shdocvw/shdocvw.inf @@ -3,11 +3,11 @@ Signature="$CHICAGO$" [RegisterDll] -AddReg=Classes.Reg +AddReg=Classes.Reg, URL.Reg [UnregisterDll] -DelReg=Classes.Reg +DelReg=Classes.Reg, URL.Reg [RegisterIE] @@ -127,6 +127,15 @@ HKCR,"InternetShortcut\shell\print\command",,,"rundll32.exe mshtml.dll,PrintHTML HKCR,"InternetShortcut\shell\printto\command",,,"rundll32.exe mshtml.dll,PrintHTML ""%1"" ""%2"" ""%3"" ""%4""" +[URL.Reg] +HKLM,"Software\Microsoft\Windows\CurrentVersion\URL\DefaultPrefix",,,"http://" +HKLM,"Software\Microsoft\Windows\CurrentVersion\URL\Prefixes","ftp",,"ftp://" +HKLM,"Software\Microsoft\Windows\CurrentVersion\URL\Prefixes","gopher",,"gopher://" +HKLM,"Software\Microsoft\Windows\CurrentVersion\URL\Prefixes","home",,"http://" +HKLM,"Software\Microsoft\Windows\CurrentVersion\URL\Prefixes","mosaic",,"http://" +HKLM,"Software\Microsoft\Windows\CurrentVersion\URL\Prefixes","www",,"http://" + + [Settings.Reg] HKCU,"Software\Microsoft\Internet Explorer\Main","Start Page",,"http://www.winehq.org" HKCU,"Software\Microsoft\Internet Explorer\Main","Search Page",,"http://www.google.com"

1 0

Jacek Caban : shlwapi: Added more tests.
by Alexandre Julliard Feb. 28, 2008

Feb. 28, 2008

Module: wine Branch: master Commit: d1ae63b0d605a5c69ede2068adbafeb87e281c0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1ae63b0d605a5c69ede2068a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 27 18:56:16 2008 +0100 shlwapi: Added more tests. --- dlls/shlwapi/tests/path.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/tests/path.c b/dlls/shlwapi/tests/path.c index 5fb490d..82112a5 100644 --- a/dlls/shlwapi/tests/path.c +++ b/dlls/shlwapi/tests/path.c @@ -76,11 +76,13 @@ static struct { } TEST_PATH_IS_URL[] = { {"http://foo/bar", TRUE}, {"c:\\foo\\bar", FALSE}, + {"c:/foo/bar", FALSE}, {"foo://foo/bar", TRUE}, {"foo\\bar", FALSE}, {"foo.bar", FALSE}, {"bogusscheme:", TRUE}, - {"http:partial", TRUE} + {"http:partial", TRUE}, + {"www.winehq.org", FALSE} }; struct {

1 0

Jacek Caban : shlwapi: Added TRACEs to PathIsURL.
by Alexandre Julliard Feb. 28, 2008

Feb. 28, 2008

Module: wine Branch: master Commit: 7e255f1ac841f2078c572ff020f84b6027453083 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e255f1ac841f2078c572ff02… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 27 18:56:05 2008 +0100 shlwapi: Added TRACEs to PathIsURL. --- dlls/shlwapi/url.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index 87fbb25..ba7cdb6 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -2155,6 +2155,8 @@ BOOL WINAPI PathIsURLA(LPCSTR lpstrPath) PARSEDURLA base; DWORD res1; + TRACE("%s\n", debugstr_a(lpstrPath)); + if (!lpstrPath || !*lpstrPath) return FALSE; /* get protocol */ @@ -2173,6 +2175,8 @@ BOOL WINAPI PathIsURLW(LPCWSTR lpstrPath) PARSEDURLW base; DWORD res1; + TRACE("%s\n", debugstr_w(lpstrPath)); + if (!lpstrPath || !*lpstrPath) return FALSE; /* get protocol */

1 0

Jacek Caban : wininet: Moved InternetFindNextFileW implementation to vtbl.
by Alexandre Julliard Feb. 28, 2008

Feb. 28, 2008

Module: wine Branch: master Commit: 8c45eecca780c9920b8bb929baedeba7824bf32f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c45eecca780c9920b8bb929b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 27 18:55:09 2008 +0100 wininet: Moved InternetFindNextFileW implementation to vtbl. --- dlls/wininet/ftp.c | 108 +++++++++++++++++++++++++---------------------- dlls/wininet/http.c | 4 +- dlls/wininet/internet.c | 56 ++++++++---------------- dlls/wininet/internet.h | 2 +- 4 files changed, 80 insertions(+), 90 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index d81e242..8a8c484 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -1170,7 +1170,8 @@ static const HANDLEHEADERVtbl FTPFILEVtbl = { FTPFILE_Destroy, NULL, NULL, - FTPFILE_WriteFile + FTPFILE_WriteFile, + NULL }; /*********************************************************************** @@ -2088,6 +2089,7 @@ static const HANDLEHEADERVtbl FTPSESSIONVtbl = { FTPSESSION_Destroy, FTPSESSION_CloseConnection, NULL, + NULL, NULL }; @@ -3083,91 +3085,97 @@ recv_end: return (nRC != -1); } - /*********************************************************************** - * FTP_FindNextFileW (Internal) - * - * Continues a file search from a previous call to FindFirstFile - * - * RETURNS - * TRUE on success - * FALSE on failure + * FTPFINDNEXT_Destroy (internal) * + * Deallocate session handle */ -BOOL WINAPI FTP_FindNextFileW(LPWININETFTPFINDNEXTW lpwh, LPVOID lpvFindData) +static void FTPFINDNEXT_Destroy(WININETHANDLEHEADER *hdr) { - BOOL bSuccess = TRUE; - LPWIN32_FIND_DATAW lpFindFileData; - - TRACE("index(%d) size(%d)\n", lpwh->index, lpwh->size); - - assert (lpwh->hdr.htype == WH_HFTPFINDNEXT); + LPWININETFTPFINDNEXTW lpwfn = (LPWININETFTPFINDNEXTW) hdr; + DWORD i; - /* Clear any error information */ - INTERNET_SetLastError(0); + TRACE("\n"); - lpFindFileData = (LPWIN32_FIND_DATAW) lpvFindData; - ZeroMemory(lpFindFileData, sizeof(WIN32_FIND_DATAA)); + WININET_Release(&lpwfn->lpFtpSession->hdr); - if (lpwh->index >= lpwh->size) + for (i = 0; i < lpwfn->size; i++) { - INTERNET_SetLastError(ERROR_NO_MORE_FILES); - bSuccess = FALSE; - goto lend; + HeapFree(GetProcessHeap(), 0, lpwfn->lpafp[i].lpszName); } - FTP_ConvertFileProp(&lpwh->lpafp[lpwh->index], lpFindFileData); - lpwh->index++; + HeapFree(GetProcessHeap(), 0, lpwfn->lpafp); + HeapFree(GetProcessHeap(), 0, lpwfn); +} - TRACE("\nName: %s\nSize: %d\n", debugstr_w(lpFindFileData->cFileName), lpFindFileData->nFileSizeLow); +static DWORD WINAPI FTPFINDNEXT_FindNextFileProc(WININETFTPFINDNEXTW *find, LPVOID data) +{ + WIN32_FIND_DATAW *find_data = data; + DWORD res = ERROR_SUCCESS; -lend: + TRACE("index(%d) size(%d)\n", find->index, find->size); + + ZeroMemory(find_data, sizeof(WIN32_FIND_DATAW)); - if (lpwh->hdr.dwFlags & INTERNET_FLAG_ASYNC) + if (find->index < find->size) { + FTP_ConvertFileProp(&find->lpafp[find->index], find_data); + find->index++; + + TRACE("Name: %s\nSize: %d\n", debugstr_w(find_data->cFileName), find_data->nFileSizeLow); + }else { + res = ERROR_NO_MORE_FILES; + } + + if (find->hdr.dwFlags & INTERNET_FLAG_ASYNC) { INTERNET_ASYNC_RESULT iar; - iar.dwResult = (DWORD)bSuccess; - iar.dwError = iar.dwError = bSuccess ? ERROR_SUCCESS : - INTERNET_GetLastError(); + iar.dwResult = (res == ERROR_SUCCESS); + iar.dwError = res; - INTERNET_SendCallback(&lpwh->hdr, lpwh->hdr.dwContext, + INTERNET_SendCallback(&find->hdr, find->hdr.dwContext, INTERNET_STATUS_REQUEST_COMPLETE, &iar, sizeof(INTERNET_ASYNC_RESULT)); } - return bSuccess; + return res; } - -/*********************************************************************** - * FTPFINDNEXT_Destroy (internal) - * - * Deallocate session handle - */ -static void FTPFINDNEXT_Destroy(WININETHANDLEHEADER *hdr) +static void FTPFINDNEXT_AsyncFindNextFileProc(WORKREQUEST *workRequest) { - LPWININETFTPFINDNEXTW lpwfn = (LPWININETFTPFINDNEXTW) hdr; - DWORD i; + struct WORKREQ_FTPFINDNEXTW *req = &workRequest->u.FtpFindNextW; - TRACE("\n"); + FTPFINDNEXT_FindNextFileProc((WININETFTPFINDNEXTW*)workRequest->hdr, req->lpFindFileData); +} - WININET_Release(&lpwfn->lpFtpSession->hdr); +static DWORD FTPFINDNEXT_FindNextFileW(WININETHANDLEHEADER *hdr, void *data) +{ + WININETFTPFINDNEXTW *find = (WININETFTPFINDNEXTW*)hdr; - for (i = 0; i < lpwfn->size; i++) + if (find->lpFtpSession->lpAppInfo->hdr.dwFlags & INTERNET_FLAG_ASYNC) { - HeapFree(GetProcessHeap(), 0, lpwfn->lpafp[i].lpszName); + WORKREQUEST workRequest; + struct WORKREQ_FTPFINDNEXTW *req; + + workRequest.asyncproc = FTPFINDNEXT_AsyncFindNextFileProc; + workRequest.hdr = WININET_AddRef( &find->hdr ); + req = &workRequest.u.FtpFindNextW; + req->lpFindFileData = data; + + INTERNET_AsyncCall(&workRequest); + + return ERROR_SUCCESS; } - HeapFree(GetProcessHeap(), 0, lpwfn->lpafp); - HeapFree(GetProcessHeap(), 0, lpwfn); + return FTPFINDNEXT_FindNextFileProc(find, data); } static const HANDLEHEADERVtbl FTPFINDNEXTVtbl = { FTPFINDNEXT_Destroy, NULL, NULL, - NULL + NULL, + FTPFINDNEXT_FindNextFileW }; /*********************************************************************** diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index f3c2afc..432b142 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1422,7 +1422,8 @@ static const HANDLEHEADERVtbl HTTPREQVtbl = { HTTPREQ_Destroy, HTTPREQ_CloseConnection, HTTPREQ_SetOption, - HTTPREQ_WriteFile + HTTPREQ_WriteFile, + NULL }; /*********************************************************************** @@ -2946,6 +2947,7 @@ static const HANDLEHEADERVtbl HTTPSESSIONVtbl = { HTTPSESSION_Destroy, NULL, NULL, + NULL, NULL }; diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 1088519..feda307 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -475,6 +475,7 @@ static const HANDLEHEADERVtbl APPINFOVtbl = { APPINFO_Destroy, NULL, NULL, + NULL, NULL }; @@ -944,53 +945,32 @@ BOOL WINAPI InternetFindNextFileA(HINTERNET hFind, LPVOID lpvFindData) * FALSE on failure * */ -static void AsyncFtpFindNextFileProc(WORKREQUEST *workRequest) -{ - struct WORKREQ_FTPFINDNEXTW *req = &workRequest->u.FtpFindNextW; - LPWININETFTPFINDNEXTW lpwh = (LPWININETFTPFINDNEXTW) workRequest->hdr; - - TRACE("%p\n", lpwh); - - FTP_FindNextFileW(lpwh, req->lpFindFileData); -} - BOOL WINAPI InternetFindNextFileW(HINTERNET hFind, LPVOID lpvFindData) { - LPWININETAPPINFOW hIC = NULL; - LPWININETFTPFINDNEXTW lpwh; - BOOL bSuccess = FALSE; + WININETHANDLEHEADER *hdr; + DWORD res; TRACE("\n"); - lpwh = (LPWININETFTPFINDNEXTW) WININET_GetObject( hFind ); - if (NULL == lpwh || lpwh->hdr.htype != WH_HFTPFINDNEXT) - { - FIXME("Only FTP supported\n"); - INTERNET_SetLastError(ERROR_INTERNET_INCORRECT_HANDLE_TYPE); - goto lend; + hdr = WININET_GetObject(hFind); + if(!hdr) { + WARN("Invalid handle\n"); + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; } - hIC = lpwh->lpFtpSession->lpAppInfo; - if (hIC->hdr.dwFlags & INTERNET_FLAG_ASYNC) - { - WORKREQUEST workRequest; - struct WORKREQ_FTPFINDNEXTW *req; + if(hdr->vtbl->FindNextFileW) { + res = hdr->vtbl->FindNextFileW(hdr, lpvFindData); + }else { + WARN("Handle doesn't support NextFile\n"); + res = ERROR_INTERNET_INCORRECT_HANDLE_TYPE; + } - workRequest.asyncproc = AsyncFtpFindNextFileProc; - workRequest.hdr = WININET_AddRef( &lpwh->hdr ); - req = &workRequest.u.FtpFindNextW; - req->lpFindFileData = lpvFindData; + WININET_Release(hdr); - bSuccess = INTERNET_AsyncCall(&workRequest); - } - else - { - bSuccess = FTP_FindNextFileW(lpwh, lpvFindData); - } -lend: - if( lpwh ) - WININET_Release( &lpwh->hdr ); - return bSuccess; + if(res != ERROR_SUCCESS) + SetLastError(res); + return res == ERROR_SUCCESS; } /*********************************************************************** diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index c3321e1..6bda9ab 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -140,6 +140,7 @@ typedef struct { void (*CloseConnection)(WININETHANDLEHEADER*); DWORD (*SetOption)(WININETHANDLEHEADER*,DWORD,void*,DWORD); BOOL (*WriteFile)(WININETHANDLEHEADER*,const void*,DWORD,DWORD*); + DWORD (*FindNextFileW)(WININETHANDLEHEADER*,void*); } HANDLEHEADERVtbl; struct _WININETHANDLEHEADER @@ -429,7 +430,6 @@ BOOLAPI FTP_FtpSetCurrentDirectoryW(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszDire BOOLAPI FTP_FtpCreateDirectoryW(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszDirectory); INTERNETAPI HINTERNET WINAPI FTP_FtpFindFirstFileW(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszSearchFile, LPWIN32_FIND_DATAW lpFindFileData, DWORD dwFlags, DWORD_PTR dwContext); -BOOL WINAPI FTP_FindNextFileW(LPWININETFTPFINDNEXTW lpwh, LPVOID lpvFindData); BOOLAPI FTP_FtpGetCurrentDirectoryW(LPWININETFTPSESSIONW lpwfs, LPWSTR lpszCurrentDirectory, LPDWORD lpdwCurrentDirectory); BOOL FTP_ConvertFileProp(LPFILEPROPERTIESW lpafp, LPWIN32_FIND_DATAW lpFindFileData);

1 0

Jacek Caban : wininet: Move WININETFTPFINDNEXTW declaration to ftp.c.
by Alexandre Julliard Feb. 28, 2008

Feb. 28, 2008

Module: wine Branch: master Commit: 66259555ff6be4c50751b9d8b38e91ad775b561b URL: http://source.winehq.org/git/wine.git/?a=commit;h=66259555ff6be4c50751b9d8b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 27 18:55:28 2008 +0100 wininet: Move WININETFTPFINDNEXTW declaration to ftp.c. --- dlls/wininet/ftp.c | 21 ++++++++++++++++++++- dlls/wininet/internet.h | 20 -------------------- 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 8a8c484..76801c8 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -61,6 +61,24 @@ WINE_DEFAULT_DEBUG_CHANNEL(wininet); +typedef struct +{ + BOOL bIsDirectory; + LPWSTR lpszName; + DWORD nSize; + struct tm tmLastModified; + unsigned short permissions; +} FILEPROPERTIESW, *LPFILEPROPERTIESW; + +typedef struct +{ + WININETHANDLEHEADER hdr; + WININETFTPSESSIONW *lpFtpSession; + DWORD index; + DWORD size; + LPFILEPROPERTIESW lpafp; +} WININETFTPFINDNEXTW, *LPWININETFTPFINDNEXTW; + #define DATA_PACKET_SIZE 0x2000 #define szCRLF "\r\n" #define MAX_BACKLOG 5 @@ -145,6 +163,7 @@ static BOOL FTP_ParseDirectory(LPWININETFTPSESSIONW lpwfs, INT nSocket, LPCWSTR static HINTERNET FTP_ReceiveFileList(LPWININETFTPSESSIONW lpwfs, INT nSocket, LPCWSTR lpszSearchFile, LPWIN32_FIND_DATAW lpFindFileData, DWORD_PTR dwContext); static DWORD FTP_SetResponseError(DWORD dwResponse); +static BOOL FTP_ConvertFileProp(LPFILEPROPERTIESW lpafp, LPWIN32_FIND_DATAW lpFindFileData); /*********************************************************************** * FtpPutFileA (WININET.@) @@ -3241,7 +3260,7 @@ static HINTERNET FTP_ReceiveFileList(LPWININETFTPSESSIONW lpwfs, INT nSocket, LP * FALSE on failure * */ -BOOL FTP_ConvertFileProp(LPFILEPROPERTIESW lpafp, LPWIN32_FIND_DATAW lpFindFileData) +static BOOL FTP_ConvertFileProp(LPFILEPROPERTIESW lpafp, LPWIN32_FIND_DATAW lpFindFileData) { BOOL bSuccess = FALSE; diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 6bda9ab..3e95334 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -246,25 +246,6 @@ typedef struct _WININETFTPSESSIONW } WININETFTPSESSIONW, *LPWININETFTPSESSIONW; -typedef struct -{ - BOOL bIsDirectory; - LPWSTR lpszName; - DWORD nSize; - struct tm tmLastModified; - unsigned short permissions; -} FILEPROPERTIESW, *LPFILEPROPERTIESW; - - -typedef struct -{ - WININETHANDLEHEADER hdr; - WININETFTPSESSIONW *lpFtpSession; - DWORD index; - DWORD size; - LPFILEPROPERTIESW lpafp; -} WININETFTPFINDNEXTW, *LPWININETFTPFINDNEXTW; - struct WORKREQ_FTPPUTFILEW { LPWSTR lpszLocalFile; @@ -432,7 +413,6 @@ INTERNETAPI HINTERNET WINAPI FTP_FtpFindFirstFileW(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszSearchFile, LPWIN32_FIND_DATAW lpFindFileData, DWORD dwFlags, DWORD_PTR dwContext); BOOLAPI FTP_FtpGetCurrentDirectoryW(LPWININETFTPSESSIONW lpwfs, LPWSTR lpszCurrentDirectory, LPDWORD lpdwCurrentDirectory); -BOOL FTP_ConvertFileProp(LPFILEPROPERTIESW lpafp, LPWIN32_FIND_DATAW lpFindFileData); BOOL FTP_FtpRenameFileW(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszSrc, LPCWSTR lpszDest); BOOL FTP_FtpRemoveDirectoryW(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszDirectory); BOOL FTP_FtpDeleteFileW(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszFileName);

1 0

Jacek Caban : shlwapi: Store rekistry key name in unicode to avoid conversion.
by Alexandre Julliard Feb. 28, 2008

Feb. 28, 2008

Module: wine Branch: master Commit: a1f3af39b3f2b207b2d141658d8f26349c9575fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1f3af39b3f2b207b2d141658… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 27 18:55:47 2008 +0100 shlwapi: Store rekistry key name in unicode to avoid conversion. --- dlls/shlwapi/url.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index aa232aa..87fbb25 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -1580,14 +1580,18 @@ static HRESULT URL_ApplyDefault(LPCWSTR pszIn, LPWSTR pszOut, LPDWORD pcchOut) { HKEY newkey; DWORD data_len, dwType; - WCHAR reg_path[MAX_PATH]; WCHAR value[MAX_PATH], data[MAX_PATH]; + static const WCHAR prefix_keyW[] = + {'S','o','f','t','w','a','r','e', + '\\','M','i','c','r','o','s','o','f','t', + '\\','W','i','n','d','o','w','s', + '\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n', + '\\','U','R','L', + '\\','D','e','f','a','u','l','t','P','r','e','f','i','x',0}; + /* get and prepend default */ - MultiByteToWideChar(0, 0, - "Software\\Microsoft\\Windows\\CurrentVersion\\URL\\DefaultPrefix", - -1, reg_path, MAX_PATH); - RegOpenKeyExW(HKEY_LOCAL_MACHINE, reg_path, 0, 1, &newkey); + RegOpenKeyExW(HKEY_LOCAL_MACHINE, prefix_keyW, 0, 1, &newkey); data_len = MAX_PATH; value[0] = '@'; value[1] = '\0';

1 0

Huw Davies : gdi32: Add a partial implementation of GdiRealizationInfo.
by Alexandre Julliard Feb. 28, 2008

Feb. 28, 2008

Module: wine Branch: master Commit: 34002d4c7e912fede083bcbf780f2d6c26668d45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34002d4c7e912fede083bcbf7… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Feb 27 17:00:06 2008 +0000 gdi32: Add a partial implementation of GdiRealizationInfo. --- dlls/gdi32/font.c | 31 +++++++++++++++++++++++++++- dlls/gdi32/gdi32.spec | 2 +- dlls/gdi32/tests/font.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 80 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 2d02b34..7f29936 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -348,7 +348,7 @@ HFONT WINAPI CreateFontIndirectW( const LOGFONTW *plf ) if (!(fontPtr = GDI_AllocObject( sizeof(FONTOBJ), FONT_MAGIC, (HGDIOBJ *)&hFont, &font_funcs ))) return 0; - memcpy( &fontPtr->logfont, plf, sizeof(LOGFONTW) ); + fontPtr->logfont = *plf; TRACE("(%d %d %d %d %x %d %x %d %d) %s %s %s %s => %p\n", plf->lfHeight, plf->lfWidth, @@ -2536,7 +2536,7 @@ BOOL WINAPI TranslateCharsetInfo( return FALSE; } if (index >= MAXTCIINDEX || FONT_tci[index].ciCharset == DEFAULT_CHARSET) return FALSE; - memcpy(lpCs, &FONT_tci[index], sizeof(CHARSETINFO)); + *lpCs = FONT_tci[index]; return TRUE; } @@ -3209,3 +3209,30 @@ BOOL WINAPI FontIsLinked(HDC hdc) TRACE("returning %d\n", ret); return ret; } + +/************************************************************* + * GdiRealizationInfo (GDI32.@) + * + * Returns a structure that contains some font information. + */ +typedef struct +{ + DWORD flags; /* 1 for bitmap fonts, 3 for scalable fonts */ + DWORD unknown1; /* keeps incrementing - num of fonts that have been created or selected into a dc ?? */ + DWORD unknown2; /* fixed for a given font - looks like it could be the order of the face in the font list or the order + in which the face was first rendered. */ +} realization_info_t; + +BOOL WINAPI GdiRealizationInfo(HDC hdc, realization_info_t *info) +{ + UINT otm_size; + FIXME("(%p, %p): stub!\n", hdc, info); + + info->flags = 1; + otm_size = GetOutlineTextMetricsW(hdc, 0, NULL); + if(otm_size) info->flags |= 2; /* scalable */ + + info->unknown1 = -1; + info->unknown2 = -1; + return TRUE; +} diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 4738a38..99df6d1 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -206,7 +206,7 @@ # @ stub GdiProcessSetup # @ stub GdiQueryFonts # @ stub GdiQueryTable -# @ stub GdiRealizationInfo +@ stdcall GdiRealizationInfo(long ptr) # @ stub GdiReleaseDC @ stub GdiReleaseLocalDC # @ stub GdiResetDCEMF diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 7e560d2..ebc3daf 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -38,6 +38,7 @@ BOOL (WINAPI *pGetCharABCWidthsW)(HDC hdc, UINT first, UINT last, LPABC abc); DWORD (WINAPI *pGetFontUnicodeRanges)(HDC hdc, LPGLYPHSET lpgs); DWORD (WINAPI *pGetGlyphIndicesA)(HDC hdc, LPCSTR lpstr, INT count, LPWORD pgi, DWORD flags); DWORD (WINAPI *pGetGlyphIndicesW)(HDC hdc, LPCWSTR lpstr, INT count, LPWORD pgi, DWORD flags); +BOOL (WINAPI *pGdiRealizationInfo)(HDC hdc, DWORD *); static HMODULE hgdi32 = 0; @@ -51,6 +52,7 @@ static void init(void) pGetFontUnicodeRanges = (void *)GetProcAddress(hgdi32, "GetFontUnicodeRanges"); pGetGlyphIndicesA = (void *)GetProcAddress(hgdi32, "GetGlyphIndicesA"); pGetGlyphIndicesW = (void *)GetProcAddress(hgdi32, "GetGlyphIndicesW"); + pGdiRealizationInfo = (void *)GetProcAddress(hgdi32, "GdiRealizationInfo"); } static INT CALLBACK is_truetype_font_installed_proc(const LOGFONT *elf, const TEXTMETRIC *ntm, DWORD type, LPARAM lParam) @@ -1745,6 +1747,53 @@ static void test_nonexistent_font(void) ReleaseDC(0, hdc); } +static void test_GdiRealizationInfo(void) +{ + HDC hdc; + DWORD info[4]; + BOOL r; + HFONT hfont, hfont_old; + LOGFONTA lf; + + if(!pGdiRealizationInfo) + { + skip("GdiRealizationInfo not available\n"); + return; + } + + hdc = GetDC(0); + + memset(info, 0xcc, sizeof(info)); + r = pGdiRealizationInfo(hdc, info); + ok(r != 0, "ret 0\n"); + ok(info[0] == 1, "info[0] = %x for the system font\n", info[0]); + ok(info[3] == 0xcccccccc, "structure longer than 3 dwords"); + + if (!is_truetype_font_installed("Arial")) + { + skip("skipping GdiRealizationInfo with truetype font\n"); + goto end; + } + + memset(&lf, 0, sizeof(lf)); + strcpy(lf.lfFaceName, "Arial"); + lf.lfHeight = 20; + lf.lfWeight = FW_NORMAL; + hfont = CreateFontIndirectA(&lf); + hfont_old = SelectObject(hdc, hfont); + + memset(info, 0xcc, sizeof(info)); + r = pGdiRealizationInfo(hdc, info); + ok(r != 0, "ret 0\n"); + ok(info[0] == 3, "info[0] = %x for arial\n", info[0]); + ok(info[3] == 0xcccccccc, "structure longer than 3 dwords"); + + DeleteObject(SelectObject(hdc, hfont_old)); + + end: + ReleaseDC(0, hdc); +} + START_TEST(font) { init(); @@ -1778,4 +1827,5 @@ START_TEST(font) else skip("Arial Black or Symbol/Wingdings is not installed\n"); test_GetTextMetrics(); + test_GdiRealizationInfo(); }

1 0

Rob Shearman : oleaut32: Fix size calculation in OLEFontImpl_GetSizeMax for multi-byte locale environments .
by Alexandre Julliard Feb. 28, 2008

Feb. 28, 2008

Module: wine Branch: master Commit: e23598132f1591fc900b5a8e0494153c8549958f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e23598132f1591fc900b5a8e0… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Feb 27 16:48:13 2008 +0000 oleaut32: Fix size calculation in OLEFontImpl_GetSizeMax for multi-byte locale environments. --- dlls/oleaut32/olefont.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/olefont.c b/dlls/oleaut32/olefont.c index 9a76992..fb7b40b 100644 --- a/dlls/oleaut32/olefont.c +++ b/dlls/oleaut32/olefont.c @@ -1812,7 +1812,9 @@ static HRESULT WINAPI OLEFontImpl_GetSizeMax( pcbSize->u.LowPart += sizeof(BYTE); /* StrLength */ if (this->description.lpstrName!=0) - pcbSize->u.LowPart += lstrlenW(this->description.lpstrName); + pcbSize->u.LowPart += WideCharToMultiByte( CP_ACP, 0, this->description.lpstrName, + strlenW(this->description.lpstrName), + NULL, 0, NULL, NULL ); return S_OK; }

1 0