February 2008 - Wine-Commits

Alexandre Julliard : msi/tests: Replace a printf() by a trace().
by Alexandre Julliard Feb. 29, 2008

Feb. 29, 2008

Module: wine Branch: master Commit: 848383ac8239140ff6ef43c516c1cf322c41bec1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=848383ac8239140ff6ef43c51… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 29 20:55:42 2008 +0100 msi/tests: Replace a printf() by a trace(). --- dlls/msi/tests/automation.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index 358d1bc..09d1279 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -272,7 +272,7 @@ static void create_database(const CHAR *name, const msi_table *tables, int num_t write_file(table->filename, table->data, (table->size - 1) * sizeof(char)); - printf("table->filename: %s\n", table->filename); + trace("table->filename: %s\n", table->filename); r = MsiDatabaseImportA(db, CURR_DIR, table->filename); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);

1 0

Divan Burger : user32: Correct the button sizes of the caption bar.
by Alexandre Julliard Feb. 29, 2008

Feb. 29, 2008

Module: wine Branch: master Commit: dab0c65fe4d53f19bdd20f09662bd8e513a8b264 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dab0c65fe4d53f19bdd20f096… Author: Divan Burger <divan.burger(a)gmail.com> Date: Wed Feb 20 21:04:16 2008 +0200 user32: Correct the button sizes of the caption bar. --- dlls/user32/nonclient.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index f822c40..d8a0188 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -611,19 +611,19 @@ static LRESULT NC_DoNCHitTest (WND *wndPtr, POINT pt ) /* Check close button */ if (wndPtr->dwStyle & WS_SYSMENU) - rect.right -= GetSystemMetrics(SM_CYCAPTION) - 1; + rect.right -= GetSystemMetrics(SM_CYCAPTION); if (pt.x > rect.right) return HTCLOSE; /* Check maximize box */ /* In win95 there is automatically a Maximize button when there is a minimize one*/ if (min_or_max_box && !(wndPtr->dwExStyle & WS_EX_TOOLWINDOW)) - rect.right -= GetSystemMetrics(SM_CXSIZE) + 1; + rect.right -= GetSystemMetrics(SM_CXSIZE); if (pt.x > rect.right) return HTMAXBUTTON; /* Check minimize box */ /* In win95 there is automatically a Maximize button when there is a Maximize one*/ if (min_or_max_box && !(wndPtr->dwExStyle & WS_EX_TOOLWINDOW)) - rect.right -= GetSystemMetrics(SM_CXSIZE) + 1; + rect.right -= GetSystemMetrics(SM_CXSIZE); if (pt.x > rect.right) return HTMINBUTTON; return HTCAPTION; @@ -742,8 +742,8 @@ static void NC_DrawCloseButton (HWND hwnd, HDC hdc, BOOL down, BOOL bGrayed) } else { - rect.left = rect.right - GetSystemMetrics(SM_CXSIZE) - 1; - rect.bottom = rect.top + GetSystemMetrics(SM_CYSIZE) - 1; + rect.left = rect.right - GetSystemMetrics(SM_CXSIZE); + rect.bottom = rect.top + GetSystemMetrics(SM_CYSIZE) - 2; rect.top += 2; rect.right -= 2; } @@ -772,9 +772,9 @@ static void NC_DrawMaxButton(HWND hwnd,HDC hdc,BOOL down, BOOL bGrayed) NC_GetInsideRect( hwnd, &rect ); if (GetWindowLongW( hwnd, GWL_STYLE) & WS_SYSMENU) - rect.right -= GetSystemMetrics(SM_CXSIZE) + 1; + rect.right -= GetSystemMetrics(SM_CXSIZE); rect.left = rect.right - GetSystemMetrics(SM_CXSIZE); - rect.bottom = rect.top + GetSystemMetrics(SM_CYSIZE) - 1; + rect.bottom = rect.top + GetSystemMetrics(SM_CYSIZE) - 2; rect.top += 2; rect.right -= 2; if (down) flags |= DFCS_PUSHED; @@ -800,11 +800,11 @@ static void NC_DrawMinButton(HWND hwnd,HDC hdc,BOOL down, BOOL bGrayed) NC_GetInsideRect( hwnd, &rect ); if (style & WS_SYSMENU) - rect.right -= GetSystemMetrics(SM_CXSIZE) + 1; + rect.right -= GetSystemMetrics(SM_CXSIZE); if (style & (WS_MAXIMIZEBOX|WS_MINIMIZEBOX)) rect.right -= GetSystemMetrics(SM_CXSIZE) - 2; rect.left = rect.right - GetSystemMetrics(SM_CXSIZE); - rect.bottom = rect.top + GetSystemMetrics(SM_CYSIZE) - 1; + rect.bottom = rect.top + GetSystemMetrics(SM_CYSIZE) - 2; rect.top += 2; rect.right -= 2; if (down) flags |= DFCS_PUSHED;

1 0

Rob Shearman : gdi32: Move 16-bit printing functions to printdrv16.c.
by Alexandre Julliard Feb. 29, 2008

Feb. 29, 2008

Module: wine Branch: master Commit: de75fe0a08daac556399ad34c8be40933eee2e9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=de75fe0a08daac556399ad34c… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Feb 29 11:48:47 2008 +0000 gdi32: Move 16-bit printing functions to printdrv16.c. --- dlls/gdi32/Makefile.in | 1 + dlls/gdi32/printdrv.c | 752 +--------------------------------------------- dlls/gdi32/printdrv16.c | 780 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 784 insertions(+), 749 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=de75fe0a08daac556399a…

1 0

Royal Chan : gdiplus: Implement GdipDrawLinesI based on GdipDrawLines.
by Alexandre Julliard Feb. 29, 2008

Feb. 29, 2008

Module: wine Branch: master Commit: 6e7b5347e362544ce4555636c4584cfecb2a3b83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e7b5347e362544ce4555636c… Author: Royal Chan <chanroyal(a)gmail.com> Date: Fri Feb 29 04:58:39 2008 -0800 gdiplus: Implement GdipDrawLinesI based on GdipDrawLines. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphics.c | 29 ++++++++++++++++++++++ dlls/gdiplus/tests/graphics.c | 53 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 83 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index a2d3183..ce4640f 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -188,7 +188,7 @@ @ stdcall GdipDrawLine(ptr ptr long long long long) @ stdcall GdipDrawLineI(ptr ptr long long long long) @ stdcall GdipDrawLines(ptr ptr ptr long) -@ stub GdipDrawLinesI +@ stdcall GdipDrawLinesI(ptr ptr ptr long) @ stdcall GdipDrawPath(ptr ptr ptr) @ stdcall GdipDrawPie(ptr ptr long long long long long long) @ stub GdipDrawPieI diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 123da48..ab8733d 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1224,6 +1224,35 @@ GpStatus WINGDIPAPI GdipDrawLines(GpGraphics *graphics, GpPen *pen, GDIPCONST return retval; } +GpStatus WINGDIPAPI GdipDrawLinesI(GpGraphics *graphics, GpPen *pen, GDIPCONST + GpPoint *points, INT count) +{ + INT save_state; + GpStatus retval; + GpPointF *ptf = NULL; + int i; + + if(!pen || !graphics || (count < 2)) + return InvalidParameter; + + ptf = GdipAlloc(count * sizeof(GpPointF)); + if(!ptf) return OutOfMemory; + + for(i = 0; i < count; i ++){ + ptf[i].X = (REAL) points[i].X; + ptf[i].Y = (REAL) points[i].Y; + } + + save_state = prepare_dc(graphics, pen); + + retval = draw_polyline(graphics, pen, ptf, count, TRUE); + + restore_dc(graphics, save_state); + + GdipFree(ptf); + return retval; +} + GpStatus WINGDIPAPI GdipDrawPath(GpGraphics *graphics, GpPen *pen, GpPath *path) { INT save_state; diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index c3a3315..6a6bc3d 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -384,6 +384,58 @@ static void test_GdipDrawLineI(void) ReleaseDC(0, hdc); } +static void test_GdipDrawLinesI(void) +{ + GpStatus status; + GpGraphics *graphics = NULL; + GpPen *pen = NULL; + GpPoint *ptf = NULL; + HDC hdc = GetDC(0); + + /* make a graphics object and pen object */ + status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); + ok(hdc != NULL, "Expected HDC to be initialized\n"); + + status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); + ok(graphics != NULL, "Expected graphics to be initialized\n"); + + status = GdipCreatePen1((ARGB)0xffff00ff, 10.0f, UnitPixel, &pen); + expect(Ok, status); + ok(pen != NULL, "Expected pen to be initialized\n"); + + /* make some arbitrary valid points*/ + ptf = GdipAlloc(2 * sizeof(GpPointF)); + + ptf[0].X = 1; + ptf[0].Y = 1; + + ptf[1].X = 2; + ptf[1].Y = 2; + + /* InvalidParameter cases: null graphics, null pen, null points, count < 2*/ + status = GdipDrawLinesI(NULL, NULL, NULL, 0); + expect(InvalidParameter, status); + + status = GdipDrawLinesI(graphics, pen, ptf, 0); + expect(InvalidParameter, status); + + status = GdipDrawLinesI(graphics, NULL, ptf, 2); + expect(InvalidParameter, status); + + status = GdipDrawLinesI(NULL, pen, ptf, 2); + expect(InvalidParameter, status); + + /* successful case */ + status = GdipDrawLinesI(graphics, pen, ptf, 2); + expect(Ok, status); + + GdipFree(ptf); + GdipDeletePen(pen); + ReleaseDC(0, hdc); +} + START_TEST(graphics) { struct GdiplusStartupInput gdiplusStartupInput; @@ -402,6 +454,7 @@ START_TEST(graphics) test_GdipDrawArc(); test_GdipDrawArcI(); test_GdipDrawLineI(); + test_GdipDrawLinesI(); GdiplusShutdown(gdiplusToken); }

1 0

Hans Leidekker : mscms: Create a copy of memory based profiles.
by Alexandre Julliard Feb. 29, 2008

Feb. 29, 2008

Module: wine Branch: master Commit: 8349a9f52e89b0fd96ba3ad159cd3ffdabbb27c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8349a9f52e89b0fd96ba3ad15… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Fri Feb 29 15:36:04 2008 +0100 mscms: Create a copy of memory based profiles. --- dlls/mscms/profile.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/mscms/profile.c b/dlls/mscms/profile.c index 9122ecc..76a8168 100644 --- a/dlls/mscms/profile.c +++ b/dlls/mscms/profile.c @@ -1371,7 +1371,6 @@ HPROFILE WINAPI OpenColorProfileW( PPROFILE profile, DWORD access, DWORD sharing cmsHPROFILE cmsprofile = NULL; icProfile *iccprofile = NULL; HANDLE handle = INVALID_HANDLE_VALUE; - DWORD size; TRACE( "( %p, 0x%08x, 0x%08x, 0x%08x )\n", profile, access, sharing, creation ); @@ -1381,14 +1380,14 @@ HPROFILE WINAPI OpenColorProfileW( PPROFILE profile, DWORD access, DWORD sharing { /* FIXME: access flags not implemented for memory based profiles */ - iccprofile = profile->pProfileData; - size = profile->cbDataSize; - - cmsprofile = cmsOpenProfileFromMem( iccprofile, size ); + if (!(iccprofile = HeapAlloc( GetProcessHeap(), 0, profile->cbDataSize ))) return NULL; + memcpy( iccprofile, profile->pProfileData, profile->cbDataSize ); + + cmsprofile = cmsOpenProfileFromMem( iccprofile, profile->cbDataSize ); } else if (profile->dwType == PROFILE_FILENAME) { - DWORD read, flags = 0; + DWORD size, read, flags = 0; TRACE( "profile file: %s\n", debugstr_w( (WCHAR *)profile->pProfileData ) );

1 0

Andrew Talbot : comdlg32: Assign to structs instead of using memcpy.
by Alexandre Julliard Feb. 29, 2008

Feb. 29, 2008

Module: wine Branch: master Commit: 2b217ea9afb873185839cfcebe6b19f9f57e5e52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b217ea9afb873185839cfceb… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Feb 29 15:54:56 2008 +0000 comdlg32: Assign to structs instead of using memcpy. --- dlls/comdlg32/fontdlg.c | 2 +- dlls/comdlg32/printdlg.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/fontdlg.c b/dlls/comdlg32/fontdlg.c index deefe8f..899cfe4 100644 --- a/dlls/comdlg32/fontdlg.c +++ b/dlls/comdlg32/fontdlg.c @@ -374,7 +374,7 @@ static int SetFontStylesToCombo2(HWND hwnd, HDC hdc, const LOGFONTW *lplf) int i,j; LOGFONTW lf; - memcpy(&lf, lplf, sizeof(LOGFONTW)); + lf = *lplf; for (i=0;i<FSTYLES;i++) { diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index c048297..73588b5 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -2850,7 +2850,7 @@ PRINTDLG_PS_ChangePaperPrev(const PageSetupDataA *pda) MoveWindow(GetDlgItem(pda->hDlg, rct2), x+width, y+SHADOW, SHADOW, height, FALSE); MoveWindow(GetDlgItem(pda->hDlg, rct3), x+SHADOW, y+height, width, SHADOW, FALSE); MoveWindow(GetDlgItem(pda->hDlg, rct1), x, y, width, height, FALSE); - memcpy(&rtTmp, &pda->rtDrawRect, sizeof(RECT)); + rtTmp = pda->rtDrawRect; rtTmp.right += SHADOW; rtTmp.bottom += SHADOW; #undef SHADOW

1 0

Jacek Caban : urlmon: Don't call ReportProgress(BINDSTATUS_DIRECTBIND) in MkProtocol::Start (current IE doesn't call it).
by Alexandre Julliard Feb. 29, 2008

Feb. 29, 2008

Module: wine Branch: master Commit: a78727d73b1f011b3b9e52d10d307179acb3829e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a78727d73b1f011b3b9e52d10… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 29 13:05:22 2008 +0100 urlmon: Don't call ReportProgress(BINDSTATUS_DIRECTBIND) in MkProtocol::Start (current IE doesn't call it). --- dlls/urlmon/mk.c | 1 - dlls/urlmon/tests/protocol.c | 2 +- 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/mk.c b/dlls/urlmon/mk.c index 9476ec0..a7edd1b 100644 --- a/dlls/urlmon/mk.c +++ b/dlls/urlmon/mk.c @@ -124,7 +124,6 @@ static HRESULT WINAPI MkProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, ReleaseBindInfo(&bindinfo); - IInternetProtocolSink_ReportProgress(pOIProtSink, BINDSTATUS_DIRECTBIND, NULL); IInternetProtocolSink_ReportProgress(pOIProtSink, BINDSTATUS_SENDINGREQUEST, NULL); hres = FindMimeFromData(NULL, szUrl, NULL, 0, NULL, 0, &mime, 0); diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index e9b1ec1..c21134b 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -1711,7 +1711,7 @@ static void test_mk_protocol(void) ok(hres == INET_E_RESOURCE_NOT_FOUND, "Start failed: %08x, expected INET_E_RESOURCE_NOT_FOUND\n", hres); CHECK_CALLED(GetBindInfo); - CHECK_CALLED(ReportProgress_DIRECTBIND); + CLEAR_CALLED(ReportProgress_DIRECTBIND); CHECK_CALLED(ReportProgress_SENDINGREQUEST); CHECK_CALLED(ReportProgress_MIMETYPEAVAILABLE); CHECK_CALLED(ReportResult);

1 0

Jacek Caban : wininet: Move InternetQueryDataAvailable to vtbl.
by Alexandre Julliard Feb. 29, 2008

Feb. 29, 2008

Module: wine Branch: master Commit: 3314184597fc1357ab1d68ad038e93bbcd295333 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3314184597fc1357ab1d68ad0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 29 12:57:57 2008 +0100 wininet: Move InternetQueryDataAvailable to vtbl. --- dlls/wininet/ftp.c | 3 + dlls/wininet/http.c | 52 +++++++++++++++++++++++ dlls/wininet/internet.c | 105 +++++++++++----------------------------------- dlls/wininet/internet.h | 1 + 4 files changed, 81 insertions(+), 80 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 76801c8..f92e545 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -1190,6 +1190,7 @@ static const HANDLEHEADERVtbl FTPFILEVtbl = { NULL, NULL, FTPFILE_WriteFile, + NULL, NULL }; @@ -2109,6 +2110,7 @@ static const HANDLEHEADERVtbl FTPSESSIONVtbl = { FTPSESSION_CloseConnection, NULL, NULL, + NULL, NULL }; @@ -3194,6 +3196,7 @@ static const HANDLEHEADERVtbl FTPFINDNEXTVtbl = { NULL, NULL, NULL, + NULL, FTPFINDNEXT_FindNextFileW }; diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 432b142..b1a181d 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1418,11 +1418,62 @@ static BOOL HTTPREQ_WriteFile(WININETHANDLEHEADER *hdr, const void *buffer, DWOR return NETCON_send(&lpwhr->netConnection, buffer, size, 0, (LPINT)written); } +static void HTTPREQ_AsyncQueryDataAvailableProc(WORKREQUEST *workRequest) +{ + WININETHTTPREQW *req = (WININETHTTPREQW*)workRequest->hdr; + INTERNET_ASYNC_RESULT iar; + char buffer[4048]; + + TRACE("%p\n", workRequest->hdr); + + iar.dwResult = NETCON_recv(&req->netConnection, buffer, + min(sizeof(buffer), req->dwContentLength - req->dwContentRead), + MSG_PEEK, (int *)&iar.dwError); + + INTERNET_SendCallback(&req->hdr, req->hdr.dwContext, INTERNET_STATUS_REQUEST_COMPLETE, &iar, + sizeof(INTERNET_ASYNC_RESULT)); +} + +static DWORD HTTPREQ_QueryDataAvailable(WININETHANDLEHEADER *hdr, DWORD *available, DWORD flags, DWORD_PTR ctx) +{ + WININETHTTPREQW *req = (WININETHTTPREQW*)hdr; + BYTE buffer[4048]; + BOOL async; + + TRACE("(%p %p %x %lx)\n", req, available, flags, ctx); + + if(!NETCON_query_data_available(&req->netConnection, available) || *available) + return ERROR_SUCCESS; + + /* Even if we are in async mode, we need to determine whether + * there is actually more data available. We do this by trying + * to peek only a single byte in async mode. */ + async = (req->lpHttpSession->lpAppInfo->hdr.dwFlags & INTERNET_FLAG_ASYNC) != 0; + + if (NETCON_recv(&req->netConnection, buffer, + min(async ? 1 : sizeof(buffer), req->dwContentLength - req->dwContentRead), + MSG_PEEK, (int *)available) && async && *available) + { + WORKREQUEST workRequest; + + *available = 0; + workRequest.asyncproc = HTTPREQ_AsyncQueryDataAvailableProc; + workRequest.hdr = WININET_AddRef( &req->hdr ); + + INTERNET_AsyncCall(&workRequest); + + return ERROR_IO_PENDING; + } + + return ERROR_SUCCESS; +} + static const HANDLEHEADERVtbl HTTPREQVtbl = { HTTPREQ_Destroy, HTTPREQ_CloseConnection, HTTPREQ_SetOption, HTTPREQ_WriteFile, + HTTPREQ_QueryDataAvailable, NULL }; @@ -2948,6 +2999,7 @@ static const HANDLEHEADERVtbl HTTPSESSIONVtbl = { NULL, NULL, NULL, + NULL, NULL }; diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index feda307..dcddfd2 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -476,6 +476,7 @@ static const HANDLEHEADERVtbl APPINFOVtbl = { NULL, NULL, NULL, + NULL, NULL }; @@ -2399,6 +2400,10 @@ static BOOL INET_QueryOptionHelper(BOOL bIsUnicode, HINTERNET hInternet, DWORD d INTERNET_SetLastError(ERROR_INVALID_PARAMETER); } break; + case 66: + FIXME("66\n"); + bSuccess = TRUE; + break; default: FIXME("Stub! %d\n", dwOption); break; @@ -2556,6 +2561,9 @@ BOOL WINAPI InternetSetOptionW(HINTERNET hInternet, DWORD dwOption, case INTERNET_OPTION_SECURITY_FLAGS: FIXME("Option INTERNET_OPTION_SECURITY_FLAGS; STUB\n"); break; + case 86: + FIXME("86\n"); + break; default: FIXME("Option %d STUB\n",dwOption); INTERNET_SetLastError(ERROR_INTERNET_INVALID_OPTION); @@ -3400,96 +3408,33 @@ lend: * INTERNET_STATUS_REQUEST_COMPLETE will be sent when more * data is available. */ -void AsyncInternetQueryDataAvailableProc(WORKREQUEST *workRequest) -{ - LPWININETHTTPREQW lpwhr; - INTERNET_ASYNC_RESULT iar; - char buffer[4048]; - - TRACE("INTERNETQUERYDATAAVAILABLE %p\n", workRequest->hdr); - - switch (workRequest->hdr->htype) - { - case WH_HHTTPREQ: - lpwhr = (LPWININETHTTPREQW)workRequest->hdr; - iar.dwResult = NETCON_recv(&lpwhr->netConnection, buffer, - min(sizeof(buffer), - lpwhr->dwContentLength - lpwhr->dwContentRead), - MSG_PEEK, (int *)&iar.dwError); - INTERNET_SendCallback(workRequest->hdr, workRequest->hdr->dwContext, - INTERNET_STATUS_REQUEST_COMPLETE, &iar, - sizeof(INTERNET_ASYNC_RESULT)); - break; - - default: - FIXME("unsupported file type\n"); - break; - } -} - BOOL WINAPI InternetQueryDataAvailable( HINTERNET hFile, LPDWORD lpdwNumberOfBytesAvailble, DWORD dwFlags, DWORD_PTR dwContext) { - LPWININETHTTPREQW lpwhr; - BOOL retval = FALSE; - char buffer[4048]; + WININETHANDLEHEADER *hdr; + DWORD res; - lpwhr = (LPWININETHTTPREQW) WININET_GetObject( hFile ); - if (NULL == lpwhr) - { - INTERNET_SetLastError(ERROR_NO_MORE_FILES); + TRACE("(%p %p %x %lx)\n", hFile, lpdwNumberOfBytesAvailble, dwFlags, dwContext); + + hdr = WININET_GetObject( hFile ); + if (!hdr) { + INTERNET_SetLastError(ERROR_INVALID_HANDLE); return FALSE; } - TRACE("--> %p %i\n",lpwhr,lpwhr->hdr.htype); - - switch (lpwhr->hdr.htype) - { - case WH_HHTTPREQ: - retval = TRUE; - if (NETCON_query_data_available(&lpwhr->netConnection, - lpdwNumberOfBytesAvailble) && - !*lpdwNumberOfBytesAvailble) - { - /* Even if we are in async mode, we need to determine whether - * there is actually more data available. We do this by trying - * to peek only a single byte in async mode. */ - BOOL async = (lpwhr->lpHttpSession->lpAppInfo->hdr.dwFlags & INTERNET_FLAG_ASYNC); - if (NETCON_recv(&lpwhr->netConnection, buffer, - min(async ? 1 : sizeof(buffer), - lpwhr->dwContentLength - lpwhr->dwContentRead), - MSG_PEEK, (int *)lpdwNumberOfBytesAvailble) && - async && *lpdwNumberOfBytesAvailble) - { - WORKREQUEST workRequest; - - *lpdwNumberOfBytesAvailble = 0; - workRequest.asyncproc = AsyncInternetQueryDataAvailableProc; - workRequest.hdr = WININET_AddRef( &lpwhr->hdr ); - - retval = INTERNET_AsyncCall(&workRequest); - if (!retval) - { - WININET_Release( &lpwhr->hdr ); - } - else - { - INTERNET_SetLastError(ERROR_IO_PENDING); - retval = FALSE; - } - } - } - break; - - default: - FIXME("unsupported file type\n"); - break; + if(hdr->vtbl->QueryDataAvailable) { + res = hdr->vtbl->QueryDataAvailable(hdr, lpdwNumberOfBytesAvailble, dwFlags, dwContext); + }else { + WARN("wrong handle\n"); + res = ERROR_INTERNET_INCORRECT_HANDLE_TYPE; } - WININET_Release( &lpwhr->hdr ); - TRACE("<-- %i\n",retval); - return retval; + WININET_Release(hdr); + + if(res != ERROR_SUCCESS) + SetLastError(res); + return res == ERROR_SUCCESS; } diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 3e95334..4cdab9f 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 (*QueryDataAvailable)(WININETHANDLEHEADER*,DWORD*,DWORD,DWORD_PTR); DWORD (*FindNextFileW)(WININETHANDLEHEADER*,void*); } HANDLEHEADERVtbl;

1 0

Alexandre Julliard : ntdll: Added definitions and structures for fiber local storage.
by Alexandre Julliard Feb. 29, 2008

Feb. 29, 2008

Module: wine Branch: master Commit: 6d6e9a42b13c827d1cc795c3b66da8c032374fff URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d6e9a42b13c827d1cc795c3b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 29 19:55:34 2008 +0100 ntdll: Added definitions and structures for fiber local storage. --- dlls/ntdll/server.c | 2 ++ dlls/ntdll/thread.c | 4 ++++ include/winternl.h | 22 ++++++++++++++++++++++ 3 files changed, 28 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 1eebef1..0211394 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -146,6 +146,8 @@ void server_exit_thread( int status ) RtlAcquirePebLock(); RemoveEntryList( &NtCurrentTeb()->TlsLinks ); RtlReleasePebLock(); + RtlFreeHeap( GetProcessHeap(), 0, NtCurrentTeb()->FlsSlots ); + RtlFreeHeap( GetProcessHeap(), 0, NtCurrentTeb()->TlsExpansionSlots ); info.stack_base = NtCurrentTeb()->DeallocationStack; info.teb_base = NtCurrentTeb(); diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 55cedc7..ff00f2e 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -63,6 +63,7 @@ static RTL_USER_PROCESS_PARAMETERS params; /* default parameters if no parent * static WCHAR current_dir[MAX_NT_PATH_LENGTH]; static RTL_BITMAP tls_bitmap; static RTL_BITMAP tls_expansion_bitmap; +static RTL_BITMAP fls_bitmap; static LIST_ENTRY tls_links; static size_t sigstack_total_size; static ULONG sigstack_zero_bits; @@ -255,6 +256,7 @@ HANDLE thread_init(void) peb->ProcessParameters = &params; peb->TlsBitmap = &tls_bitmap; peb->TlsExpansionBitmap = &tls_expansion_bitmap; + peb->FlsBitmap = &fls_bitmap; peb->LdrData = &ldr; params.CurrentDirectory.DosPath.Buffer = current_dir; params.CurrentDirectory.DosPath.MaximumLength = sizeof(current_dir); @@ -262,6 +264,8 @@ HANDLE thread_init(void) RtlInitializeBitMap( &tls_bitmap, peb->TlsBitmapBits, sizeof(peb->TlsBitmapBits) * 8 ); RtlInitializeBitMap( &tls_expansion_bitmap, peb->TlsExpansionBitmapBits, sizeof(peb->TlsExpansionBitmapBits) * 8 ); + RtlInitializeBitMap( &fls_bitmap, peb->FlsBitmapBits, sizeof(peb->FlsBitmapBits) * 8 ); + InitializeListHead( &peb->FlsListHead ); InitializeListHead( &ldr.InLoadOrderModuleList ); InitializeListHead( &ldr.InMemoryOrderModuleList ); InitializeListHead( &ldr.InInitializationOrderModuleList ); diff --git a/include/winternl.h b/include/winternl.h index 2ce9b2b..aa97934 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -275,6 +275,20 @@ typedef struct _PEB PRTL_BITMAP TlsExpansionBitmap; /* 150 */ ULONG TlsExpansionBitmapBits[32]; /* 154 */ ULONG SessionId; /* 1d4 */ + ULARGE_INTEGER AppCompatFlags; /* 1d8 */ + ULARGE_INTEGER AppCompatFlagsUser; /* 1e0 */ + PVOID ShimData; /* 1e8 */ + PVOID AppCompatInfo; /* 1ec */ + UNICODE_STRING CSDVersion; /* 1f0 */ + PVOID ActivationContextData; /* 1f8 */ + PVOID ProcessAssemblyStorageMap; /* 1fc */ + PVOID SystemDefaultActivationData; /* 200 */ + PVOID SystemAssemblyStorageMap; /* 204 */ + ULONG MinimumStackCommit; /* 208 */ + PVOID *FlsCallback; /* 20c */ + LIST_ENTRY FlsListHead; /* 210 */ + PRTL_BITMAP FlsBitmap; /* 218 */ + ULONG FlsBitmapBits[4]; /* 21c */ } PEB, *PPEB; @@ -343,6 +357,14 @@ typedef struct _TEB ULONG WaitingOnLoaderLock; /* f84 */ PVOID Reserved5[3]; /* f88 */ PVOID *TlsExpansionSlots; /* f94 */ + ULONG ImpersonationLocale; /* f98 */ + ULONG IsImpersonating; /* f9c */ + PVOID NlsCache; /* fa0 */ + PVOID ShimData; /* fa4 */ + ULONG HeapVirtualAffinity; /* fa8 */ + PVOID CurrentTransactionHandle; /* fac */ + PVOID ActiveFrame; /* fb0 */ + PVOID *FlsSlots; /* fb4 */ } TEB, *PTEB; # endif /* WINE_TEB_DEFINED */ #endif /* WINE_NO_TEB */

1 0

Alistair Leslie-Hughes : msxml3: Implemented IXMLDOMText substringData.
by Alexandre Julliard Feb. 29, 2008

Feb. 29, 2008

Module: wine Branch: master Commit: a7c9fbc65cc2ecf38ee4becfcd074fe2ae1fc9e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7c9fbc65cc2ecf38ee4becfc… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Feb 29 22:39:30 2008 +1100 msxml3: Implemented IXMLDOMText substringData. --- dlls/msxml3/tests/domdoc.c | 46 ++++++++++++++++++++++++++++++++++++++++++++ dlls/msxml3/text.c | 41 +++++++++++++++++++++++++++++++++++++- 2 files changed, 85 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 23fb1f3..bf4046b 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -592,6 +592,52 @@ static void test_domdoc( void ) ok( !lstrcmpW( str, _bstr_("This &is a ; test <>\\") ), "incorrect xml string\n"); SysFreeString(str); + /* test substringData */ + r = IXMLDOMText_substringData(nodetext, 0, 4, NULL); + ok(r == E_INVALIDARG, "ret %08x\n", r ); + + /* test substringData - Invalid offset */ + str = (BSTR)&szElement; + r = IXMLDOMText_substringData(nodetext, -1, 4, &str); + ok(r == E_INVALIDARG, "ret %08x\n", r ); + ok( str == NULL, "incorrect string\n"); + + /* test substringData - Invalid offset */ + str = (BSTR)&szElement; + r = IXMLDOMText_substringData(nodetext, 30, 0, &str); + ok(r == S_FALSE, "ret %08x\n", r ); + ok( str == NULL, "incorrect string\n"); + + /* test substringData - Invalid size */ + str = (BSTR)&szElement; + r = IXMLDOMText_substringData(nodetext, 0, -1, &str); + ok(r == E_INVALIDARG, "ret %08x\n", r ); + ok( str == NULL, "incorrect string\n"); + + /* test substringData - Invalid size */ + str = (BSTR)&szElement; + r = IXMLDOMText_substringData(nodetext, 2, 0, &str); + ok(r == S_FALSE, "ret %08x\n", r ); + ok( str == NULL, "incorrect string\n"); + + /* test substringData - Start of string */ + r = IXMLDOMText_substringData(nodetext, 0, 4, &str); + ok(r == S_OK, "ret %08x\n", r ); + ok( !lstrcmpW( str, _bstr_("This") ), "incorrect substringData string\n"); + SysFreeString(str); + + /* test substringData - Middle of string */ + r = IXMLDOMText_substringData(nodetext, 13, 4, &str); + ok(r == S_OK, "ret %08x\n", r ); + ok( !lstrcmpW( str, _bstr_("test") ), "incorrect substringData string\n"); + SysFreeString(str); + + /* test substringData - End of string */ + r = IXMLDOMText_substringData(nodetext, 20, 4, &str); + ok(r == S_OK, "ret %08x\n", r ); + ok( !lstrcmpW( str, _bstr_("\\") ), "incorrect substringData string\n"); + SysFreeString(str); + IXMLDOMText_Release( nodetext ); } SysFreeString( str ); diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index af91449..4821e63 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -539,8 +539,45 @@ static HRESULT WINAPI domtext_substringData( IXMLDOMText *iface, long offset, long count, BSTR *p) { - FIXME("\n"); - return E_NOTIMPL; + domtext *This = impl_from_IXMLDOMText( iface ); + xmlnode *pDOMNode = impl_from_IXMLDOMNode( (IXMLDOMNode*)This->element ); + xmlChar *pContent; + long nLength = 0; + HRESULT hr = S_FALSE; + + TRACE("%p\n", iface); + + if(!p) + return E_INVALIDARG; + + *p = NULL; + if(offset < 0 || count < 0) + return E_INVALIDARG; + + if(count == 0) + return hr; + + pContent = xmlNodeGetContent(pDOMNode->node); + if(pContent) + { + nLength = xmlStrlen(pContent); + + if( offset < nLength) + { + BSTR sContent = bstr_from_xmlChar(pContent); + if(offset + count > nLength) + *p = SysAllocString(&sContent[offset]); + else + *p = SysAllocStringLen(&sContent[offset], count); + + SysFreeString(sContent); + hr = S_OK; + } + + xmlFree(pContent); + } + + return hr; } static HRESULT WINAPI domtext_appendData(

1 0