January 2009 - Wine-commits

Dylan Smith : richedit: Fix implementation of handling Page Up/Down keys.
by Alexandre Julliard 16 Jan '09

16 Jan '09

Module: wine Branch: master Commit: 77a94bed984bcb19bb1b7b563537c72c63353a9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=77a94bed984bcb19bb1b7b563… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Jan 15 11:03:49 2009 -0500 richedit: Fix implementation of handling Page Up/Down keys. --- dlls/riched20/caret.c | 195 +++++++++++++++++++++++-------------------------- 1 files changed, 91 insertions(+), 104 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 3df8566..74c32a3 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -1338,132 +1338,119 @@ ME_MoveCursorLines(ME_TextEditor *editor, ME_Cursor *pCursor, int nRelOfs) assert(pCursor->pRun->type == diRun); } -static BOOL ME_UpdateSelection(ME_TextEditor *editor, const ME_Cursor *pTempCursor) +static void ME_ArrowPageUp(ME_TextEditor *editor, ME_Cursor *pCursor) { - ME_Cursor old_anchor = editor->pCursors[1]; + ME_DisplayItem *p = ME_FindItemFwd(editor->pBuffer->pFirst, diStartRow); - if (GetKeyState(VK_SHIFT)>=0) /* cancelling selection */ - { - /* any selection was present ? if so, it's no more, repaint ! */ - editor->pCursors[1] = editor->pCursors[0]; - if (memcmp(pTempCursor, &old_anchor, sizeof(ME_Cursor))) { - return TRUE; - } - return FALSE; - } - else + if (editor->vert_si.nPos < p->member.row.nHeight) { - if (!memcmp(pTempCursor, &editor->pCursors[1], sizeof(ME_Cursor))) /* starting selection */ - { - editor->pCursors[1] = *pTempCursor; - return TRUE; - } - } - - ME_Repaint(editor); - return TRUE; -} + pCursor->pRun = ME_FindItemFwd(editor->pBuffer->pFirst, diRun); + pCursor->nOffset = 0; + editor->bCaretAtEnd = FALSE; + /* Native clears seems to clear this x value on page up at the top + * of the text, but not on page down at the end of the text. + * Doesn't make sense, but we try to be bug for bug compatible. */ + editor->nUDArrowX = -1; + } else { + ME_DisplayItem *pRun = pCursor->pRun; + ME_DisplayItem *pLast; + int x, y, ys, yd, yp, yprev; + int yOldScrollPos = editor->vert_si.nPos; -static void ME_ArrowPageUp(ME_TextEditor *editor, ME_Cursor *pCursor) -{ - ME_DisplayItem *pRun = pCursor->pRun; - ME_DisplayItem *pLast, *p; - int x, y, ys, yd, yp, yprev; - ME_Cursor tmp_curs = *pCursor; + x = ME_GetXForArrow(editor, pCursor); + if (!pCursor->nOffset && editor->bCaretAtEnd) + pRun = ME_FindItemBack(pRun, diRun); - x = ME_GetXForArrow(editor, pCursor); - if (!pCursor->nOffset && editor->bCaretAtEnd) - pRun = ME_FindItemBack(pRun, diRun); + p = ME_FindItemBack(pRun, diStartRowOrParagraph); + assert(p->type == diStartRow); + yp = ME_FindItemBack(p, diParagraph)->member.para.pt.y; + yprev = ys = y = yp + p->member.row.pt.y; - p = ME_FindItemBack(pRun, diStartRowOrParagraph); - assert(p->type == diStartRow); - yp = ME_FindItemBack(p, diParagraph)->member.para.pt.y; - yprev = ys = y = yp + p->member.row.pt.y; - yd = y - editor->sizeWindow.cy; - pLast = p; + ME_ScrollUp(editor, editor->sizeWindow.cy); + /* Only move the cursor by the amount scrolled. */ + yd = y + editor->vert_si.nPos - yOldScrollPos; + pLast = p; - do { - p = ME_FindItemBack(p, diStartRowOrParagraph); - if (!p) - break; - if (p->type == diParagraph) { /* crossing paragraphs */ - if (p->member.para.prev_para == NULL) + do { + p = ME_FindItemBack(p, diStartRowOrParagraph); + if (!p) break; - yp = p->member.para.prev_para->member.para.pt.y; - continue; - } - y = yp + p->member.row.pt.y; - if (y < yd) - break; - pLast = p; - yprev = y; - } while(1); + if (p->type == diParagraph) { /* crossing paragraphs */ + if (p->member.para.prev_para == NULL) + break; + yp = p->member.para.prev_para->member.para.pt.y; + continue; + } + y = yp + p->member.row.pt.y; + if (y < yd) + break; + pLast = p; + yprev = y; + } while(1); - pCursor->pRun = ME_FindRunInRow(editor, pLast, x, &pCursor->nOffset, &editor->bCaretAtEnd); - ME_UpdateSelection(editor, &tmp_curs); - if (yprev < editor->sizeWindow.cy) - { - ME_Cursor startCursor = {ME_FindItemFwd(editor->pBuffer->pFirst, diRun), 0}; - ME_EnsureVisible(editor, &startCursor); - ME_Repaint(editor); - } - else - { - ME_ScrollUp(editor, ys-yprev); + pCursor->pRun = ME_FindRunInRow(editor, pLast, x, &pCursor->nOffset, + &editor->bCaretAtEnd); } assert(pCursor->pRun); assert(pCursor->pRun->type == diRun); } -/* FIXME: in the original RICHEDIT, PageDown always scrolls by the same amount - of pixels, even if it makes the scroll bar position exceed its normal maximum. - In such a situation, clicking the scrollbar restores its position back to the - normal range (ie. sets it to (doclength-screenheight)). */ - static void ME_ArrowPageDown(ME_TextEditor *editor, ME_Cursor *pCursor) { - ME_DisplayItem *pRun = pCursor->pRun; - ME_DisplayItem *pLast, *p; - int x, y, ys, yd, yp, yprev; - ME_Cursor tmp_curs = *pCursor; + ME_DisplayItem *pLast; + int x, y; + + /* Find y position of the last row */ + pLast = editor->pBuffer->pLast; + y = pLast->member.para.prev_para->member.para.pt.y + + ME_FindItemBack(pLast, diStartRow)->member.row.pt.y; x = ME_GetXForArrow(editor, pCursor); - if (!pCursor->nOffset && editor->bCaretAtEnd) - pRun = ME_FindItemBack(pRun, diRun); - p = ME_FindItemBack(pRun, diStartRowOrParagraph); - assert(p->type == diStartRow); - yp = ME_FindItemBack(p, diParagraph)->member.para.pt.y; - yprev = ys = y = yp + p->member.row.pt.y; - yd = y + editor->sizeWindow.cy; - pLast = p; + if (editor->vert_si.nPos >= y - editor->sizeWindow.cy) + { + pCursor->pRun = ME_FindItemBack(editor->pBuffer->pLast, diRun); + pCursor->nOffset = 0; + editor->bCaretAtEnd = FALSE; + } else { + ME_DisplayItem *pRun = pCursor->pRun; + ME_DisplayItem *p; + int ys, yd, yp, yprev; + int yOldScrollPos = editor->vert_si.nPos; - do { - p = ME_FindItemFwd(p, diStartRowOrParagraph); - if (!p) - break; - if (p->type == diParagraph) { - yp = p->member.para.pt.y; - continue; - } - y = yp + p->member.row.pt.y; - if (y >= yd) - break; + if (!pCursor->nOffset && editor->bCaretAtEnd) + pRun = ME_FindItemBack(pRun, diRun); + + p = ME_FindItemBack(pRun, diStartRowOrParagraph); + assert(p->type == diStartRow); + yp = ME_FindItemBack(p, diParagraph)->member.para.pt.y; + yprev = ys = y = yp + p->member.row.pt.y; + + /* For native richedit controls: + * v1.0 - v3.1 can only scroll down as far as the scrollbar lets us + * v4.1 can scroll past this position here. */ + ME_ScrollDown(editor, editor->sizeWindow.cy); + /* Only move the cursor by the amount scrolled. */ + yd = y + editor->vert_si.nPos - yOldScrollPos; pLast = p; - yprev = y; - } while(1); - pCursor->pRun = ME_FindRunInRow(editor, pLast, x, &pCursor->nOffset, &editor->bCaretAtEnd); - ME_UpdateSelection(editor, &tmp_curs); - if (yprev >= editor->nTotalLength-editor->sizeWindow.cy) - { - ME_Cursor endCursor = {ME_FindItemBack(editor->pBuffer->pLast, diRun), 0}; - ME_EnsureVisible(editor, &endCursor); - ME_Repaint(editor); - } - else - { - ME_ScrollUp(editor,ys-yprev); + do { + p = ME_FindItemFwd(p, diStartRowOrParagraph); + if (!p) + break; + if (p->type == diParagraph) { + yp = p->member.para.pt.y; + continue; + } + y = yp + p->member.row.pt.y; + if (y >= yd) + break; + pLast = p; + yprev = y; + } while(1); + + pCursor->pRun = ME_FindRunInRow(editor, pLast, x, &pCursor->nOffset, + &editor->bCaretAtEnd); } assert(pCursor->pRun); assert(pCursor->pRun->type == diRun);

1 0

Dylan Smith : richedit: Added tests for initial options.
by Alexandre Julliard 16 Jan '09

16 Jan '09

Module: wine Branch: master Commit: 9a902f358b4a911be5c54afa8f6f579a89d1d747 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a902f358b4a911be5c54afa8… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Jan 15 14:46:18 2009 -0500 richedit: Added tests for initial options. Using the WS_VSCROLL style causes the ES_AUTOVSCROLL option to be set, and using the WS_HSCROLL style causes the ES_AUTOHSCROLL flag to be set (except with richedit v1.0). --- dlls/riched20/tests/editor.c | 23 ++++++++++++++++++++++- dlls/riched32/tests/editor.c | 22 ++++++++++++++++++++++ 2 files changed, 44 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 5bbb613..11efb7b 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -1452,7 +1452,7 @@ static void test_EM_GETSELTEXT(void) /* FIXME: need to test unimplemented options and robustly test wparam */ static void test_EM_SETOPTIONS(void) { - HWND hwndRichEdit = new_richedit(NULL); + HWND hwndRichEdit; static const char text[] = "Hello. My name is RichEdit!"; char buffer[1024] = {0}; DWORD dwStyle, options, oldOptions; @@ -1460,6 +1460,27 @@ static void test_EM_SETOPTIONS(void) ES_READONLY|ES_WANTRETURN|ES_SAVESEL| ES_SELECTIONBAR|ES_VERTICAL; + /* Test initial options. */ + hwndRichEdit = CreateWindow(RICHEDIT_CLASS, NULL, WS_POPUP, + 0, 0, 200, 60, NULL, NULL, + hmoduleRichEdit, NULL); + ok(hwndRichEdit != NULL, "class: %s, error: %d\n", + RICHEDIT_CLASS, (int) GetLastError()); + options = SendMessage(hwndRichEdit, EM_GETOPTIONS, 0, 0); + ok(options == 0, "Incorrect initial options %x\n", options); + DestroyWindow(hwndRichEdit); + + hwndRichEdit = CreateWindow(RICHEDIT_CLASS, NULL, + WS_POPUP|WS_HSCROLL|WS_VSCROLL, + 0, 0, 200, 60, NULL, NULL, + hmoduleRichEdit, NULL); + ok(hwndRichEdit != NULL, "class: %s, error: %d\n", + RICHEDIT_CLASS, (int) GetLastError()); + options = SendMessage(hwndRichEdit, EM_GETOPTIONS, 0, 0); + /* WS_[VH]SCROLL cause the ECO_AUTO[VH]SCROLL options to be set */ + todo_wine ok(options == (ECO_AUTOVSCROLL|ECO_AUTOHSCROLL), + "Incorrect initial options %x\n", options); + /* NEGATIVE TESTING - NO OPTIONS SET */ SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) text); SendMessage(hwndRichEdit, EM_SETOPTIONS, ECOOP_SET, 0); diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index 5a3530d..ccac356 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -889,6 +889,27 @@ static void test_word_wrap(void) DestroyWindow(hwnd); } +static void test_EM_GETOPTIONS(void) +{ + HWND hwnd; + DWORD options; + + hwnd = CreateWindow(RICHEDIT_CLASS10A, NULL, + WS_POPUP, + 0, 0, 200, 60, NULL, NULL, hmoduleRichEdit, NULL); + options = SendMessage(hwnd, EM_GETOPTIONS, 0, 0); + ok(options == 0, "Incorrect options %x\n", options); + DestroyWindow(hwnd); + + hwnd = CreateWindow(RICHEDIT_CLASS10A, NULL, + WS_POPUP|WS_VSCROLL|WS_HSCROLL, + 0, 0, 200, 60, NULL, NULL, hmoduleRichEdit, NULL); + options = SendMessage(hwnd, EM_GETOPTIONS, 0, 0); + todo_wine ok(options == ECO_AUTOVSCROLL, + "Incorrect initial options %x\n", options); + DestroyWindow(hwnd); +} + static void test_autoscroll(void) { HWND hwnd; @@ -942,6 +963,7 @@ START_TEST( editor ) test_EM_FINDTEXT(); test_EM_POSFROMCHAR(); test_word_wrap(); + test_EM_GETOPTIONS(); test_autoscroll(); /* Set the environment variable WINETEST_RICHED32 to keep windows

1 0

Dylan Smith : richedit: Store an internal copy of the window style flags.
by Alexandre Julliard 16 Jan '09

16 Jan '09

Module: wine Branch: master Commit: 89f88a49a40905c0b1b977f802b4db741000041e URL: http://source.winehq.org/git/wine.git/?a=commit;h=89f88a49a40905c0b1b977f80… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Jan 15 14:46:25 2009 -0500 richedit: Store an internal copy of the window style flags. --- dlls/riched20/caret.c | 2 +- dlls/riched20/editor.c | 60 +++++++++++++++++++++++------------------- dlls/riched20/editstr.h | 1 + dlls/riched20/paint.c | 6 ++-- dlls/riched20/tests/editor.c | 12 ++++---- dlls/riched32/tests/editor.c | 4 +- 6 files changed, 46 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=89f88a49a40905c0b1b97…

1 0

Austin English : iphlpapi: Define RTF_MULTICAST if not available.
by Alexandre Julliard 16 Jan '09

16 Jan '09

Module: wine Branch: master Commit: 72fb5e62764c8b5153e5cb33bde6b74dd7df1602 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72fb5e62764c8b5153e5cb33b… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Jan 15 15:24:58 2009 -0600 iphlpapi: Define RTF_MULTICAST if not available. --- dlls/iphlpapi/ipstats.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 3fc91eb..85f91e2 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -130,6 +130,10 @@ #define TCPS_CLOSING 11 #endif +#ifndef RTF_MULTICAST +#define RTF_MULTICAST 0 /* Not available on NetBSD/OpenBSD */ +#endif + WINE_DEFAULT_DEBUG_CHANNEL(iphlpapi); DWORD getInterfaceStatsByName(const char *name, PMIB_IFROW entry)

1 0

Michael Stefaniuc : winejack.drv: Remove superflouous pointer casts.
by Alexandre Julliard 16 Jan '09

16 Jan '09

Module: wine Branch: master Commit: 8882cf0175a5b66063d402e817dd72077661aabe URL: http://source.winehq.org/git/wine.git/?a=commit;h=8882cf0175a5b66063d402e81… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jan 16 09:52:32 2009 +0100 winejack.drv: Remove superflouous pointer casts. --- dlls/winejack.drv/audio.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/winejack.drv/audio.c b/dlls/winejack.drv/audio.c index e503f86..2c44ed4 100644 --- a/dlls/winejack.drv/audio.c +++ b/dlls/winejack.drv/audio.c @@ -272,7 +272,7 @@ static DWORD bytes_to_mmtime(LPMMTIME lpTime, DWORD position, /* Length is in terms of 32 bit samples */ static void volume_effect32(void *buffer, int length, int left, int right) { - short *data = (short *)buffer; + short *data = buffer; int i, v; if (right == -1) right = left; @@ -360,15 +360,15 @@ static int JACK_callback_wwo (nframes_t nframes, void *arg) { sample_t* out_l; sample_t* out_r; - WINE_WAVEOUT* wwo = (WINE_WAVEOUT*)arg; + WINE_WAVEOUT* wwo = arg; TRACE("wDevID: %u, nframes %u state=%u\n", wwo->wDevID, nframes,wwo->state); if(!wwo->client) ERR("client is closed, this is weird...\n"); - - out_l = (sample_t *) fp_jack_port_get_buffer(wwo->out_port_l, nframes); - out_r = (sample_t *) fp_jack_port_get_buffer(wwo->out_port_r, nframes); + + out_l = fp_jack_port_get_buffer(wwo->out_port_l, nframes); + out_r = fp_jack_port_get_buffer(wwo->out_port_r, nframes); if(wwo->state == WINE_WS_PLAYING) { @@ -494,7 +494,7 @@ static int JACK_callback_wwo (nframes_t nframes, void *arg) */ static int JACK_bufsize_wwo (nframes_t nframes, void *arg) { - WINE_WAVEOUT* wwo = (WINE_WAVEOUT*)arg; + WINE_WAVEOUT* wwo = arg; DWORD buffer_required; TRACE("wDevID=%d\n",wwo->wDevID); TRACE("the maximum buffer size is now %u frames\n", nframes); @@ -562,7 +562,7 @@ static int JACK_srate (nframes_t nframes, void *arg) /* if this is called then jack shut down... handle this appropriately */ static void JACK_shutdown_wwo(void* arg) { - WINE_WAVEOUT* wwo = (WINE_WAVEOUT*)arg; + WINE_WAVEOUT* wwo = arg; wwo->client = 0; /* reset client */ @@ -582,7 +582,7 @@ static void JACK_shutdown_wwo(void* arg) /* if this is called then jack shut down... handle this appropriately */ static void JACK_shutdown_wwi(void* arg) { - WINE_WAVEIN* wwi = (WINE_WAVEIN*)arg; + WINE_WAVEIN* wwi = arg; wwi->client = 0; /* reset client */ @@ -1783,18 +1783,18 @@ static int JACK_callback_wwi (nframes_t nframes, void *arg) { sample_t* in_l; sample_t* in_r = 0; - WINE_WAVEIN* wwi = (WINE_WAVEIN*)arg; + WINE_WAVEIN* wwi = arg; TRACE("wDevID: %u, nframes %u\n", wwi->wDevID, nframes); if(!wwi->client) ERR("client is closed, this is weird...\n"); - - in_l = (sample_t *) fp_jack_port_get_buffer(wwi->in_port_l, nframes); + + in_l = fp_jack_port_get_buffer(wwi->in_port_l, nframes); if (wwi->in_port_r) - in_r = (sample_t *) fp_jack_port_get_buffer(wwi->in_port_r, nframes); - + in_r = fp_jack_port_get_buffer(wwi->in_port_r, nframes); + EnterCriticalSection(&wwi->access_crst); if((wwi->lpQueuePtr != NULL) && (wwi->state == WINE_WS_PLAYING))

1 0

Hans Leidekker : wininet: Implement InternetReadFileExW.
by Alexandre Julliard 16 Jan '09

16 Jan '09

Module: wine Branch: master Commit: b013ad168b6da81ae418ce5546941370296407db URL: http://source.winehq.org/git/wine.git/?a=commit;h=b013ad168b6da81ae418ce554… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 15 16:41:42 2009 +0100 wininet: Implement InternetReadFileExW. --- dlls/wininet/ftp.c | 2 + dlls/wininet/http.c | 70 +++++++++++++++++++++++++++++++++++++++++++++- dlls/wininet/internet.c | 41 +++++++++++++++------------ dlls/wininet/internet.h | 9 +++++- 4 files changed, 101 insertions(+), 21 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 21ce434..0289300 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -1267,6 +1267,7 @@ static const HANDLEHEADERVtbl FTPFILEVtbl = { NULL, FTPFILE_ReadFile, NULL, + NULL, FTPFILE_WriteFile, NULL, NULL @@ -3312,6 +3313,7 @@ static const HANDLEHEADERVtbl FTPFINDNEXTVtbl = { NULL, NULL, NULL, + NULL, FTPFINDNEXT_FindNextFileW }; diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index a5352e4..ea4e456 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1795,7 +1795,7 @@ static DWORD HTTPREQ_ReadFile(WININETHANDLEHEADER *hdr, void *buffer, DWORD size return HTTPREQ_Read(req, buffer, size, read, TRUE); } -static void HTTPREQ_AsyncReadFileExProc(WORKREQUEST *workRequest) +static void HTTPREQ_AsyncReadFileExAProc(WORKREQUEST *workRequest) { struct WORKREQ_INTERNETREADFILEEXA const *data = &workRequest->u.InternetReadFileExA; WININETHTTPREQW *req = (WININETHTTPREQW*)workRequest->hdr; @@ -1838,7 +1838,7 @@ static DWORD HTTPREQ_ReadFileExA(WININETHANDLEHEADER *hdr, INTERNET_BUFFERSA *bu { WORKREQUEST workRequest; - workRequest.asyncproc = HTTPREQ_AsyncReadFileExProc; + workRequest.asyncproc = HTTPREQ_AsyncReadFileExAProc; workRequest.hdr = WININET_AddRef(&req->hdr); workRequest.u.InternetReadFileExA.lpBuffersOut = buffers; @@ -1860,6 +1860,71 @@ static DWORD HTTPREQ_ReadFileExA(WININETHANDLEHEADER *hdr, INTERNET_BUFFERSA *bu return res; } +static void HTTPREQ_AsyncReadFileExWProc(WORKREQUEST *workRequest) +{ + struct WORKREQ_INTERNETREADFILEEXW const *data = &workRequest->u.InternetReadFileExW; + WININETHTTPREQW *req = (WININETHTTPREQW*)workRequest->hdr; + INTERNET_ASYNC_RESULT iar; + DWORD res; + + TRACE("INTERNETREADFILEEXW %p\n", workRequest->hdr); + + res = HTTPREQ_Read(req, data->lpBuffersOut->lpvBuffer, + data->lpBuffersOut->dwBufferLength, &data->lpBuffersOut->dwBufferLength, TRUE); + + iar.dwResult = res == ERROR_SUCCESS; + iar.dwError = res; + + INTERNET_SendCallback(&req->hdr, req->hdr.dwContext, + INTERNET_STATUS_REQUEST_COMPLETE, &iar, + sizeof(INTERNET_ASYNC_RESULT)); +} + +static DWORD HTTPREQ_ReadFileExW(WININETHANDLEHEADER *hdr, INTERNET_BUFFERSW *buffers, + DWORD flags, DWORD_PTR context) +{ + + WININETHTTPREQW *req = (WININETHTTPREQW*)hdr; + DWORD res; + + if (flags & ~(IRF_ASYNC|IRF_NO_WAIT)) + FIXME("these dwFlags aren't implemented: 0x%x\n", flags & ~(IRF_ASYNC|IRF_NO_WAIT)); + + if (buffers->dwStructSize != sizeof(*buffers)) + return ERROR_INVALID_PARAMETER; + + INTERNET_SendCallback(&req->hdr, req->hdr.dwContext, INTERNET_STATUS_RECEIVING_RESPONSE, NULL, 0); + + if (hdr->dwFlags & INTERNET_FLAG_ASYNC) { + DWORD available = 0; + + NETCON_query_data_available(&req->netConnection, &available); + if (!available) + { + WORKREQUEST workRequest; + + workRequest.asyncproc = HTTPREQ_AsyncReadFileExWProc; + workRequest.hdr = WININET_AddRef(&req->hdr); + workRequest.u.InternetReadFileExW.lpBuffersOut = buffers; + + INTERNET_AsyncCall(&workRequest); + + return ERROR_IO_PENDING; + } + } + + res = HTTPREQ_Read(req, buffers->lpvBuffer, buffers->dwBufferLength, &buffers->dwBufferLength, + !(flags & IRF_NO_WAIT)); + + if (res == ERROR_SUCCESS) { + DWORD size = buffers->dwBufferLength; + INTERNET_SendCallback(&req->hdr, req->hdr.dwContext, INTERNET_STATUS_RESPONSE_RECEIVED, + &size, sizeof(size)); + } + + return res; +} + static BOOL HTTPREQ_WriteFile(WININETHANDLEHEADER *hdr, const void *buffer, DWORD size, DWORD *written) { LPWININETHTTPREQW lpwhr = (LPWININETHTTPREQW)hdr; @@ -1915,6 +1980,7 @@ static const HANDLEHEADERVtbl HTTPREQVtbl = { HTTPREQ_SetOption, HTTPREQ_ReadFile, HTTPREQ_ReadFileExA, + HTTPREQ_ReadFileExW, HTTPREQ_WriteFile, HTTPREQ_QueryDataAvailable, NULL diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 03e9e74..6f67c3d 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2005,29 +2005,34 @@ BOOL WINAPI InternetReadFileExA(HINTERNET hFile, LPINTERNET_BUFFERSA lpBuffersOu /*********************************************************************** * InternetReadFileExW (WININET.@) - * - * Read data from an open internet file. - * - * PARAMS - * hFile [I] Handle returned by InternetOpenUrl() or HttpOpenRequest(). - * lpBuffersOut [I/O] Buffer. - * dwFlags [I] Flags. - * dwContext [I] Context for callbacks. - * - * RETURNS - * FALSE, last error is set to ERROR_CALL_NOT_IMPLEMENTED - * - * NOTES - * Not implemented in Wine or native either (as of IE6 SP2). - * + * SEE + * InternetReadFileExA() */ BOOL WINAPI InternetReadFileExW(HINTERNET hFile, LPINTERNET_BUFFERSW lpBuffer, DWORD dwFlags, DWORD_PTR dwContext) { - ERR("(%p, %p, 0x%x, 0x%lx): not implemented in native\n", hFile, lpBuffer, dwFlags, dwContext); + LPWININETHANDLEHEADER hdr; + DWORD res = ERROR_INTERNET_INCORRECT_HANDLE_TYPE; + + TRACE("(%p %p 0x%x 0x%lx)\n", hFile, lpBuffer, dwFlags, dwContext); - INTERNET_SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + hdr = WININET_GetObject(hFile); + if (!hdr) { + INTERNET_SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + + if(hdr->vtbl->ReadFileExW) + res = hdr->vtbl->ReadFileExW(hdr, lpBuffer, dwFlags, dwContext); + + WININET_Release(hdr); + + TRACE("-- %s (%u, bytes read: %d)\n", res == ERROR_SUCCESS ? "TRUE": "FALSE", + res, lpBuffer->dwBufferLength); + + if(res != ERROR_SUCCESS) + SetLastError(res); + return res == ERROR_SUCCESS; } DWORD INET_QueryOption(DWORD option, void *buffer, DWORD *size, BOOL unicode) diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 8de85ff..dc57214 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -124,6 +124,7 @@ typedef struct { DWORD (*SetOption)(WININETHANDLEHEADER*,DWORD,void*,DWORD); DWORD (*ReadFile)(WININETHANDLEHEADER*,void*,DWORD,DWORD*); DWORD (*ReadFileExA)(WININETHANDLEHEADER*,INTERNET_BUFFERSA*,DWORD,DWORD_PTR); + DWORD (*ReadFileExW)(WININETHANDLEHEADER*,INTERNET_BUFFERSW*,DWORD,DWORD_PTR); BOOL (*WriteFile)(WININETHANDLEHEADER*,const void*,DWORD,DWORD*); DWORD (*QueryDataAvailable)(WININETHANDLEHEADER*,DWORD*,DWORD,DWORD_PTR); DWORD (*FindNextFileW)(WININETHANDLEHEADER*,void*); @@ -311,6 +312,11 @@ struct WORKREQ_INTERNETREADFILEEXA LPINTERNET_BUFFERSA lpBuffersOut; }; +struct WORKREQ_INTERNETREADFILEEXW +{ + LPINTERNET_BUFFERSW lpBuffersOut; +}; + typedef struct WORKREQ { void (*asyncproc)(struct WORKREQ*); @@ -330,8 +336,9 @@ typedef struct WORKREQ struct WORKREQ_FTPFINDNEXTW FtpFindNextW; struct WORKREQ_HTTPSENDREQUESTW HttpSendRequestW; struct WORKREQ_SENDCALLBACK SendCallback; - struct WORKREQ_INTERNETOPENURLW InternetOpenUrlW; + struct WORKREQ_INTERNETOPENURLW InternetOpenUrlW; struct WORKREQ_INTERNETREADFILEEXA InternetReadFileExA; + struct WORKREQ_INTERNETREADFILEEXW InternetReadFileExW; } u; } WORKREQUEST, *LPWORKREQUEST;

1 0

Alexandre Julliard : user32/tests: Fix some more failures in the message test.
by Alexandre Julliard 16 Jan '09

16 Jan '09

Module: wine Branch: master Commit: 7551797bc4cdfae5f57d8ae6ab9b237da6a7196b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7551797bc4cdfae5f57d8ae6a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 16 12:33:07 2009 +0100 user32/tests: Fix some more failures in the message test. --- dlls/user32/tests/msg.c | 94 ++++++++++++++++++++++++++++------------------- 1 files changed, 56 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7551797bc4cdfae5f57d8…

1 0

Alexandre Julliard : winebuild: Add -m32/-m64 options to allow 32/ 64-bit cross-compiles.
by Alexandre Julliard 16 Jan '09

16 Jan '09

Module: wine Branch: master Commit: 07f77c41488c5626c56b6c06babb18303a910658 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07f77c41488c5626c56b6c06b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 15 21:17:51 2009 +0100 winebuild: Add -m32/-m64 options to allow 32/64-bit cross-compiles. --- configure | 7 ++++++- configure.ac | 3 +++ tools/winebuild/build.h | 1 + tools/winebuild/main.c | 22 ++++++++++++++++++++++ tools/winebuild/winebuild.man.in | 3 +++ 5 files changed, 35 insertions(+), 1 deletions(-) diff --git a/configure b/configure index 6e721f7..3f0e4bd 100755 --- a/configure +++ b/configure @@ -745,10 +745,10 @@ X_PRE_LIBS X_CFLAGS CPP XMKMF -TARGETFLAGS TOOLSDIR WIN16_INSTALL WIN16_FILES +TARGETFLAGS CPPBIN ac_ct_CXX CXXFLAGS @@ -3867,6 +3867,11 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ AS="${AS:-as} --32" host_cpu="i386" notice_platform="32-bit " + TARGETFLAGS="-m32" + + else + TARGETFLAGS="-m64" + fi ;; esac diff --git a/configure.ac b/configure.ac index 63ac5aa..72f93b7 100644 --- a/configure.ac +++ b/configure.ac @@ -113,6 +113,9 @@ case $host in AS="${AS:-as} --32" host_cpu="i386" notice_platform="32-bit " + AC_SUBST(TARGETFLAGS,"-m32") + else + AC_SUBST(TARGETFLAGS,"-m64") fi ;; esac diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index 45c75f7..0ee7bde 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -231,6 +231,7 @@ extern int kill_at; extern int verbose; extern int save_temps; extern int link_ext_symbols; +extern int force_pointer_size; extern char *input_file_name; extern char *spec_file_name; diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index e88522f..126b999 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -48,6 +48,7 @@ int kill_at = 0; int verbose = 0; int save_temps = 0; int link_ext_symbols = 0; +int force_pointer_size = 0; #ifdef __i386__ enum target_cpu target_cpu = CPU_x86; @@ -240,6 +241,7 @@ static const char usage_str[] = " --ld-cmd=LD Command to use for linking (default: ld)\n" " -l, --library=LIB Import the specified library\n" " -L, --library-path=DIR Look for imports libraries in DIR\n" +" -m32, -m64 Force building 32-bit resp. 64-bit code\n" " -M, --main-module=MODULE Set the name of the main module for a Win16 dll\n" " --nm-cmd=NM Command to use to get undefined symbols (default: nm)\n" " --nxcompat=y|n Set the NX compatibility flag (default: yes)\n" @@ -365,6 +367,12 @@ static char **parse_options( int argc, char **argv, DLLSPEC *spec ) lib_path = xrealloc( lib_path, (nb_lib_paths+1) * sizeof(*lib_path) ); lib_path[nb_lib_paths++] = xstrdup( optarg ); break; + case 'm': + if (strcmp( optarg, "32" ) && strcmp( optarg, "64" )) + fatal_error( "Invalid -m option '%s', expected -m32 or -m64\n", optarg ); + if (!strcmp( optarg, "32" )) force_pointer_size = 4; + else force_pointer_size = 8; + break; case 'M': spec->type = SPEC_WIN16; break; @@ -490,6 +498,20 @@ static char **parse_options( int argc, char **argv, DLLSPEC *spec ) if (spec->file_name && !strchr( spec->file_name, '.' )) strcat( spec->file_name, exec_mode == MODE_EXE ? ".exe" : ".dll" ); + switch (target_cpu) + { + case CPU_x86: + if (force_pointer_size == 8) target_cpu = CPU_x86_64; + break; + case CPU_x86_64: + if (force_pointer_size == 4) target_cpu = CPU_x86; + break; + default: + if (force_pointer_size == 8) + fatal_error( "Cannot build 64-bit code for this CPU\n" ); + break; + } + return &argv[optind]; } diff --git a/tools/winebuild/winebuild.man.in b/tools/winebuild/winebuild.man.in index 08e8d1b..d8bc569 100644 --- a/tools/winebuild/winebuild.man.in +++ b/tools/winebuild/winebuild.man.in @@ -143,6 +143,9 @@ Import the specified library, looking for a corresponding \fIlibname.def\fR file in the directories specified with the \fB-L\fR option. .TP +.B \-m32, -m64 +Generate 32-bit, respectively 64-bit code. +.TP .BI \-M,\ --main-module= module Specify that we are building a 16-bit dll, that will ultimately be linked together with the 32-bit dll specified in \fImodule\fR. Only

1 0

Alexandre Julliard : server: Set stderr in line-buffered mode before doing anything else.
by Alexandre Julliard 16 Jan '09

16 Jan '09

Module: wine Branch: master Commit: 64e6ee5cd8bf7ad25e32d76655220d5fd8424d75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64e6ee5cd8bf7ad25e32d7665… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 16 12:32:26 2009 +0100 server: Set stderr in line-buffered mode before doing anything else. --- server/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/server/main.c b/server/main.c index a7dfc1c..dd5ed53 100644 --- a/server/main.c +++ b/server/main.c @@ -126,6 +126,7 @@ static void sigterm_handler( int signum ) int main( int argc, char *argv[] ) { + setvbuf( stderr, NULL, _IOLBF, 0 ); parse_args( argc, argv ); /* setup temporary handlers before the real signal initialization is done */ @@ -138,7 +139,6 @@ int main( int argc, char *argv[] ) sock_init(); open_master_socket(); - setvbuf( stderr, NULL, _IOLBF, 0 ); if (debug_level) fprintf( stderr, "wineserver: starting (pid=%ld)\n", (long) getpid() ); init_signals();

1 0

Hans Leidekker : shell32: Implement GUIDFromStringW.
by Alexandre Julliard 15 Jan '09

15 Jan '09

Module: wine Branch: master Commit: 2d15dd54c624f41a32e96697f8008f5f6c2962da URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d15dd54c624f41a32e96697f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 15 09:59:29 2009 +0100 shell32: Implement GUIDFromStringW. --- dlls/shell32/shell32.spec | 2 ++ dlls/shell32/shellord.c | 12 ++++++++++++ 2 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index f852e7c..396227c 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -253,6 +253,8 @@ 660 stdcall -noname FileIconInit(long) 680 stdcall -noname IsUserAdmin() + 704 stdcall -noname GUIDFromStringW(wstr ptr) + 714 stdcall @(ptr) SHELL32_714 # PathIsTemporaryW 730 stdcall -noname RestartDialogEx(long wstr long long) diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index 5622484..51d6fc9 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -33,6 +33,7 @@ #include "winreg.h" #include "wine/debug.h" #include "winnls.h" +#include "winternl.h" #include "shellapi.h" #include "objbase.h" @@ -1528,6 +1529,17 @@ BOOL WINAPI shell32_243(DWORD a, DWORD b) } /************************************************************************* + * GUIDFromStringW [SHELL32.704] + */ +BOOL WINAPI GUIDFromStringW(LPCWSTR str, LPGUID guid) +{ + UNICODE_STRING guid_str; + + RtlInitUnicodeString(&guid_str, str); + return !RtlGUIDFromString(&guid_str, guid); +} + +/************************************************************************* * @ [SHELL32.714] */ DWORD WINAPI SHELL32_714(LPVOID x)

1 0