wine-commits October 2019

wine-commits@winehq.org

2 participants
614 discussions

Paul Gofman : wined3d: Upload 3d GL textures per-slice when conversion is involved.
by Alexandre Julliard 18 Oct '19

18 Oct '19

Module: wine Branch: master Commit: 06909230c42e5e9533a2d75ef54cb91b0efc1ff4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=06909230c42e5e9533a2d75e… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Oct 3 23:36:55 2019 +0300 wined3d: Upload 3d GL textures per-slice when conversion is involved. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 62 +++++++++++++++++++++++++++----------------------- 1 file changed, 33 insertions(+), 29 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index d103581b8d..17b71c5738 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1975,8 +1975,6 @@ static void wined3d_texture_gl_upload_data(struct wined3d_context *context, unsigned int update_h = src_box->bottom - src_box->top; unsigned int update_d = src_box->back - src_box->front; struct wined3d_bo_address bo; - void *converted_mem = NULL; - struct wined3d_format_gl f; unsigned int level; BOOL decompress; GLenum target; @@ -2050,7 +2048,10 @@ static void wined3d_texture_gl_upload_data(struct wined3d_context *context, { const struct wined3d_format *compressed_format = src_format; unsigned int dst_row_pitch, dst_slice_pitch; - void *src_mem; + struct wined3d_format_gl f; + void *converted_mem; + unsigned int z; + BYTE *src_mem; if (decompress) { @@ -2068,9 +2069,7 @@ static void wined3d_texture_gl_upload_data(struct wined3d_context *context, wined3d_format_calculate_pitch(src_format, 1, update_w, update_h, &dst_row_pitch, &dst_slice_pitch); - /* Note that uploading 3D textures may require quite some address - * space; it may make sense to upload them per-slice instead. */ - if (!(converted_mem = heap_calloc(update_d, dst_slice_pitch))) + if (!(converted_mem = heap_alloc(dst_slice_pitch))) { ERR("Failed to allocate upload buffer.\n"); return; @@ -2078,35 +2077,40 @@ static void wined3d_texture_gl_upload_data(struct wined3d_context *context, src_mem = wined3d_context_gl_map_bo_address(context_gl, &bo, src_slice_pitch * update_d, GL_PIXEL_UNPACK_BUFFER, WINED3D_MAP_READ); - if (decompress) - compressed_format->decompress(src_mem, converted_mem, src_row_pitch, src_slice_pitch, - dst_row_pitch, dst_slice_pitch, update_w, update_h, update_d); - else - src_format->upload(src_mem, converted_mem, src_row_pitch, src_slice_pitch, - dst_row_pitch, dst_slice_pitch, update_w, update_h, update_d); - wined3d_context_gl_unmap_bo_address(context_gl, &bo, GL_PIXEL_UNPACK_BUFFER, 0, NULL); - bo.buffer_object = 0; - bo.addr = converted_mem; - src_row_pitch = dst_row_pitch; - src_slice_pitch = dst_slice_pitch; - } + for (z = 0; z < update_d; ++z, src_mem += src_slice_pitch) + { + if (decompress) + compressed_format->decompress(src_mem, converted_mem, src_row_pitch, src_slice_pitch, + dst_row_pitch, dst_slice_pitch, update_w, update_h, 1); + else + src_format->upload(src_mem, converted_mem, src_row_pitch, src_slice_pitch, + dst_row_pitch, dst_slice_pitch, update_w, update_h, 1); - if (bo.buffer_object) - { - GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, bo.buffer_object)); - checkGLcall("glBindBuffer"); + wined3d_texture_gl_upload_bo(src_format, target, level, dst_row_pitch, dst_x, dst_y, + dst_z + z, update_w, update_h, 1, converted_mem, srgb, dst_texture, gl_info); + } + + wined3d_context_gl_unmap_bo_address(context_gl, &bo, GL_PIXEL_UNPACK_BUFFER, 0, NULL); + heap_free(converted_mem); } + else + { + if (bo.buffer_object) + { + GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, bo.buffer_object)); + checkGLcall("glBindBuffer"); + } - wined3d_texture_gl_upload_bo(src_format, target, level, src_row_pitch, dst_x, dst_y, - dst_z, update_w, update_h, update_d, bo.addr, srgb, dst_texture, gl_info); + wined3d_texture_gl_upload_bo(src_format, target, level, src_row_pitch, dst_x, dst_y, + dst_z, update_w, update_h, update_d, bo.addr, srgb, dst_texture, gl_info); - if (bo.buffer_object) - { - GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0)); - checkGLcall("glBindBuffer"); + if (bo.buffer_object) + { + GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0)); + checkGLcall("glBindBuffer"); + } } - heap_free(converted_mem); if (gl_info->quirks & WINED3D_QUIRK_FBO_TEX_UPDATE) {

1 0

Paul Gofman : wined3d: Pass correct map size in wined3d_texture_gl_upload_data().
by Alexandre Julliard 18 Oct '19

18 Oct '19

Module: wine Branch: master Commit: b7d2ba9d8f42d62ca3e179d0a6d990961d1e0657 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7d2ba9d8f42d62ca3e179d0… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Oct 3 23:36:54 2019 +0300 wined3d: Pass correct map size in wined3d_texture_gl_upload_data(). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index dd61ac8ae1..d103581b8d 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2077,7 +2077,7 @@ static void wined3d_texture_gl_upload_data(struct wined3d_context *context, } src_mem = wined3d_context_gl_map_bo_address(context_gl, &bo, - src_slice_pitch, GL_PIXEL_UNPACK_BUFFER, WINED3D_MAP_READ); + src_slice_pitch * update_d, GL_PIXEL_UNPACK_BUFFER, WINED3D_MAP_READ); if (decompress) compressed_format->decompress(src_mem, converted_mem, src_row_pitch, src_slice_pitch, dst_row_pitch, dst_slice_pitch, update_w, update_h, update_d);

1 0

Paul Gofman : wined3d: Factor out wined3d_texture_gl_upload_bo() function.
by Alexandre Julliard 18 Oct '19

18 Oct '19

Module: wine Branch: master Commit: 7474d665beaa9a1759c95744ea7d43d4673c6bd5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7474d665beaa9a1759c95744… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Oct 3 23:36:53 2019 +0300 wined3d: Factor out wined3d_texture_gl_upload_bo() function. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 231 +++++++++++++++++++++++++------------------------ 1 file changed, 120 insertions(+), 111 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7474d665beaa9a1759c9…

1 0

Zebediah Figura : strmbase: Get rid of the unused "lock" parameter to BaseControlWindow_Init().
by Alexandre Julliard 18 Oct '19

18 Oct '19

Module: wine Branch: master Commit: 3f7fdcfd63335d796c3cf0e47cba846cd0296540 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f7fdcfd63335d796c3cf0e4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Oct 18 10:01:49 2019 -0500 strmbase: Get rid of the unused "lock" parameter to BaseControlWindow_Init(). We don't use a lock, and while it's true we probably should be, we already have access to one. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/videorenderer.c | 6 +++--- dlls/quartz/vmr9.c | 5 ++--- dlls/strmbase/window.c | 5 ++--- include/wine/strmbase.h | 5 ++--- 4 files changed, 9 insertions(+), 12 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index db5ee0fbf4..a11c2047a6 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -846,9 +846,9 @@ HRESULT VideoRenderer_create(IUnknown *outer, void **out) if (FAILED(hr)) goto fail; - hr = BaseControlWindow_Init(&pVideoRenderer->baseControlWindow, &IVideoWindow_VTable, - &pVideoRenderer->renderer.filter, &pVideoRenderer->renderer.filter.csFilter, - &pVideoRenderer->renderer.sink.pin, &renderer_BaseWindowFuncTable); + hr = strmbase_window_init(&pVideoRenderer->baseControlWindow, &IVideoWindow_VTable, + &pVideoRenderer->renderer.filter, &pVideoRenderer->renderer.sink.pin, + &renderer_BaseWindowFuncTable); if (FAILED(hr)) goto fail; diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 59a5152cf5..c3b948f599 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -2251,9 +2251,8 @@ static HRESULT vmr_create(IUnknown *outer, void **out, const CLSID *clsid) if (FAILED(hr)) goto fail; - hr = BaseControlWindow_Init(&pVMR->baseControlWindow, &IVideoWindow_VTable, - &pVMR->renderer.filter, &pVMR->renderer.filter.csFilter, - &pVMR->renderer.sink.pin, &renderer_BaseWindowFuncTable); + hr = strmbase_window_init(&pVMR->baseControlWindow, &IVideoWindow_VTable, + &pVMR->renderer.filter, &pVMR->renderer.sink.pin, &renderer_BaseWindowFuncTable); if (FAILED(hr)) goto fail; diff --git a/dlls/strmbase/window.c b/dlls/strmbase/window.c index 23f37de52b..be6646c27a 100644 --- a/dlls/strmbase/window.c +++ b/dlls/strmbase/window.c @@ -144,9 +144,9 @@ HRESULT WINAPI BaseWindowImpl_DoneWithWindow(BaseWindow *This) return S_OK; } -HRESULT WINAPI BaseControlWindow_Init(BaseControlWindow *pControlWindow, +HRESULT WINAPI strmbase_window_init(BaseControlWindow *pControlWindow, const IVideoWindowVtbl *lpVtbl, struct strmbase_filter *owner, - CRITICAL_SECTION *lock, struct strmbase_pin *pPin, const BaseWindowFuncTable *pFuncsTable) + struct strmbase_pin *pPin, const BaseWindowFuncTable *pFuncsTable) { HRESULT hr; @@ -158,7 +158,6 @@ HRESULT WINAPI BaseControlWindow_Init(BaseControlWindow *pControlWindow, pControlWindow->hwndDrain = NULL; pControlWindow->hwndOwner = NULL; pControlWindow->pFilter = owner; - pControlWindow->pInterfaceLock = lock; pControlWindow->pPin = pPin; } return hr; diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 5be7caa371..74c8f4721b 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -403,12 +403,11 @@ typedef struct tagBaseControlWindow HWND hwndDrain; HWND hwndOwner; struct strmbase_filter *pFilter; - CRITICAL_SECTION* pInterfaceLock; struct strmbase_pin *pPin; } BaseControlWindow; -HRESULT WINAPI BaseControlWindow_Init(BaseControlWindow *window, const IVideoWindowVtbl *vtbl, - struct strmbase_filter *filter, CRITICAL_SECTION *lock, struct strmbase_pin *pin, const BaseWindowFuncTable *ops); +HRESULT WINAPI strmbase_window_init(BaseControlWindow *window, const IVideoWindowVtbl *vtbl, + struct strmbase_filter *filter, struct strmbase_pin *pin, const BaseWindowFuncTable *func_table); HRESULT WINAPI BaseControlWindow_Destroy(BaseControlWindow *pControlWindow); BOOL WINAPI BaseControlWindowImpl_PossiblyEatMessage(BaseWindow *This, UINT uMsg, WPARAM wParam, LPARAM lParam);

1 0

Zebediah Figura : quartz/videorenderer: Get rid of CreateRenderingSubsystem().
by Alexandre Julliard 18 Oct '19

18 Oct '19

Module: wine Branch: master Commit: 229a8dfbcd8861f8ccc4e155e34dbcb42e24da32 URL: https://source.winehq.org/git/wine.git/?a=commit;h=229a8dfbcd8861f8ccc4e155… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Oct 18 10:01:48 2019 -0500 quartz/videorenderer: Get rid of CreateRenderingSubsystem(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/videorenderer.c | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 87365d9212..db5ee0fbf4 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -82,21 +82,6 @@ static inline VideoRendererImpl *impl_from_BaseControlVideo(BaseControlVideo *if return CONTAINING_RECORD(iface, VideoRendererImpl, baseControlVideo); } -static BOOL CreateRenderingSubsystem(VideoRendererImpl* This) -{ - This->hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); - if (!This->hEvent) - return FALSE; - - if (FAILED(BaseWindowImpl_PrepareWindow(&This->baseControlWindow.baseWindow))) - { - CloseHandle(This->hEvent); - return FALSE; - } - - return TRUE; -} - static void VideoRenderer_AutoShowWindow(VideoRendererImpl *This) { if (!This->init && (!This->WindowPos.right || !This->WindowPos.top)) @@ -873,8 +858,11 @@ HRESULT VideoRenderer_create(IUnknown *outer, void **out) if (FAILED(hr)) goto fail; - if (!CreateRenderingSubsystem(pVideoRenderer)) { - hr = E_FAIL; + pVideoRenderer->hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + + if (FAILED(hr = BaseWindowImpl_PrepareWindow(&pVideoRenderer->baseControlWindow.baseWindow))) + { + CloseHandle(pVideoRenderer->hEvent); goto fail; }

1 0

Zebediah Figura : qcap/tests: Fix a double Release().
by Alexandre Julliard 18 Oct '19

18 Oct '19

Module: wine Branch: master Commit: b546ac39f36114945617ff550db50d5932cd767a URL: https://source.winehq.org/git/wine.git/?a=commit;h=b546ac39f36114945617ff55… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Oct 18 10:01:47 2019 -0500 qcap/tests: Fix a double Release(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/videocapture.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/qcap/tests/videocapture.c b/dlls/qcap/tests/videocapture.c index 062138e885..5532654650 100644 --- a/dlls/qcap/tests/videocapture.c +++ b/dlls/qcap/tests/videocapture.c @@ -117,7 +117,6 @@ START_TEST(videocapture) if (hr == S_OK) { test_capture(filter); - IBaseFilter_Release(filter); ref = IBaseFilter_Release(filter); ok(!ref, "Got outstanding refcount %d.\n", ref); }

1 0

Zebediah Figura : quartz/tests: Relax system clock timing tests a bit.
by Alexandre Julliard 18 Oct '19

18 Oct '19

Module: wine Branch: master Commit: ebf82cd6868b795009989c5746895acb124e96e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ebf82cd6868b795009989c57… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Oct 18 10:01:46 2019 -0500 quartz/tests: Relax system clock timing tests a bit. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/systemclock.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/tests/systemclock.c b/dlls/quartz/tests/systemclock.c index cd291e1490..3c493a0f38 100644 --- a/dlls/quartz/tests/systemclock.c +++ b/dlls/quartz/tests/systemclock.c @@ -89,8 +89,8 @@ static void test_get_time(void) Sleep(100); hr = IReferenceClock_GetTime(clock, &time2); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(time2 - time1 > 98 * 10000, "Expected about %s, but got %s.\n", - wine_dbgstr_longlong(time1 + 98 * 10000), wine_dbgstr_longlong(time2)); + ok(time2 - time1 > 80 * 10000, "Expected about %s, but got %s.\n", + wine_dbgstr_longlong(time1 + 80 * 10000), wine_dbgstr_longlong(time2)); ref = IReferenceClock_Release(clock); ok(!ref, "Got outstanding refcount %d.\n", ref); @@ -160,11 +160,11 @@ static void test_advise(void) hr = IReferenceClock_AdvisePeriodic(clock, current, 500 * 10000, (HSEMAPHORE)semaphore, &cookie); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(!WaitForSingleObject(semaphore, 10), "Semaphore should be signaled.\n"); + ok(!WaitForSingleObject(semaphore, 20), "Semaphore should be signaled.\n"); for (i = 0; i < 5; ++i) { - ok(WaitForSingleObject(semaphore, 480) == WAIT_TIMEOUT, "Semaphore should not be signaled.\n"); - ok(!WaitForSingleObject(semaphore, 40), "Semaphore should be signaled.\n"); + ok(WaitForSingleObject(semaphore, 460) == WAIT_TIMEOUT, "Semaphore should not be signaled.\n"); + ok(!WaitForSingleObject(semaphore, 60), "Semaphore should be signaled.\n"); } hr = IReferenceClock_Unadvise(clock, cookie);

1 0

Hans Leidekker : wininet/tests: Fix FTP test failures.
by Alexandre Julliard 18 Oct '19

18 Oct '19

Module: wine Branch: master Commit: bbf74ea22a5310978c9aecbdc648c562c26fa0fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=bbf74ea22a5310978c9aecbd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Oct 18 16:46:23 2019 +0200 wininet/tests: Fix FTP test failures. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/ftp.c | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/dlls/wininet/tests/ftp.c b/dlls/wininet/tests/ftp.c index 6f50104f3b..317b291495 100644 --- a/dlls/wininet/tests/ftp.c +++ b/dlls/wininet/tests/ftp.c @@ -71,7 +71,7 @@ static void test_connect(HINTERNET hInternet) */ SetLastError(0xdeadbeef); - hFtp = InternetConnectA(hInternet, "ftp.winehq.org", INTERNET_DEFAULT_FTP_PORT, "anonymous", NULL, INTERNET_SERVICE_FTP, INTERNET_FLAG_PASSIVE, 0); + hFtp = InternetConnectA(hInternet, "ftp.winehq.org", INTERNET_DEFAULT_FTP_PORT, "anonymous", "IEUser@", INTERNET_SERVICE_FTP, INTERNET_FLAG_PASSIVE, 0); if (hFtp) /* some servers accept an empty password */ { ok ( GetLastError() == ERROR_SUCCESS, "ERROR_SUCCESS, got %d\n", GetLastError()); @@ -701,7 +701,7 @@ static void test_renamefile(HINTERNET hFtp, HINTERNET hConnect) "Expected ERROR_INTERNET_INCORRECT_HANDLE_TYPE, got %d\n", GetLastError()); } -static void test_command(HINTERNET hFtp, HINTERNET hConnect) +static void test_command(HINTERNET hFtp) { BOOL ret; DWORD error; @@ -716,17 +716,18 @@ static void test_command(HINTERNET hFtp, HINTERNET hConnect) { { FALSE, ERROR_INVALID_PARAMETER, NULL }, { FALSE, ERROR_INVALID_PARAMETER, "" }, - { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "HELO" }, - { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "SIZE " }, - { FALSE, ERROR_INTERNET_EXTENDED_ERROR, " SIZE" }, - { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "SIZE " }, - { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "SIZE /welcome.msg /welcome.msg" }, - { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "SIZE /welcome.msg" }, - { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "SIZE /welcome.msg " }, - { TRUE, ERROR_SUCCESS, "SIZE\t/welcome.msg" }, - { TRUE, ERROR_SUCCESS, "SIZE /welcome.msg" }, - { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "PWD /welcome.msg" }, - { TRUE, ERROR_SUCCESS, "PWD" } + { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "invalid" }, + { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "size" }, + { TRUE, ERROR_SUCCESS, "type i" }, + { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "size " }, + { FALSE, ERROR_INTERNET_EXTENDED_ERROR, " size" }, + { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "size " }, + { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "size welcome.msg welcome.msg" }, + { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "size welcome.msg" }, + { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "size welcome.msg " }, + { TRUE, ERROR_SUCCESS, "size welcome.msg" }, + { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "pwd welcome.msg" }, + { TRUE, ERROR_SUCCESS, "pwd" } }; if (!pFtpCommandA) @@ -964,7 +965,7 @@ static void test_status_callbacks(HINTERNET hInternet) cb = pInternetSetStatusCallbackA(hInternet, status_callback); ok(cb == NULL, "expected NULL got %p\n", cb); - hFtp = InternetConnectA(hInternet, "ftp.winehq.org", INTERNET_DEFAULT_FTP_PORT, "anonymous", NULL, + hFtp = InternetConnectA(hInternet, "ftp.winehq.org", INTERNET_DEFAULT_FTP_PORT, "anonymous", "IEUser@", INTERNET_SERVICE_FTP, INTERNET_FLAG_PASSIVE, 1); if (!hFtp) { @@ -998,7 +999,7 @@ START_TEST(ftp) hInternet = InternetOpenA("winetest", 0, NULL, NULL, 0); ok(hInternet != NULL, "InternetOpen failed: %u\n", GetLastError()); - hFtp = InternetConnectA(hInternet, "ftp.winehq.org", INTERNET_DEFAULT_FTP_PORT, "anonymous", NULL, INTERNET_SERVICE_FTP, INTERNET_FLAG_PASSIVE, 0); + hFtp = InternetConnectA(hInternet, "ftp.winehq.org", INTERNET_DEFAULT_FTP_PORT, "anonymous", "IEUser@", INTERNET_SERVICE_FTP, INTERNET_FLAG_PASSIVE, 0); if (!hFtp) { InternetCloseHandle(hInternet); @@ -1031,7 +1032,7 @@ START_TEST(ftp) test_putfile(hFtp, hHttp); test_removedir(hFtp, hHttp); test_renamefile(hFtp, hHttp); - test_command(hFtp, hHttp); + test_command(hFtp); test_find_first_file(hFtp, hHttp); test_get_current_dir(hFtp, hHttp); test_status_callbacks(hInternet);

1 0

Jacek Caban : vbscript/tests: Add more named items tests.
by Alexandre Julliard 18 Oct '19

18 Oct '19

Module: wine Branch: master Commit: f449c361ce4e05025adc1a339033a6c761f3ed43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f449c361ce4e05025adc1a33… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 18 16:20:50 2019 +0200 vbscript/tests: Add more named items tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/tests/vbscript.c | 206 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 202 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f449c361ce4e05025adc…

1 0

Jacek Caban : vbscript: Move init_global call to CreateInstance.
by Alexandre Julliard 18 Oct '19

18 Oct '19

Module: wine Branch: master Commit: cef14ac3380ee30e04eb3f77f151d0c28f32eb97 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cef14ac3380ee30e04eb3f77… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 18 16:20:40 2019 +0200 vbscript: Move init_global call to CreateInstance. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/vbscript.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index 8b81b7a5e3..56c53b4015 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -128,18 +128,6 @@ IDispatch *lookup_named_item(script_ctx_t *ctx, const WCHAR *name, unsigned flag return NULL; } -static HRESULT set_ctx_site(VBScript *This) -{ - HRESULT hres; - - hres = init_global(This->ctx); - if(FAILED(hres)) - return hres; - - change_state(This, SCRIPTSTATE_INITIALIZED); - return S_OK; -} - static void release_script(script_ctx_t *ctx) { class_desc_t *class_desc; @@ -434,7 +422,9 @@ static HRESULT WINAPI VBScript_SetScriptSite(IActiveScript *iface, IActiveScript if(hres == S_OK) This->ctx->lcid = lcid; - return This->is_initialized ? set_ctx_site(This) : S_OK; + if(This->is_initialized) + change_state(This, SCRIPTSTATE_INITIALIZED); + return S_OK; } static HRESULT WINAPI VBScript_GetScriptSite(IActiveScript *iface, REFIID riid, @@ -748,7 +738,9 @@ static HRESULT WINAPI VBScriptParse_InitNew(IActiveScriptParse *iface) return E_UNEXPECTED; This->is_initialized = TRUE; - return This->ctx->site ? set_ctx_site(This) : S_OK; + if(This->ctx->site) + change_state(This, SCRIPTSTATE_INITIALIZED); + return S_OK; } static HRESULT WINAPI VBScriptParse_AddScriptlet(IActiveScriptParse *iface, @@ -968,6 +960,12 @@ HRESULT WINAPI VBScriptFactory_CreateInstance(IClassFactory *iface, IUnknown *pU list_init(&ctx->code_list); list_init(&ctx->named_items); + hres = init_global(ctx); + if(FAILED(hres)) { + IActiveScript_Release(&ret->IActiveScript_iface); + return hres; + } + hres = IActiveScript_QueryInterface(&ret->IActiveScript_iface, riid, ppv); IActiveScript_Release(&ret->IActiveScript_iface); return hres;

1 0

← Newer
1
...
30
31
32
33
34
35
36
...
62
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2019