February 2013 - Wine-commits

Ričardas Barkauskas : wined3d: Rename bsize to content_size to reflect usage.
by Alexandre Julliard 26 Feb '13

26 Feb '13

Module: wine Branch: master Commit: b5ff0a6983c2b732e90f86ae9e4d15a688aa78fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5ff0a6983c2b732e90f86ae9… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Mon Feb 25 22:49:29 2013 +0200 wined3d: Rename bsize to content_size to reflect usage. --- dlls/wined3d/arb_program_shader.c | 4 ++-- dlls/wined3d/shader.c | 16 ++++++++-------- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index e8da805..b069335 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -3890,7 +3890,7 @@ static GLuint shader_arb_generate_pshader(const struct wined3d_shader *shader, TRACE("Created hw pixel shader, prg=%d\n", retval); /* Create the program and check for errors */ GL_EXTCALL(glProgramStringARB(GL_FRAGMENT_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB, - buffer->bsize, buffer->buffer)); + buffer->content_size, buffer->buffer)); checkGLcall("glProgramStringARB()"); gl_info->gl_ops.gl.p_glGetIntegerv(GL_PROGRAM_ERROR_POSITION_ARB, &errPos); @@ -4303,7 +4303,7 @@ static GLuint shader_arb_generate_vshader(const struct wined3d_shader *shader, TRACE("Created hw vertex shader, prg=%d\n", ret); /* Create the program and check for errors */ GL_EXTCALL(glProgramStringARB(GL_VERTEX_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB, - buffer->bsize, buffer->buffer)); + buffer->content_size, buffer->buffer)); checkGLcall("glProgramStringARB()"); gl_info->gl_ops.gl.p_glGetIntegerv(GL_PROGRAM_ERROR_POSITION_ARB, &errPos); diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 2c65e71..0616f0a 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -238,7 +238,7 @@ static const struct wined3d_shader_frontend *shader_select_frontend(DWORD versio void shader_buffer_clear(struct wined3d_shader_buffer *buffer) { buffer->buffer[0] = '\0'; - buffer->bsize = 0; + buffer->content_size = 0; buffer->lineNo = 0; buffer->newline = TRUE; } @@ -263,22 +263,22 @@ void shader_buffer_free(struct wined3d_shader_buffer *buffer) int shader_vaddline(struct wined3d_shader_buffer *buffer, const char *format, va_list args) { - char *base = buffer->buffer + buffer->bsize; + char *base = buffer->buffer + buffer->content_size; int rc; - rc = vsnprintf(base, SHADER_PGMSIZE - 1 - buffer->bsize, format, args); + rc = vsnprintf(base, SHADER_PGMSIZE - 1 - buffer->content_size, format, args); - if (rc < 0 /* C89 */ || (unsigned int)rc > SHADER_PGMSIZE - 1 - buffer->bsize /* C99 */) + if (rc < 0 /* C89 */ || (unsigned int)rc > SHADER_PGMSIZE - 1 - buffer->content_size /* C99 */) { ERR("The buffer allocated for the shader program string " "is too small at %d bytes.\n", SHADER_PGMSIZE); - buffer->bsize = SHADER_PGMSIZE - 1; + buffer->content_size = SHADER_PGMSIZE - 1; return -1; } if (buffer->newline) { - TRACE("GL HW (%u, %u) : %s", buffer->lineNo + 1, buffer->bsize, base); + TRACE("GL HW (%u, %u) : %s", buffer->lineNo + 1, buffer->content_size, base); buffer->newline = FALSE; } else @@ -286,8 +286,8 @@ int shader_vaddline(struct wined3d_shader_buffer *buffer, const char *format, va TRACE("%s", base); } - buffer->bsize += rc; - if (buffer->buffer[buffer->bsize-1] == '\n') + buffer->content_size += rc; + if (buffer->buffer[buffer->content_size-1] == '\n') { ++buffer->lineNo; buffer->newline = TRUE; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 45f6b29..1e9a3a9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -407,7 +407,7 @@ enum wined3d_shader_rel_op struct wined3d_shader_buffer { char *buffer; - unsigned int bsize; + unsigned int content_size; unsigned int lineNo; BOOL newline; };

1 0

Ričardas Barkauskas : wined3d: Make shader buffer dynamic.
by Alexandre Julliard 26 Feb '13

26 Feb '13

Module: wine Branch: master Commit: cf12f51b1520546dc855e8e8e43135a06e7a0cbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf12f51b1520546dc855e8e8e… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Mon Feb 25 22:49:38 2013 +0200 wined3d: Make shader buffer dynamic. --- dlls/wined3d/shader.c | 28 +++++++++++++++++++++------- dlls/wined3d/wined3d_private.h | 3 ++- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 0616f0a..6444896 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -251,6 +251,7 @@ BOOL shader_buffer_init(struct wined3d_shader_buffer *buffer) ERR("Failed to allocate shader buffer memory.\n"); return FALSE; } + buffer->buffer_size = SHADER_PGMSIZE; shader_buffer_clear(buffer); return TRUE; @@ -265,15 +266,28 @@ int shader_vaddline(struct wined3d_shader_buffer *buffer, const char *format, va { char *base = buffer->buffer + buffer->content_size; int rc; + char *new_buffer; - rc = vsnprintf(base, SHADER_PGMSIZE - 1 - buffer->content_size, format, args); - - if (rc < 0 /* C89 */ || (unsigned int)rc > SHADER_PGMSIZE - 1 - buffer->content_size /* C99 */) + while(1) { - ERR("The buffer allocated for the shader program string " - "is too small at %d bytes.\n", SHADER_PGMSIZE); - buffer->content_size = SHADER_PGMSIZE - 1; - return -1; + rc = vsnprintf(base, buffer->buffer_size - buffer->content_size, format, args); + if (rc < 0 /* C89 */ || (unsigned int)rc >= buffer->buffer_size - buffer->content_size /* C99 */) + { + new_buffer = HeapReAlloc(GetProcessHeap(), 0, buffer->buffer, buffer->buffer_size * 2); + if (!new_buffer) + { + ERR("The buffer allocated for the shader program string is too small at %d bytes.\n", buffer->buffer_size); + buffer->content_size = buffer->buffer_size - 1; + return -1; + } + buffer->buffer = new_buffer; + buffer->buffer_size = buffer->buffer_size * 2; + base = buffer->buffer + buffer->content_size; + } + else + { + break; + } } if (buffer->newline) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1e9a3a9..b81e018 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -402,11 +402,12 @@ enum wined3d_shader_rel_op * Shader model 3 according to msdn (and for software shaders) */ #define MAX_LABELS 16 -#define SHADER_PGMSIZE 65535 +#define SHADER_PGMSIZE 16384 struct wined3d_shader_buffer { char *buffer; + unsigned int buffer_size; unsigned int content_size; unsigned int lineNo; BOOL newline;

1 0

Nikolay Sivov : wshom: Implement IWshShell3::Run().
by Alexandre Julliard 26 Feb '13

26 Feb '13

Module: wine Branch: master Commit: 5db4741d0b074ca0080adf36c3fdb440bf92f8d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5db4741d0b074ca0080adf36c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 26 10:48:00 2013 +0400 wshom: Implement IWshShell3::Run(). --- dlls/wshom.ocx/shell.c | 59 +++++++++++++++++++++++++++++++++++++++++++++-- include/shellapi.h | 1 + 2 files changed, 57 insertions(+), 3 deletions(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index 1973e2d..bc6a839 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -19,6 +19,7 @@ #include "wshom_private.h" #include "wshom.h" +#include "shellapi.h" #include "shlobj.h" #include "wine/debug.h" @@ -665,10 +666,62 @@ static HRESULT WINAPI WshShell3_get_Environment(IWshShell3 *iface, VARIANT *Type return E_NOTIMPL; } -static HRESULT WINAPI WshShell3_Run(IWshShell3 *iface, BSTR Command, VARIANT *WindowStyle, VARIANT *WaitOnReturn, int *out_ExitCode) +static HRESULT WINAPI WshShell3_Run(IWshShell3 *iface, BSTR cmd, VARIANT *style, VARIANT *WaitOnReturn, int *exit_code) { - FIXME("(%s %s %p): stub\n", debugstr_variant(WindowStyle), debugstr_variant(WaitOnReturn), out_ExitCode); - return E_NOTIMPL; + SHELLEXECUTEINFOW info; + int waitforprocess; + VARIANT s, w; + HRESULT hr; + + TRACE("(%s %s %s %p)\n", debugstr_w(cmd), debugstr_variant(style), debugstr_variant(WaitOnReturn), exit_code); + + VariantInit(&s); + hr = VariantChangeType(&s, style, 0, VT_I4); + if (FAILED(hr)) + { + ERR("failed to convert style argument, 0x%08x\n", hr); + return hr; + } + + VariantInit(&w); + hr = VariantChangeType(&w, WaitOnReturn, 0, VT_I4); + if (FAILED(hr)) + { + ERR("failed to convert wait argument, 0x%08x\n", hr); + return hr; + } + + memset(&info, 0, sizeof(info)); + info.cbSize = sizeof(info); + + waitforprocess = V_I4(&w); + + info.fMask = waitforprocess ? SEE_MASK_NOASYNC | SEE_MASK_NOCLOSEPROCESS : SEE_MASK_DEFAULT; + info.lpFile = cmd; + info.nShow = V_I4(&s); + + if (!ShellExecuteExW(&info)) + { + TRACE("ShellExecute failed, %d\n", GetLastError()); + return HRESULT_FROM_WIN32(GetLastError()); + } + else + { + if (waitforprocess) + { + if (exit_code) + { + DWORD code; + GetExitCodeProcess(info.hProcess, &code); + *exit_code = code; + } + CloseHandle(info.hProcess); + } + else + if (exit_code) *exit_code = 0; + + return S_OK; + } } static HRESULT WINAPI WshShell3_Popup(IWshShell3 *iface, BSTR Text, VARIANT* SecondsToWait, VARIANT *Title, VARIANT *Type, int *button) diff --git a/include/shellapi.h b/include/shellapi.h index d2b4081..acc345d 100644 --- a/include/shellapi.h +++ b/include/shellapi.h @@ -273,6 +273,7 @@ HINSTANCE WINAPI ShellExecuteW(HWND,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR,INT); #define SE_ERR_DDEBUSY 30 #define SE_ERR_NOASSOC 31 +#define SEE_MASK_DEFAULT 0x00000000 #define SEE_MASK_CLASSNAME 0x00000001 #define SEE_MASK_CLASSKEY 0x00000003 #define SEE_MASK_IDLIST 0x00000004

1 0

Huw Davies : riched20: Correctly set the row's x position.
by Alexandre Julliard 26 Feb '13

26 Feb '13

Module: wine Branch: master Commit: e68e6ff740211eb9cff1693b1384c7dd979e03bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=e68e6ff740211eb9cff1693b1… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 26 13:19:49 2013 +0000 riched20: Correctly set the row's x position. --- dlls/riched20/wrap.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 7c34876..9bebd8a 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -233,6 +233,7 @@ static void ME_InsertRowStart(ME_WrapContext *wc, const ME_DisplayItem *pEnd) shift = max((wc->nAvailWidth-width)/2, 0); if (align == PFA_RIGHT) shift = max(wc->nAvailWidth-width, 0); + row->member.row.pt.x = row->member.row.nLMargin + shift; for (p = wc->pRowStart; p!=pEnd; p = p->next) { if (p->type==diRun) { /* FIXME add more run types */

1 0

Huw Davies : riched20: Allow the cursor offset to be equal to the run length - this implies the cursor is at the end of the run , which isn't necessarily the start of the next.
by Alexandre Julliard 26 Feb '13

26 Feb '13

Module: wine Branch: master Commit: c5c4d54905b60e44cc1221e51a3d5a07450ebac9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5c4d54905b60e44cc1221e51… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 26 13:19:50 2013 +0000 riched20: Allow the cursor offset to be equal to the run length - this implies the cursor is at the end of the run, which isn't necessarily the start of the next. --- dlls/riched20/caret.c | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 82b8e1d..849e500 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -884,14 +884,10 @@ static BOOL ME_FindRunInRow(ME_TextEditor *editor, ME_DisplayItem *pRow, } if (x >= run_x && x < run_x+width) { - int ch = ME_CharFromPoint(editor, x-run_x, &pNext->member.run, TRUE); - if (ch < pNext->member.run.len) - { - cursor->nOffset = ch; - cursor->pRun = pNext; - cursor->pPara = ME_GetParagraph( cursor->pRun ); - return TRUE; - } + cursor->nOffset = ME_CharFromPoint(editor, x-run_x, &pNext->member.run, TRUE); + cursor->pRun = pNext; + cursor->pPara = ME_GetParagraph( cursor->pRun ); + return TRUE; } pLastRun = pNext; pNext = ME_FindItemFwd(pNext, diRunOrStartRow);

1 0

Huw Davies : riched20: Don' t assume the the runs in a row are in visual order.
by Alexandre Julliard 26 Feb '13

26 Feb '13

Module: wine Branch: master Commit: 5e5301273674c0c118aee70c44e553b9f1712d96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e5301273674c0c118aee70c4… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 26 13:19:51 2013 +0000 riched20: Don't assume the the runs in a row are in visual order. --- dlls/riched20/caret.c | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 849e500..b41ee9e 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -869,6 +869,14 @@ static BOOL ME_FindRunInRow(ME_TextEditor *editor, ME_DisplayItem *pRow, int x, ME_Cursor *cursor, int *pbCaretAtEnd) { ME_DisplayItem *pNext, *pLastRun; + ME_Row *row = &pRow->member.row; + BOOL exact = TRUE; + + if (x < row->pt.x) + { + x = row->pt.x; + exact = FALSE; + } pNext = ME_FindItemFwd(pRow, diRunOrStartRow); assert(pNext->type == diRun); if (pbCaretAtEnd) *pbCaretAtEnd = FALSE; @@ -876,18 +884,13 @@ static BOOL ME_FindRunInRow(ME_TextEditor *editor, ME_DisplayItem *pRow, do { int run_x = pNext->member.run.pt.x; int width = pNext->member.run.nWidth; - if (x < run_x) - { - cursor->pRun = pNext; - cursor->pPara = ME_GetParagraph( cursor->pRun ); - return FALSE; - } + if (x >= run_x && x < run_x+width) { cursor->nOffset = ME_CharFromPoint(editor, x-run_x, &pNext->member.run, TRUE); cursor->pRun = pNext; cursor->pPara = ME_GetParagraph( cursor->pRun ); - return TRUE; + return exact; } pLastRun = pNext; pNext = ME_FindItemFwd(pNext, diRunOrStartRow);

1 0

Jacek Caban : widl: Allow shadowing imported types with typedef.
by Alexandre Julliard 26 Feb '13

26 Feb '13

Module: wine Branch: master Commit: ed50ce5efe04b65c0fe5648d2c8622b493b074fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed50ce5efe04b65c0fe5648d2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 26 14:52:54 2013 +0100 widl: Allow shadowing imported types with typedef. --- tools/widl/parser.y | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index d8435b9..b7fa2f6 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1868,7 +1868,17 @@ static type_t *reg_typedefs(decl_spec_t *decl_spec, declarator_list_t *decls, at var_t *name; cur = find_type(decl->var->name, 0); - if (cur) + + /* + * MIDL allows shadowing types that are declared in imported files. + * We don't throw an error in this case and instead add a new type + * (which is earlier on the list in hash table, so it will be used + * instead of shadowed type). + * + * FIXME: We may consider string separated type tables for each input + * for cleaner solution. + */ + if (cur && input_name == cur->loc_info.input_name) error_loc("%s: redefinition error; original definition was at %s:%d\n", cur->name, cur->loc_info.input_name, cur->loc_info.line_number);

1 0

Jacek Caban : msctf.idl: Added some missing declarations.
by Alexandre Julliard 26 Feb '13

26 Feb '13

Module: wine Branch: master Commit: 99421e8c1dff5fdad4b00a68dea33f848e0994ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=99421e8c1dff5fdad4b00a68d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 26 14:53:05 2013 +0100 msctf.idl: Added some missing declarations. --- include/msctf.idl | 106 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 106 insertions(+), 0 deletions(-) diff --git a/include/msctf.idl b/include/msctf.idl index 2ed3866..a1a6f17 100644 --- a/include/msctf.idl +++ b/include/msctf.idl @@ -79,6 +79,9 @@ cpp_quote("#define TF_MOD_LSHIFT 0x0100") cpp_quote("#define TF_MOD_ON_KEYUP 0x0200") cpp_quote("#define TF_MOD_IGNORE_ALL_MODIFIER 0x0400") +cpp_quote("#define TF_PROFILETYPE_INPUTPROCESSOR 0x0001") +cpp_quote("#define TF_PROFILETYPE_KEYBOARDLAYOUT 0x0002") + interface ITfDocumentMgr; interface ITfContext; interface IEnumTfDocumentMgrs; @@ -99,6 +102,10 @@ interface ITfEditRecord; interface ITfCompositionView; interface ITfKeyEventSink; +cpp_quote("#if 0") +typedef [uuid(4f5d560f-5ab5-4dde-8c4d-404592857ab0)] UINT_PTR HKL; +cpp_quote("#endif") + typedef [uuid(e1b5808d-1e46-4c19-84dc-68c5f5978cc8)] struct TF_LANGUAGEPROFILE { CLSID clsid; @@ -421,6 +428,105 @@ interface ITfInputProcessorProfiles : IUnknown [in] HKL hKL); }; +typedef [uuid(44d2825a-10e5-43b2-877f-6cb2f43b7e7e)] +struct TF_INPUTPROCESSORPROFILE { + DWORD dwProfileType; + LANGID langid; + CLSID clsid; + GUID guidProfile; + GUID catid; + HKL hklSubstitute; + DWORD dwCaps; + HKL hkl; + DWORD dwFlags; +} TF_INPUTPROCESSORPROFILE; + +[ + object, + uuid(71c6e74d-0f28-11d8-a82a-00065b84435c), + pointer_default(unique) +] +interface IEnumTfInputProcessorProfiles : IUnknown +{ + HRESULT Clone( + [out] IEnumTfInputProcessorProfiles **ppEnum); + + HRESULT Next( + [in] ULONG ulCount, + [out, size_is(ulCount), length_is(*pcFetch)] TF_INPUTPROCESSORPROFILE *pProfile, + [out] ULONG *pcFetch); + + HRESULT Reset(); + + HRESULT Skip( + [in] ULONG ulCount); +} + +[ + object, + uuid(71c6e74c-0f28-11d8-a82a-00065b84435c), + pointer_default(unique) +] +interface ITfInputProcessorProfileMgr : IUnknown +{ + HRESULT ActivateProfile( + [in] DWORD dwProfileType, + [in] LANGID langid, + [in] REFCLSID clsid, + [in] REFGUID guidProfile, + [in] HKL hkl, + [in] DWORD dwFlags); + + HRESULT DeactivateProfile( + [in] DWORD dwProfileType, + [in] LANGID langid, + [in] REFCLSID clsid, + [in] REFGUID guidProfile, + [in] HKL hkl, + [in] DWORD dwFlags); + + HRESULT GetProfile( + [in] DWORD dwProfileType, + [in] LANGID langid, + [in] REFCLSID clsid, + [in] REFGUID guidProfile, + [in] HKL hkl, + [out] TF_INPUTPROCESSORPROFILE *pProfile); + + + HRESULT EnumProfiles( + [in] LANGID langid, + [out] IEnumTfInputProcessorProfiles **ppEnum); + + HRESULT ReleaseInputProcessor( + [in] REFCLSID rclsid, + [in] DWORD dwFlags); + + HRESULT RegisterProfile( + [in] REFCLSID rclsid, + [in] LANGID langid, + [in] REFGUID guidProfile, + [in, size_is(cchDesc)] const WCHAR *pchDesc, + [in] ULONG cchDesc, + [in, size_is(cchFile)] const WCHAR *pchIconFile, + [in] ULONG cchFile, + [in] ULONG uIconIndex, + [in] HKL hklsubstitute, + [in] DWORD dwPreferredLayout, + [in] BOOL bEnabledByDefault, + [in] DWORD dwFlags); + + HRESULT UnregisterProfile( + [in] REFCLSID rclsid, + [in] LANGID langid, + [in] REFGUID guidProfile, + [in] DWORD dwFlags); + + HRESULT GetActiveProfile( + [in] REFGUID catid, + [out] TF_INPUTPROCESSORPROFILE *pProfile); +} + typedef [uuid(c4cc07f1-80cc-4a7b-bc54-98512782cbe3)] enum { TF_LS_NONE = 0,

1 0

Jacek Caban : wininet: Don' t call get_avail_data multiple times in HTTP_ReceiveRequestData.
by Alexandre Julliard 26 Feb '13

26 Feb '13

Module: wine Branch: master Commit: 376a4f7837c3f50c49ea0704524db13449f9ccbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=376a4f7837c3f50c49ea07045… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 26 15:43:34 2013 +0100 wininet: Don't call get_avail_data multiple times in HTTP_ReceiveRequestData. --- dlls/wininet/http.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 81439ca..bbbfe97 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2774,10 +2774,8 @@ static void HTTP_ReceiveRequestData(http_request_t *req, BOOL first_notif, DWORD mode = first_notif && req->read_size ? READMODE_NOBLOCK : READMODE_ASYNC; res = refill_read_buffer(req, mode, &read); - if(res == ERROR_SUCCESS && !first_notif) + if(res == ERROR_SUCCESS) avail = get_avail_data(req); - if(ret_size) - *ret_size = get_avail_data(req); LeaveCriticalSection( &req->read_section ); @@ -2786,10 +2784,17 @@ static void HTTP_ReceiveRequestData(http_request_t *req, BOOL first_notif, DWORD http_release_netconn(req, FALSE); } - if(res == ERROR_SUCCESS) - send_request_complete(req, req->session->hdr.dwInternalFlags & INET_OPENURL ? (DWORD_PTR)req->hdr.hInternet : 1, avail); - else + if(res != ERROR_SUCCESS) { send_request_complete(req, 0, res); + return; + } + + if(ret_size) + *ret_size = avail; + if(first_notif) + avail = 0; + + send_request_complete(req, req->session->hdr.dwInternalFlags & INET_OPENURL ? (DWORD_PTR)req->hdr.hInternet : 1, avail); } /* read data from the http connection (the read section must be held) */

1 0

Jacek Caban : wininet: Moved dialog-related functions to dialog.c.
by Alexandre Julliard 26 Feb '13

26 Feb '13

Module: wine Branch: master Commit: 8ca611a598ea63697ea9b890c0bd4ccdb55529eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ca611a598ea63697ea9b890c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 26 15:43:44 2013 +0100 wininet: Moved dialog-related functions to dialog.c. --- dlls/wininet/dialogs.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/wininet/http.c | 46 ---------------------------------------------- 2 files changed, 46 insertions(+), 46 deletions(-) diff --git a/dlls/wininet/dialogs.c b/dlls/wininet/dialogs.c index 418610d..4acda13 100644 --- a/dlls/wininet/dialogs.c +++ b/dlls/wininet/dialogs.c @@ -37,6 +37,7 @@ #include "winerror.h" #define NO_SHLWAPI_STREAM #include "shlwapi.h" +#include "cryptuiapi.h" #include "internet.h" @@ -560,3 +561,48 @@ DWORD WINAPI InternetErrorDlg(HWND hWnd, HINTERNET hRequest, WININET_Release(&req->hdr); return res; } + +/*********************************************************************** + * InternetShowSecurityInfoByURLA (@) + */ +BOOL WINAPI InternetShowSecurityInfoByURLA(LPCSTR url, HWND window) +{ + FIXME("stub: %s %p\n", url, window); + return FALSE; +} + +/*********************************************************************** + * InternetShowSecurityInfoByURLW (@) + */ +BOOL WINAPI InternetShowSecurityInfoByURLW(LPCWSTR url, HWND window) +{ + FIXME("stub: %s %p\n", debugstr_w(url), window); + return FALSE; +} + +/*********************************************************************** + * ShowX509EncodedCertificate (@) + */ +DWORD WINAPI ShowX509EncodedCertificate(HWND parent, LPBYTE cert, DWORD len) +{ + PCCERT_CONTEXT certContext = CertCreateCertificateContext(X509_ASN_ENCODING, + cert, len); + DWORD ret; + + if (certContext) + { + CRYPTUI_VIEWCERTIFICATE_STRUCTW view; + + memset(&view, 0, sizeof(view)); + view.hwndParent = parent; + view.pCertContext = certContext; + if (CryptUIDlgViewCertificateW(&view, NULL)) + ret = ERROR_SUCCESS; + else + ret = GetLastError(); + CertFreeCertificateContext(certContext); + } + else + ret = GetLastError(); + return ret; +} diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index bbbfe97..861288d 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -66,7 +66,6 @@ #include "sspi.h" #include "wincrypt.h" #include "winuser.h" -#include "cryptuiapi.h" #include "internet.h" #include "wine/debug.h" @@ -6112,48 +6111,3 @@ BOOL WINAPI IsHostInProxyBypassList(DWORD flags, LPCSTR szHost, DWORD length) FIXME("STUB: flags=%d host=%s length=%d\n",flags,szHost,length); return FALSE; } - -/*********************************************************************** - * InternetShowSecurityInfoByURLA (@) - */ -BOOL WINAPI InternetShowSecurityInfoByURLA(LPCSTR url, HWND window) -{ - FIXME("stub: %s %p\n", url, window); - return FALSE; -} - -/*********************************************************************** - * InternetShowSecurityInfoByURLW (@) - */ -BOOL WINAPI InternetShowSecurityInfoByURLW(LPCWSTR url, HWND window) -{ - FIXME("stub: %s %p\n", debugstr_w(url), window); - return FALSE; -} - -/*********************************************************************** - * ShowX509EncodedCertificate (@) - */ -DWORD WINAPI ShowX509EncodedCertificate(HWND parent, LPBYTE cert, DWORD len) -{ - PCCERT_CONTEXT certContext = CertCreateCertificateContext(X509_ASN_ENCODING, - cert, len); - DWORD ret; - - if (certContext) - { - CRYPTUI_VIEWCERTIFICATE_STRUCTW view; - - memset(&view, 0, sizeof(view)); - view.hwndParent = parent; - view.pCertContext = certContext; - if (CryptUIDlgViewCertificateW(&view, NULL)) - ret = ERROR_SUCCESS; - else - ret = GetLastError(); - CertFreeCertificateContext(certContext); - } - else - ret = GetLastError(); - return ret; -}

1 0