April 2013 - Wine-commits - list.winehq.org

Ken Thomases : winemac: Improve logging from wglChoosePixelFormatARB() and wglGetPixelFormatAttribivARB().
by Alexandre Julliard 25 Apr '13

25 Apr '13

Module: wine Branch: master Commit: dfa2ba390d44639dfcb3159b0a0c749e0603f689 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfa2ba390d44639dfcb3159b0… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Apr 24 20:18:29 2013 -0500 winemac: Improve logging from wglChoosePixelFormatARB() and wglGetPixelFormatAttribivARB(). --- dlls/winemac.drv/opengl.c | 143 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 141 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index 095514b..e72281a 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -240,6 +240,116 @@ static int nb_formats, nb_displayable_formats; static void *opengl_handle; +static const char* debugstr_attrib(int attrib, int value) +{ + static const struct { + int attrib; + const char *name; + } attrib_names[] = { +#define ATTRIB(a) { a, #a } + ATTRIB(WGL_ACCELERATION_ARB), + ATTRIB(WGL_ACCUM_ALPHA_BITS_ARB), + ATTRIB(WGL_ACCUM_BITS_ARB), + ATTRIB(WGL_ACCUM_BLUE_BITS_ARB), + ATTRIB(WGL_ACCUM_GREEN_BITS_ARB), + ATTRIB(WGL_ACCUM_RED_BITS_ARB), + ATTRIB(WGL_ALPHA_BITS_ARB), + ATTRIB(WGL_ALPHA_SHIFT_ARB), + ATTRIB(WGL_AUX_BUFFERS_ARB), + ATTRIB(WGL_BIND_TO_TEXTURE_RECTANGLE_RGB_NV), + ATTRIB(WGL_BIND_TO_TEXTURE_RECTANGLE_RGBA_NV), + ATTRIB(WGL_BIND_TO_TEXTURE_RGB_ARB), + ATTRIB(WGL_BIND_TO_TEXTURE_RGBA_ARB), + ATTRIB(WGL_BLUE_BITS_ARB), + ATTRIB(WGL_BLUE_SHIFT_ARB), + ATTRIB(WGL_COLOR_BITS_ARB), + ATTRIB(WGL_DEPTH_BITS_ARB), + ATTRIB(WGL_DOUBLE_BUFFER_ARB), + ATTRIB(WGL_DRAW_TO_BITMAP_ARB), + ATTRIB(WGL_DRAW_TO_PBUFFER_ARB), + ATTRIB(WGL_DRAW_TO_WINDOW_ARB), + ATTRIB(WGL_FRAMEBUFFER_SRGB_CAPABLE_ARB), + ATTRIB(WGL_GREEN_BITS_ARB), + ATTRIB(WGL_GREEN_SHIFT_ARB), + ATTRIB(WGL_NEED_PALETTE_ARB), + ATTRIB(WGL_NEED_SYSTEM_PALETTE_ARB), + ATTRIB(WGL_NUMBER_OVERLAYS_ARB), + ATTRIB(WGL_NUMBER_PIXEL_FORMATS_ARB), + ATTRIB(WGL_NUMBER_UNDERLAYS_ARB), + ATTRIB(WGL_PIXEL_TYPE_ARB), + ATTRIB(WGL_RED_BITS_ARB), + ATTRIB(WGL_RED_SHIFT_ARB), + ATTRIB(WGL_SAMPLE_BUFFERS_ARB), + ATTRIB(WGL_SAMPLES_ARB), + ATTRIB(WGL_SHARE_ACCUM_ARB), + ATTRIB(WGL_SHARE_DEPTH_ARB), + ATTRIB(WGL_SHARE_STENCIL_ARB), + ATTRIB(WGL_STENCIL_BITS_ARB), + ATTRIB(WGL_STEREO_ARB), + ATTRIB(WGL_SUPPORT_GDI_ARB), + ATTRIB(WGL_SUPPORT_OPENGL_ARB), + ATTRIB(WGL_SWAP_LAYER_BUFFERS_ARB), + ATTRIB(WGL_SWAP_METHOD_ARB), + ATTRIB(WGL_TRANSPARENT_ALPHA_VALUE_ARB), + ATTRIB(WGL_TRANSPARENT_ARB), + ATTRIB(WGL_TRANSPARENT_BLUE_VALUE_ARB), + ATTRIB(WGL_TRANSPARENT_GREEN_VALUE_ARB), + ATTRIB(WGL_TRANSPARENT_INDEX_VALUE_ARB), + ATTRIB(WGL_TRANSPARENT_RED_VALUE_ARB), +#undef ATTRIB + }; + int i; + const char *attrib_name = NULL; + const char *value_name = NULL; + + for (i = 0; i < sizeof(attrib_names) / sizeof(attrib_names[0]); i++) + { + if (attrib_names[i].attrib == attrib) + { + attrib_name = attrib_names[i].name; + break; + } + } + + if (!attrib_name) + attrib_name = wine_dbg_sprintf("Attrib 0x%04x", attrib); + + switch (attrib) + { + case WGL_ACCELERATION_ARB: + switch (value) + { + case WGL_FULL_ACCELERATION_ARB: value_name = "WGL_FULL_ACCELERATION_ARB"; break; + case WGL_GENERIC_ACCELERATION_ARB: value_name = "WGL_GENERIC_ACCELERATION_ARB"; break; + case WGL_NO_ACCELERATION_ARB: value_name = "WGL_NO_ACCELERATION_ARB"; break; + } + break; + case WGL_PIXEL_TYPE_ARB: + switch (value) + { + case WGL_TYPE_COLORINDEX_ARB: value_name = "WGL_TYPE_COLORINDEX_ARB"; break; + case WGL_TYPE_RGBA_ARB: value_name = "WGL_TYPE_RGBA_ARB"; break; + case WGL_TYPE_RGBA_FLOAT_ARB: value_name = "WGL_TYPE_RGBA_FLOAT_ARB"; break; + case WGL_TYPE_RGBA_UNSIGNED_FLOAT_EXT: value_name = "WGL_TYPE_RGBA_UNSIGNED_FLOAT_EXT"; break; + } + break; + case WGL_SWAP_METHOD_ARB: + switch (value) + { + case WGL_SWAP_COPY_ARB: value_name = "WGL_SWAP_COPY_ARB"; break; + case WGL_SWAP_EXCHANGE_ARB: value_name = "WGL_SWAP_EXCHANGE_ARB"; break; + case WGL_SWAP_UNDEFINED_ARB: value_name = "WGL_SWAP_UNDEFINED_ARB"; break; + } + break; + } + + if (!value_name) + value_name = wine_dbg_sprintf("%d / 0x%04x", value, value); + + return wine_dbg_sprintf("%40s: %s", attrib_name, value_name); +} + + static BOOL get_renderer_property(CGLRendererInfoObj renderer_info, GLint renderer_index, CGLRendererProperty property, GLint *value) { @@ -1530,6 +1640,8 @@ static BOOL macdrv_wglChoosePixelFormatARB(HDC hdc, const int *piAttribIList, int attr = iptr[0]; int value = iptr[1]; + TRACE("%s\n", debugstr_attrib(attr, value)); + switch (attr) { case WGL_DRAW_TO_WINDOW_ARB: @@ -1724,11 +1836,36 @@ static BOOL macdrv_wglChoosePixelFormatARB(HDC hdc, const int *piAttribIList, break; default: - WARN("invalid attribute %x\n", iptr[0]); + WARN("invalid attribute %s\n", debugstr_attrib(attr, value)); return GL_FALSE; } } + TRACE("required: w/p/a %s/%s/%s col/r/g/b/a %d%s/%d/%d/%d/%d srgb %d ac %d/%d/%d/%d/%d dp/stn/ax/b/db/str %u/%u/%u/%s/%s/%s samp %u/%u\n", + valid.window ? (pf.window ? "1" : "0") : "?", + valid.pbuffer ? (pf.pbuffer ? "1" : "0") : "?", + valid.accelerated ? (pf.accelerated ? "1" : "0") : "?", + color_bits, + float_color == -1 ? "?" : float_color ? "f" : "", + red_bits, + green_bits, + blue_bits, + alpha_bits, + (int)srgb, + accum_bits, + accum_red_bits, + accum_green_bits, + accum_blue_bits, + accum_alpha_bits, + pf.depth_bits, + pf.stencil_bits, + pf.aux_buffers, + valid.backing_store ? (pf.backing_store ? "1" : "0") : "?", + valid.double_buffer ? (pf.double_buffer ? "1" : "0") : "?", + valid.stereo ? (pf.stereo ? "1" : "0") : "?", + pf.sample_buffers, + pf.samples); + for (i = 0; i < nb_formats && found < nMaxFormats; i++) { const struct color_mode *mode; @@ -1781,6 +1918,7 @@ static BOOL macdrv_wglChoosePixelFormatARB(HDC hdc, const int *piAttribIList, continue; piFormats[found++] = i; + TRACE("match: pixel format %d %s\n", i, debugstr_pf(&pixel_formats[i])); } cant_match: @@ -2021,6 +2159,7 @@ static BOOL macdrv_wglGetPixelFormatAttribivARB(HDC hdc, int iPixelFormat, int i if (nAttributes == 1 && piAttributes[0] == WGL_NUMBER_PIXEL_FORMATS_ARB) { piValues[0] = nb_formats; + TRACE("%s\n", debugstr_attrib(piAttributes[0], piValues[0])); return GL_TRUE; } @@ -2285,7 +2424,7 @@ static BOOL macdrv_wglGetPixelFormatAttribivARB(HDC hdc, int iPixelFormat, int i return GL_FALSE; } - TRACE("piAttributes[%d] (%x) -> %x\n", i, piAttributes[i], piValues[i]); + TRACE("%s\n", debugstr_attrib(piAttributes[i], piValues[i])); } return GL_TRUE;

1 0

Ken Thomases : winemac: Fix an off-by-one error in macdrv_wglChoosePixelFormatARB().
by Alexandre Julliard 25 Apr '13

25 Apr '13

Module: wine Branch: master Commit: a34168edaaffbe722a74299120d86c84eab2eaf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a34168edaaffbe722a7429912… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Apr 24 20:18:43 2013 -0500 winemac: Fix an off-by-one error in macdrv_wglChoosePixelFormatARB(). --- dlls/winemac.drv/opengl.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index e72281a..5f269fc 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -1917,8 +1917,8 @@ static BOOL macdrv_wglChoosePixelFormatARB(HDC hdc, const int *piAttribIList, else if (accum_bits || accum_red_bits || accum_green_bits || accum_blue_bits || accum_alpha_bits) continue; - piFormats[found++] = i; - TRACE("match: pixel format %d %s\n", i, debugstr_pf(&pixel_formats[i])); + piFormats[found++] = i + 1; + TRACE("match: pixel format %d %s\n", i + 1, debugstr_pf(&pixel_formats[i])); } cant_match:

1 0

Dmitry Timoshkov : kernel32: Test LdrShutdownProcess behaviour only after NtTerminateProcess(0) call.
by Alexandre Julliard 25 Apr '13

25 Apr '13

Module: wine Branch: master Commit: e54c49d940996b03602f47622e41baf8f30d9dd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e54c49d940996b03602f47622… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Apr 25 16:37:06 2013 +0900 kernel32: Test LdrShutdownProcess behaviour only after NtTerminateProcess(0) call. --- dlls/kernel32/tests/loader.c | 92 ++++++++++++++--------------------------- 1 files changed, 32 insertions(+), 60 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 6291d9c..5c05d9b 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -1119,11 +1119,16 @@ static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param) trace("dll: %p, DLL_PROCESS_DETACH, %p\n", hinst, param); + if (test_dll_phase == 0 || test_dll_phase == 3) + ok(param != NULL, "dll: param %p\n", param); + else + ok(!param, "dll: param %p\n", param); + if (test_dll_phase == 0) expected_code = 195; else if (test_dll_phase == 3) expected_code = 196; else expected_code = STILL_ACTIVE; - if (test_dll_phase == 3 || test_dll_phase == 4) + if (test_dll_phase == 3) { ret = pRtlDllShutdownInProgress(); ok(ret, "RtlDllShutdownInProgress returned %d\n", ret); @@ -1184,8 +1189,7 @@ static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param) noop_thread_started = 0; SetLastError(0xdeadbeef); handle = CreateThread(NULL, 0, noop_thread_proc, &noop_thread_started, 0, &ret); - /* manual call to LdrShutdownProcess doesn't prevent thread creation */ - if (param && test_dll_phase != 4) + if (param) { ok(!handle || broken(handle != 0) /* before win7 */, "CreateThread should fail\n"); if (!handle) @@ -1199,18 +1203,10 @@ static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param) } else { - /* FIXME: remove once Wine is fixed */ - if (test_dll_phase == 4) todo_wine - { - ok(handle != 0, "CreateThread error %d\n", GetLastError()); - } - else - { ok(handle != 0, "CreateThread error %d\n", GetLastError()); ret = WaitForSingleObject(handle, 1000); ok(ret == WAIT_TIMEOUT, "expected WAIT_TIMEOUT, got %#x\n", ret); ok(!noop_thread_started || broken(noop_thread_started) /* XP64 */, "thread shouldn't start yet\n"); - } CloseHandle(handle); } @@ -1221,8 +1217,7 @@ static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param) noop_thread_started = 0; SetLastError(0xdeadbeef); handle = CreateRemoteThread(process, NULL, 0, noop_thread_proc, &noop_thread_started, 0, &ret); - /* manual call to LdrShutdownProcess doesn't prevent thread creation */ - if (param && test_dll_phase != 4) + if (param) { ok(!handle || broken(handle != 0) /* before win7 */, "CreateRemoteThread should fail\n"); if (!handle) @@ -1236,18 +1231,10 @@ static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param) } else { - /* FIXME: remove once Wine is fixed */ - if (test_dll_phase == 4) todo_wine - { - ok(handle != 0, "CreateRemoteThread error %d\n", GetLastError()); - } - else - { ok(handle != 0, "CreateRemoteThread error %d\n", GetLastError()); ret = WaitForSingleObject(handle, 1000); ok(ret == WAIT_TIMEOUT, "expected WAIT_TIMEOUT, got %#x\n", ret); ok(!noop_thread_started || broken(noop_thread_started) /* XP64 */, "thread shouldn't start yet\n"); - } CloseHandle(handle); } @@ -1277,8 +1264,7 @@ static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param) ret = FreeLibrary(handle); ok(ret, "FreeLibrary error %d\n", GetLastError()); handle = GetModuleHandle("winver.exe"); - /* manual call to LdrShutdownProcess doesn't prevent module unloading */ - if (param && test_dll_phase != 4) + if (param) ok(handle != 0, "winver.exe should not be unloaded\n"); else todo_wine @@ -1450,6 +1436,9 @@ static void child_process(const char *dll_name, DWORD target_offset) ret = pRtlDllShutdownInProgress(); ok(!ret, "RtlDllShutdownInProgress returned %d\n", ret); + hmod = GetModuleHandle(dll_name); + ok(hmod != 0, "DLL should not be unloaded\n"); + SetLastError(0xdeadbeef); thread = CreateThread(NULL, 0, noop_thread_proc, &dummy, 0, &ret); todo_wine @@ -1463,6 +1452,14 @@ todo_wine CloseHandle(thread); } + trace("call LdrShutdownProcess()\n"); + pLdrShutdownProcess(); + + ret = pRtlDllShutdownInProgress(); + ok(ret, "RtlDllShutdownInProgress returned %d\n", ret); + + hmod = GetModuleHandle(dll_name); + ok(hmod != 0, "DLL should not be unloaded\n"); break; case 1: @@ -1471,7 +1468,14 @@ todo_wine ok(!ret, "RtlDllShutdownInProgress returned %d\n", ret); trace("call FreeLibrary(%p)\n", hmod); - FreeLibrary(hmod); + SetLastError(0xdeadbeef); + ret = FreeLibrary(hmod); + ok(ret, "FreeLibrary error %d\n", GetLastError()); + hmod = GetModuleHandle(dll_name); + ok(!hmod, "DLL should be unloaded\n"); + + if (test_dll_phase == 2) + ok(0, "FreeLibrary+ExitProcess should never return\n"); ret = pRtlDllShutdownInProgress(); ok(!ret, "RtlDllShutdownInProgress returned %d\n", ret); @@ -1484,41 +1488,27 @@ todo_wine CloseHandle(stop_event); break; - case 4: - ret = pRtlDllShutdownInProgress(); - ok(!ret, "RtlDllShutdownInProgress returned %d\n", ret); - - trace("call LdrShutdownProcess()\n"); - pLdrShutdownProcess(); - - ret = pRtlDllShutdownInProgress(); - ok(ret, "RtlDllShutdownInProgress returned %d\n", ret); - - break; - default: assert(0); break; } - Sleep(100); - if (test_dll_phase == 0) expected_code = 195; else if (test_dll_phase == 3) expected_code = 196; else expected_code = STILL_ACTIVE; if (expected_code == STILL_ACTIVE) { - ret = WaitForSingleObject(attached_thread[0], 0); + ret = WaitForSingleObject(attached_thread[0], 100); ok(ret == WAIT_TIMEOUT, "expected WAIT_TIMEOUT, got %#x\n", ret); - ret = WaitForSingleObject(attached_thread[1], 0); + ret = WaitForSingleObject(attached_thread[1], 100); ok(ret == WAIT_TIMEOUT, "expected WAIT_TIMEOUT, got %#x\n", ret); } else { - ret = WaitForSingleObject(attached_thread[0], 50); + ret = WaitForSingleObject(attached_thread[0], 100); ok(ret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %#x\n", ret); - ret = WaitForSingleObject(attached_thread[1], 50); + ret = WaitForSingleObject(attached_thread[1], 100); ok(ret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %#x\n", ret); } @@ -1703,24 +1693,6 @@ static void test_ExitProcess(void) CloseHandle(pi.hThread); CloseHandle(pi.hProcess); - /* phase 4 */ - *child_failures = -1; - sprintf(cmdline, "\"%s\" loader %s %u 4", argv[0], dll_name, target_offset); - ret = CreateProcess(argv[0], cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); - ok(ret, "CreateProcess(%s) error %d\n", cmdline, GetLastError()); - ret = WaitForSingleObject(pi.hProcess, 30000); - ok(ret == WAIT_OBJECT_0, "child process failed to terminate\n"); - GetExitCodeProcess(pi.hProcess, &ret); -todo_wine - ok(ret == 0 || broken(ret == 195) /* before win7 */, "expected exit code 0, got %u\n", ret); - if (*child_failures) - { - trace("%d failures in child process\n", *child_failures); - winetest_add_failures(*child_failures); - } - CloseHandle(pi.hThread); - CloseHandle(pi.hProcess); - ret = DeleteFile(dll_name); ok(ret, "DeleteFile error %d\n", GetLastError()); }

1 0

Henri Verbeet : winex11: Move the desktop process check from X11DRV_ClipCursor() to grab_clipping_window().
by Alexandre Julliard 25 Apr '13

25 Apr '13

Module: wine Branch: master Commit: 76bbf106a28c4caa82873e8450bde7d4adc765bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=76bbf106a28c4caa82873e845… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 25 09:59:42 2013 +0200 winex11: Move the desktop process check from X11DRV_ClipCursor() to grab_clipping_window(). We don't want to clip in the desktop process, but we still need it to call ungrab_clipping_window() if the process that was previously clipping didn't. This can happen for example when fullscreen clipping is enabled, but the corresponding window isn't explicitly destroyed before process exit. --- dlls/winex11.drv/mouse.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index de6672e..168914f 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -362,6 +362,9 @@ static BOOL grab_clipping_window( const RECT *clip ) Window clip_window; HWND msg_hwnd = 0; + if (GetWindowThreadProcessId( GetDesktopWindow(), NULL ) == GetCurrentThreadId()) + return TRUE; /* don't clip in the desktop process */ + if (!data) return FALSE; if (!(clip_window = init_clip_window())) return TRUE; @@ -1378,9 +1381,6 @@ BOOL CDECL X11DRV_ClipCursor( LPCRECT clip ) { if (!clip) clip = &virtual_screen_rect; - if (GetWindowThreadProcessId( GetDesktopWindow(), NULL ) == GetCurrentThreadId()) - return TRUE; /* don't clip in the desktop process */ - if (grab_pointer) { HWND foreground = GetForegroundWindow();

1 0

Henri Verbeet : wined3d: Introduce a wined3d_vertex_pipe_ops structure.
by Alexandre Julliard 25 Apr '13

25 Apr '13

Module: wine Branch: master Commit: 471991eb9a56858b585a48b9a85d7663eb63699e URL: http://source.winehq.org/git/wine.git/?a=commit;h=471991eb9a56858b585a48b9a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 25 12:16:47 2013 +0200 wined3d: Introduce a wined3d_vertex_pipe_ops structure. --- dlls/wined3d/arb_program_shader.c | 23 +++++++++- dlls/wined3d/device.c | 13 ++++-- dlls/wined3d/directx.c | 39 +++++------------ dlls/wined3d/glsl_shader.c | 26 ++++++++++-- dlls/wined3d/shader.c | 21 ++++++++- dlls/wined3d/state.c | 84 ++++++++++++++++++++++++++++--------- dlls/wined3d/wined3d_private.h | 32 +++++++++++++- 7 files changed, 174 insertions(+), 64 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=471991eb9a56858b585a4…

1 0

Henri Verbeet : d3drm: Avoid LPDIRECT3DRMFACE.
by Alexandre Julliard 25 Apr '13

25 Apr '13

Module: wine Branch: master Commit: 589eea0ca0aebfd9de236a07d6a4b778dd26604c URL: http://source.winehq.org/git/wine.git/?a=commit;h=589eea0ca0aebfd9de236a07d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 25 09:59:44 2013 +0200 d3drm: Avoid LPDIRECT3DRMFACE. --- dlls/d3drm/d3drm.c | 12 ++++-------- dlls/d3drm/meshbuilder.c | 22 +++++++--------------- include/d3drm.h | 4 ++-- include/d3drmobj.h | 12 ++++++------ 4 files changed, 19 insertions(+), 31 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index ff7ea71..425fd36 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -161,11 +161,9 @@ static HRESULT WINAPI IDirect3DRMImpl_CreateMeshBuilder(IDirect3DRM *iface, IDir return Direct3DRMMeshBuilder_create(&IID_IDirect3DRMMeshBuilder, (IUnknown **)mesh_builder); } -static HRESULT WINAPI IDirect3DRMImpl_CreateFace(IDirect3DRM* iface, LPDIRECT3DRMFACE * ppFace) +static HRESULT WINAPI IDirect3DRMImpl_CreateFace(IDirect3DRM* iface, IDirect3DRMFace **face) { - IDirect3DRMImpl *This = impl_from_IDirect3DRM(iface); - - FIXME("(%p/%p)->(%p): stub\n", iface, This, ppFace); + FIXME("iface %p, face %p stub!\n", iface, face); return E_NOTIMPL; } @@ -540,11 +538,9 @@ static HRESULT WINAPI IDirect3DRM2Impl_CreateMeshBuilder(IDirect3DRM2 *iface, ID return Direct3DRMMeshBuilder_create(&IID_IDirect3DRMMeshBuilder2, (IUnknown **)mesh_builder); } -static HRESULT WINAPI IDirect3DRM2Impl_CreateFace(IDirect3DRM2* iface, LPDIRECT3DRMFACE * ppFace) +static HRESULT WINAPI IDirect3DRM2Impl_CreateFace(IDirect3DRM2 *iface, IDirect3DRMFace **face) { - IDirect3DRMImpl *This = impl_from_IDirect3DRM2(iface); - - FIXME("(%p/%p)->(%p): stub\n", iface, This, ppFace); + FIXME("iface %p, face %p stub!\n", iface, face); return E_NOTIMPL; } diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 40e23de..a6018d3 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -605,12 +605,9 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_AddFrame(IDirect3DRMMeshBuilde return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_AddFace(IDirect3DRMMeshBuilder2* iface, - LPDIRECT3DRMFACE pFace) +static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_AddFace(IDirect3DRMMeshBuilder2 *iface, IDirect3DRMFace *face) { - IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder2(iface); - - FIXME("(%p)->(%p): stub\n", This, pFace); + FIXME("iface %p, face %p stub!\n", iface, face); return E_NOTIMPL; } @@ -849,12 +846,9 @@ static int WINAPI IDirect3DRMMeshBuilder2Impl_AddNormal(IDirect3DRMMeshBuilder2* return 0; } -static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_CreateFace(IDirect3DRMMeshBuilder2* iface, - LPDIRECT3DRMFACE* ppFace) +static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_CreateFace(IDirect3DRMMeshBuilder2 *iface, IDirect3DRMFace **face) { - IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder2(iface); - - FIXME("(%p)->(%p): stub\n", This, ppFace); + FIXME("iface %p, face %p stub!\n", iface, face); return E_NOTIMPL; } @@ -924,12 +918,10 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_GenerateNormals2(IDirect3DRMMe return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_GetFace(IDirect3DRMMeshBuilder2* iface, - DWORD index, LPDIRECT3DRMFACE* ppFace) +static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_GetFace(IDirect3DRMMeshBuilder2 *iface, + DWORD index, IDirect3DRMFace **face) { - IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder2(iface); - - FIXME("(%p)->(%u,%p): stub\n", This, index, ppFace); + FIXME("iface %p, index %u, face %p stub!\n", iface, index, face); return E_NOTIMPL; } diff --git a/include/d3drm.h b/include/d3drm.h index f1e5c4e..ff02438 100644 --- a/include/d3drm.h +++ b/include/d3drm.h @@ -61,7 +61,7 @@ DECLARE_INTERFACE_(IDirect3DRM,IUnknown) STDMETHOD(CreateFrame)(THIS_ IDirect3DRMFrame *parent, IDirect3DRMFrame **frame) PURE; STDMETHOD(CreateMesh)(THIS_ IDirect3DRMMesh **mesh) PURE; STDMETHOD(CreateMeshBuilder)(THIS_ IDirect3DRMMeshBuilder **mesh_builder) PURE; - STDMETHOD(CreateFace)(THIS_ LPDIRECT3DRMFACE *) PURE; + STDMETHOD(CreateFace)(THIS_ IDirect3DRMFace **face) PURE; STDMETHOD(CreateAnimation)(THIS_ LPDIRECT3DRMANIMATION *) PURE; STDMETHOD(CreateAnimationSet)(THIS_ LPDIRECT3DRMANIMATIONSET *) PURE; STDMETHOD(CreateTexture)(THIS_ D3DRMIMAGE *image, IDirect3DRMTexture **texture) PURE; @@ -199,7 +199,7 @@ DECLARE_INTERFACE_(IDirect3DRM2,IUnknown) STDMETHOD(CreateFrame)(THIS_ IDirect3DRMFrame *parent, IDirect3DRMFrame2 **frame) PURE; STDMETHOD(CreateMesh)(THIS_ IDirect3DRMMesh **mesh) PURE; STDMETHOD(CreateMeshBuilder)(THIS_ IDirect3DRMMeshBuilder2 **mesh_builder) PURE; - STDMETHOD(CreateFace)(THIS_ LPDIRECT3DRMFACE *) PURE; + STDMETHOD(CreateFace)(THIS_ IDirect3DRMFace **face) PURE; STDMETHOD(CreateAnimation)(THIS_ LPDIRECT3DRMANIMATION *) PURE; STDMETHOD(CreateAnimationSet)(THIS_ LPDIRECT3DRMANIMATIONSET *) PURE; STDMETHOD(CreateTexture)(THIS_ D3DRMIMAGE *image, IDirect3DRMTexture2 **texture) PURE; diff --git a/include/d3drmobj.h b/include/d3drmobj.h index 71244a1..182013d 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -2512,7 +2512,7 @@ DECLARE_INTERFACE_(IDirect3DRMMeshBuilder,IDirect3DRMVisual) STDMETHOD(AddMesh)(THIS_ IDirect3DRMMesh *mesh) PURE; STDMETHOD(AddMeshBuilder)(THIS_ IDirect3DRMMeshBuilder *mesh_builder) PURE; STDMETHOD(AddFrame)(THIS_ IDirect3DRMFrame *frame) PURE; - STDMETHOD(AddFace)(THIS_ LPDIRECT3DRMFACE) PURE; + STDMETHOD(AddFace)(THIS_ IDirect3DRMFace *face) PURE; STDMETHOD(AddFaces)(THIS_ DWORD vcount, D3DVECTOR *vertices, DWORD ncount, D3DVECTOR *normals, DWORD *data, LPDIRECT3DRMFACEARRAY*) PURE; STDMETHOD(ReserveSpace)(THIS_ DWORD vertex_Count, DWORD normal_count, DWORD face_count) PURE; @@ -2534,7 +2534,7 @@ DECLARE_INTERFACE_(IDirect3DRMMeshBuilder,IDirect3DRMVisual) STDMETHOD(GetTextureCoordinates)(THIS_ DWORD index, D3DVALUE *u, D3DVALUE *v) PURE; STDMETHOD_(int, AddVertex)(THIS_ D3DVALUE x, D3DVALUE y, D3DVALUE z) PURE; STDMETHOD_(int, AddNormal)(THIS_ D3DVALUE x, D3DVALUE y, D3DVALUE z) PURE; - STDMETHOD(CreateFace)(THIS_ LPDIRECT3DRMFACE*) PURE; + STDMETHOD(CreateFace)(THIS_ IDirect3DRMFace **face) PURE; STDMETHOD_(D3DRMRENDERQUALITY, GetQuality)(THIS) PURE; STDMETHOD_(BOOL, GetPerspective)(THIS) PURE; STDMETHOD_(int, GetFaceCount)(THIS) PURE; @@ -2683,7 +2683,7 @@ DECLARE_INTERFACE_(IDirect3DRMMeshBuilder2,IDirect3DRMMeshBuilder) STDMETHOD(AddMesh)(THIS_ IDirect3DRMMesh *mesh) PURE; STDMETHOD(AddMeshBuilder)(THIS_ IDirect3DRMMeshBuilder *mesh_builder) PURE; STDMETHOD(AddFrame)(THIS_ IDirect3DRMFrame *frame) PURE; - STDMETHOD(AddFace)(THIS_ LPDIRECT3DRMFACE) PURE; + STDMETHOD(AddFace)(THIS_ IDirect3DRMFace *face) PURE; STDMETHOD(AddFaces)(THIS_ DWORD vcount, D3DVECTOR *vertices, DWORD ncount, D3DVECTOR *normals, DWORD *data, LPDIRECT3DRMFACEARRAY*) PURE; STDMETHOD(ReserveSpace)(THIS_ DWORD vertex_Count, DWORD normal_count, DWORD face_count) PURE; @@ -2705,7 +2705,7 @@ DECLARE_INTERFACE_(IDirect3DRMMeshBuilder2,IDirect3DRMMeshBuilder) STDMETHOD(GetTextureCoordinates)(THIS_ DWORD index, D3DVALUE *u, D3DVALUE *v) PURE; STDMETHOD_(int, AddVertex)(THIS_ D3DVALUE x, D3DVALUE y, D3DVALUE z) PURE; STDMETHOD_(int, AddNormal)(THIS_ D3DVALUE x, D3DVALUE y, D3DVALUE z) PURE; - STDMETHOD(CreateFace)(THIS_ LPDIRECT3DRMFACE*) PURE; + STDMETHOD(CreateFace)(THIS_ IDirect3DRMFace **face) PURE; STDMETHOD_(D3DRMRENDERQUALITY, GetQuality)(THIS) PURE; STDMETHOD_(BOOL, GetPerspective)(THIS) PURE; STDMETHOD_(int, GetFaceCount)(THIS) PURE; @@ -2714,7 +2714,7 @@ DECLARE_INTERFACE_(IDirect3DRMMeshBuilder2,IDirect3DRMMeshBuilder) STDMETHOD(CreateMesh)(THIS_ IDirect3DRMMesh **mesh) PURE; /*** IDirect3DRMMeshBuilder2 methods ***/ STDMETHOD(GenerateNormals2)(THIS_ D3DVALUE crease, DWORD flags) PURE; - STDMETHOD(GetFace)(THIS_ DWORD index, LPDIRECT3DRMFACE*) PURE; + STDMETHOD(GetFace)(THIS_ DWORD index, IDirect3DRMFace **face) PURE; }; #undef INTERFACE @@ -4481,7 +4481,7 @@ DECLARE_INTERFACE_(IDirect3DRMFaceArray, IDirect3DRMArray) /*** IDirect3DRMArray methods ***/ STDMETHOD_(DWORD, GetSize)(THIS) PURE; /*** IDirect3DRMFaceArray methods ***/ - STDMETHOD(GetElement)(THIS_ DWORD index, LPDIRECT3DRMFACE *) PURE; + STDMETHOD(GetElement)(THIS_ DWORD index, IDirect3DRMFace **element) PURE; }; #undef INTERFACE

1 0

Henri Verbeet : d3drm: Avoid LPDIRECT3DRMFACE2.
by Alexandre Julliard 25 Apr '13

25 Apr '13

Module: wine Branch: master Commit: 1013b54915c3191dfbfa685b54e9280c494dd7a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1013b54915c3191dfbfa685b5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 25 09:59:45 2013 +0200 d3drm: Avoid LPDIRECT3DRMFACE2. --- dlls/d3drm/d3drm.c | 6 ++---- dlls/d3drm/meshbuilder.c | 29 +++++++++-------------------- include/d3drm.h | 2 +- include/d3drmobj.h | 8 ++++---- 4 files changed, 16 insertions(+), 29 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 425fd36..f3cb6ff 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -932,11 +932,9 @@ static HRESULT WINAPI IDirect3DRM3Impl_CreateMeshBuilder(IDirect3DRM3 *iface, ID return Direct3DRMMeshBuilder_create(&IID_IDirect3DRMMeshBuilder3, (IUnknown **)mesh_builder); } -static HRESULT WINAPI IDirect3DRM3Impl_CreateFace(IDirect3DRM3* iface, LPDIRECT3DRMFACE2* Face) +static HRESULT WINAPI IDirect3DRM3Impl_CreateFace(IDirect3DRM3 *iface, IDirect3DRMFace2 **face) { - IDirect3DRMImpl *This = impl_from_IDirect3DRM3(iface); - - FIXME("(%p/%p)->(%p): stub\n", iface, This, Face); + FIXME("iface %p, face %p stub!\n", iface, face); return E_NOTIMPL; } diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index a6018d3..81078dc 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -1757,12 +1757,9 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_AddFrame(IDirect3DRMMeshBuilde return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_AddFace(IDirect3DRMMeshBuilder3* iface, - LPDIRECT3DRMFACE2 Face) +static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_AddFace(IDirect3DRMMeshBuilder3 *iface, IDirect3DRMFace2 *face) { - IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder3(iface); - - FIXME("(%p)->(%p): stub\n", This, Face); + FIXME("iface %p, face %p stub!\n", iface, face); return E_NOTIMPL; } @@ -2003,12 +2000,9 @@ static int WINAPI IDirect3DRMMeshBuilder3Impl_AddNormal(IDirect3DRMMeshBuilder3* return 0; } -static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_CreateFace(IDirect3DRMMeshBuilder3* iface, - LPDIRECT3DRMFACE2* Face) +static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_CreateFace(IDirect3DRMMeshBuilder3 *iface, IDirect3DRMFace2 **face) { - IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder3(iface); - - FIXME("(%p)->(%p): stub\n", This, Face); + FIXME("iface %p, face %p stub!\n", iface, face); return E_NOTIMPL; } @@ -2192,12 +2186,10 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_CreateMesh(IDirect3DRMMeshBuil return D3DRM_OK; } -static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_GetFace(IDirect3DRMMeshBuilder3* iface, - DWORD index, LPDIRECT3DRMFACE2* Face) +static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_GetFace(IDirect3DRMMeshBuilder3 *iface, + DWORD index, IDirect3DRMFace2 **face) { - IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder3(iface); - - FIXME("(%p)->(%u,%p): stub\n", This, index, Face); + FIXME("iface %p, index %u, face %p stub!\n", iface, index, face); return E_NOTIMPL; } @@ -2242,12 +2234,9 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_DeleteNormals(IDirect3DRMMeshB return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_DeleteFace(IDirect3DRMMeshBuilder3* iface, - LPDIRECT3DRMFACE2 Face) +static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_DeleteFace(IDirect3DRMMeshBuilder3 *iface, IDirect3DRMFace2 *face) { - IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder3(iface); - - FIXME("(%p)->(%p): stub\n", This, Face); + FIXME("iface %p, face %p stub!\n", iface, face); return E_NOTIMPL; } diff --git a/include/d3drm.h b/include/d3drm.h index ff02438..1619534 100644 --- a/include/d3drm.h +++ b/include/d3drm.h @@ -340,7 +340,7 @@ DECLARE_INTERFACE_(IDirect3DRM3,IUnknown) STDMETHOD(CreateFrame)(THIS_ IDirect3DRMFrame3 *parent, IDirect3DRMFrame3 **frame) PURE; STDMETHOD(CreateMesh)(THIS_ IDirect3DRMMesh **mesh) PURE; STDMETHOD(CreateMeshBuilder)(THIS_ IDirect3DRMMeshBuilder3 **mesh_builder) PURE; - STDMETHOD(CreateFace)(THIS_ LPDIRECT3DRMFACE2 *) PURE; + STDMETHOD(CreateFace)(THIS_ IDirect3DRMFace2 **face) PURE; STDMETHOD(CreateAnimation)(THIS_ LPDIRECT3DRMANIMATION2 *) PURE; STDMETHOD(CreateAnimationSet)(THIS_ LPDIRECT3DRMANIMATIONSET2 *) PURE; STDMETHOD(CreateTexture)(THIS_ D3DRMIMAGE *image, IDirect3DRMTexture3 **texture) PURE; diff --git a/include/d3drmobj.h b/include/d3drmobj.h index 182013d..218fa47 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -2863,7 +2863,7 @@ DECLARE_INTERFACE_(IDirect3DRMMeshBuilder3,IDirect3DRMVisual) STDMETHOD(AddMesh)(THIS_ IDirect3DRMMesh *mesh) PURE; STDMETHOD(AddMeshBuilder)(THIS_ IDirect3DRMMeshBuilder3 *mesh_builder, DWORD flags) PURE; STDMETHOD(AddFrame)(THIS_ IDirect3DRMFrame3 *frame) PURE; - STDMETHOD(AddFace)(THIS_ LPDIRECT3DRMFACE2) PURE; + STDMETHOD(AddFace)(THIS_ IDirect3DRMFace2 *face) PURE; STDMETHOD(AddFaces)(THIS_ DWORD vcount, D3DVECTOR *vertices, DWORD ncount, D3DVECTOR *normals, DWORD *data, LPDIRECT3DRMFACEARRAY*) PURE; STDMETHOD(ReserveSpace)(THIS_ DWORD vertex_Count, DWORD normal_count, DWORD face_count) PURE; @@ -2885,19 +2885,19 @@ DECLARE_INTERFACE_(IDirect3DRMMeshBuilder3,IDirect3DRMVisual) STDMETHOD(GetTextureCoordinates)(THIS_ DWORD index, D3DVALUE *u, D3DVALUE *v) PURE; STDMETHOD_(int, AddVertex)(THIS_ D3DVALUE x, D3DVALUE y, D3DVALUE z) PURE; STDMETHOD_(int, AddNormal)(THIS_ D3DVALUE x, D3DVALUE y, D3DVALUE z) PURE; - STDMETHOD(CreateFace)(THIS_ LPDIRECT3DRMFACE2*) PURE; + STDMETHOD(CreateFace)(THIS_ IDirect3DRMFace2 **face) PURE; STDMETHOD_(D3DRMRENDERQUALITY, GetQuality)(THIS) PURE; STDMETHOD_(BOOL, GetPerspective)(THIS) PURE; STDMETHOD_(int, GetFaceCount)(THIS) PURE; STDMETHOD_(int, GetVertexCount)(THIS) PURE; STDMETHOD_(D3DCOLOR, GetVertexColor)(THIS_ DWORD index) PURE; STDMETHOD(CreateMesh)(THIS_ IDirect3DRMMesh **mesh) PURE; - STDMETHOD(GetFace)(THIS_ DWORD index, LPDIRECT3DRMFACE2 *) PURE; + STDMETHOD(GetFace)(THIS_ DWORD index, IDirect3DRMFace2 **face) PURE; STDMETHOD(GetVertex)(THIS_ DWORD index, D3DVECTOR *vector) PURE; STDMETHOD(GetNormal)(THIS_ DWORD index, D3DVECTOR *vector) PURE; STDMETHOD(DeleteVertices)(THIS_ DWORD IndexFirst, DWORD count) PURE; STDMETHOD(DeleteNormals)(THIS_ DWORD IndexFirst, DWORD count) PURE; - STDMETHOD(DeleteFace)(THIS_ LPDIRECT3DRMFACE2) PURE; + STDMETHOD(DeleteFace)(THIS_ IDirect3DRMFace2 *face) PURE; STDMETHOD(Empty)(THIS_ DWORD flags) PURE; STDMETHOD(Optimize)(THIS_ DWORD flags) PURE; STDMETHOD(AddFacesIndexed)(THIS_ DWORD flags, DWORD *pvIndices, DWORD *pIndexFirst, DWORD *pCount) PURE;

1 0

Henri Verbeet : d3drm: Avoid LPDIRECT3DRMLIGHT.
by Alexandre Julliard 25 Apr '13

25 Apr '13

Module: wine Branch: master Commit: b8e3cee7831ba41a6ebe337a845cdb51b0069336 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8e3cee7831ba41a6ebe337a8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 25 09:59:46 2013 +0200 d3drm: Avoid LPDIRECT3DRMLIGHT. --- dlls/d3drm/d3drm.c | 97 ++++++++++++++++++++------------------------- dlls/d3drm/frame.c | 20 ++++------ dlls/d3drm/tests/d3drm.c | 50 ++++++++++++------------ include/d3drm.h | 19 +++++---- include/d3drmobj.h | 22 +++++----- 5 files changed, 98 insertions(+), 110 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b8e3cee7831ba41a6ebe3…

1 0

Hans Leidekker : wininet/tests: Improve error reporting in a couple of tests.
by Alexandre Julliard 25 Apr '13

25 Apr '13

Module: wine Branch: master Commit: 669a1b3562754448669400cb9651901d468ca8ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=669a1b3562754448669400cb9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 25 10:13:40 2013 +0200 wininet/tests: Improve error reporting in a couple of tests. --- dlls/wininet/tests/http.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index de7f354..ceddde1 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2114,7 +2114,7 @@ static void test_proxy_indirect(int port) ok(hr != NULL, "HttpOpenRequest failed\n"); r = HttpSendRequest(hr, NULL, 0, NULL, 0); - ok(r, "HttpSendRequest failed\n"); + ok(r, "HttpSendRequest failed %u\n", GetLastError()); sz = sizeof buffer; r = HttpQueryInfo(hr, HTTP_QUERY_PROXY_AUTHENTICATE, buffer, &sz, NULL); @@ -2181,7 +2181,7 @@ static void test_proxy_direct(int port) ok(hr != NULL, "HttpOpenRequest failed\n"); r = HttpSendRequest(hr, NULL, 0, NULL, 0); - ok(r, "HttpSendRequest failed\n"); + ok(r, "HttpSendRequest failed %u\n", GetLastError()); test_status_code(hr, 407); @@ -2401,7 +2401,7 @@ static void test_proxy_direct(int port) ok(sz == lstrlenW(passwordW), "got %u\n", sz); r = HttpSendRequest(hr, NULL, 0, NULL, 0); - ok(r, "HttpSendRequest failed\n"); + ok(r, "HttpSendRequest failed %u\n", GetLastError()); sz = sizeof buffer; r = HttpQueryInfo(hr, HTTP_QUERY_STATUS_CODE, buffer, &sz, NULL); ok(r, "HttpQueryInfo failed\n");

1 0

Hans Leidekker : wininet: Get rid of the clear parameter to HTTP_GetResponseHeaders.
by Alexandre Julliard 25 Apr '13

25 Apr '13

Module: wine Branch: master Commit: 2145b637fd4f374b0ecc23ef5ffe5abb0d558164 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2145b637fd4f374b0ecc23ef5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 25 10:14:21 2013 +0200 wininet: Get rid of the clear parameter to HTTP_GetResponseHeaders. --- dlls/wininet/http.c | 19 ++++++++----------- 1 files changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index c910c59..5a58ac9 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -207,7 +207,7 @@ static CRITICAL_SECTION_DEBUG critsect_debug = }; static CRITICAL_SECTION authcache_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; -static BOOL HTTP_GetResponseHeaders(http_request_t *req, BOOL clear); +static BOOL HTTP_GetResponseHeaders(http_request_t *req); static DWORD HTTP_ProcessHeader(http_request_t *req, LPCWSTR field, LPCWSTR value, DWORD dwModifier); static LPWSTR * HTTP_InterpretHttpHeader(LPCWSTR buffer); static DWORD HTTP_InsertCustomHeader(http_request_t *req, LPHTTPHEADERW lpHdr); @@ -4076,7 +4076,7 @@ static DWORD HTTP_SecureProxyConnect(http_request_t *request) if (res != ERROR_SUCCESS) return res; - responseLen = HTTP_GetResponseHeaders( request, TRUE ); + responseLen = HTTP_GetResponseHeaders( request ); if (!responseLen) return ERROR_HTTP_INVALID_HEADER; @@ -4873,7 +4873,7 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, INTERNET_SendCallback(&request->hdr, request->hdr.dwContext, INTERNET_STATUS_RECEIVING_RESPONSE, NULL, 0); - responseLen = HTTP_GetResponseHeaders(request, TRUE); + responseLen = HTTP_GetResponseHeaders(request); /* FIXME: We should know that connection is closed before sending * headers. Otherwise wrong callbacks are executed */ if(!responseLen && reusing_connection) { @@ -5067,7 +5067,7 @@ static DWORD HTTP_HttpEndRequestW(http_request_t *request, DWORD dwFlags, DWORD_ INTERNET_SendCallback(&request->hdr, request->hdr.dwContext, INTERNET_STATUS_RECEIVING_RESPONSE, NULL, 0); - responseLen = HTTP_GetResponseHeaders(request, TRUE); + responseLen = HTTP_GetResponseHeaders(request); if (!responseLen) res = ERROR_HTTP_HEADER_NOT_FOUND; @@ -5722,7 +5722,7 @@ static void HTTP_clear_response_headers( http_request_t *request ) * TRUE on success * FALSE on error */ -static INT HTTP_GetResponseHeaders(http_request_t *request, BOOL clear) +static INT HTTP_GetResponseHeaders(http_request_t *request) { INT cbreaks = 0; WCHAR buffer[MAX_REPLY_LEN]; @@ -5742,6 +5742,9 @@ static INT HTTP_GetResponseHeaders(http_request_t *request, BOOL clear) if(!request->netconn) goto lend; + /* clear old response headers (eg. from a redirect response) */ + HTTP_clear_response_headers( request ); + NETCON_set_timeout( request->netconn, FALSE, request->receive_timeout ); do { /* @@ -5751,12 +5754,6 @@ static INT HTTP_GetResponseHeaders(http_request_t *request, BOOL clear) if (!read_line(request, bufferA, &buflen)) goto lend; - /* clear old response headers (eg. from a redirect response) */ - if (clear) { - HTTP_clear_response_headers( request ); - clear = FALSE; - } - rc += buflen; MultiByteToWideChar( CP_ACP, 0, bufferA, buflen, buffer, MAX_REPLY_LEN ); /* check is this a status code line? */

1 0