September 2013 - Wine-Commits

Stefan Dösinger : wined3d: Don' t clamp texture lookups in the ARB fixed function fragment pipe.
by Alexandre Julliard Sept. 5, 2013

Sept. 5, 2013

Module: wine Branch: master Commit: 37c4f3a88c0cb11248e92a6834c7352b0a969445 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37c4f3a88c0cb11248e92a683… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Sep 5 10:42:11 2013 +0200 wined3d: Don't clamp texture lookups in the ARB fixed function fragment pipe. --- dlls/wined3d/arb_program_shader.c | 20 +++++++------------- 1 files changed, 7 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index aad30e9..9f02d21 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -6176,7 +6176,7 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, con BOOL luminance_used[MAX_TEXTURES] = {FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE}; UINT lowest_disabled_stage; const char *textype; - const char *instr, *sat; + const char *instr; char colorcor_dst[8]; GLuint ret; DWORD arg0, arg1, arg2; @@ -6316,12 +6316,6 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, con default: textype = "unexpected_textype"; break; } - if (settings->op[stage].cop == WINED3D_TOP_BUMPENVMAP - || settings->op[stage].cop == WINED3D_TOP_BUMPENVMAP_LUMINANCE) - sat = ""; - else - sat = "_SAT"; - if(settings->op[stage].projected == proj_none) { instr = "TEX"; } else if(settings->op[stage].projected == proj_count4 || @@ -6356,8 +6350,8 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, con shader_addline(&buffer, "ADD ret, ret, fragment.texcoord[%u];\n", stage); } - shader_addline(&buffer, "%s%s tex%u, ret, texture[%u], %s;\n", - instr, sat, stage, stage, textype); + shader_addline(&buffer, "%s tex%u, ret, texture[%u], %s;\n", + instr, stage, stage, textype); if (settings->op[stage - 1].cop == WINED3D_TOP_BUMPENVMAP_LUMINANCE) { shader_addline(&buffer, "MAD_SAT ret.x, tex%u.z, luminance%u.x, luminance%u.y;\n", @@ -6367,11 +6361,11 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, con } else if(settings->op[stage].projected == proj_count3) { shader_addline(&buffer, "MOV ret, fragment.texcoord[%u];\n", stage); shader_addline(&buffer, "MOV ret.w, ret.z;\n"); - shader_addline(&buffer, "%s%s tex%u, ret, texture[%u], %s;\n", - instr, sat, stage, stage, textype); + shader_addline(&buffer, "%s tex%u, ret, texture[%u], %s;\n", + instr, stage, stage, textype); } else { - shader_addline(&buffer, "%s%s tex%u, fragment.texcoord[%u], texture[%u], %s;\n", - instr, sat, stage, stage, stage, textype); + shader_addline(&buffer, "%s tex%u, fragment.texcoord[%u], texture[%u], %s;\n", + instr, stage, stage, stage, textype); } sprintf(colorcor_dst, "tex%u", stage);

1 0

Stefan Dösinger : ddraw: Enumerate DXT2 and DXT4.
by Alexandre Julliard Sept. 5, 2013

Sept. 5, 2013

Module: wine Branch: master Commit: 22fc22d28b655aff30a3f0517af1fd5086cf9e71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22fc22d28b655aff30a3f0517… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Sep 5 10:42:15 2013 +0200 ddraw: Enumerate DXT2 and DXT4. --- dlls/ddraw/device.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 449b5b8..9be17c1 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -1073,7 +1073,9 @@ static HRESULT d3d_device7_EnumTextureFormats(IDirect3DDevice7 *iface, WINED3DFMT_P8_UINT, /* FOURCC codes */ WINED3DFMT_DXT1, + WINED3DFMT_DXT2, WINED3DFMT_DXT3, + WINED3DFMT_DXT4, WINED3DFMT_DXT5, };

1 0

Stefan Dösinger : ddraw: Create managed pool textures.
by Alexandre Julliard Sept. 5, 2013

Sept. 5, 2013

Module: wine Branch: master Commit: b88daee3bce083f8121117e9d0bece715eb8490c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b88daee3bce083f8121117e9d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Sep 5 10:42:14 2013 +0200 ddraw: Create managed pool textures. The surfaces are already in WINED3D_POOL_MANAGED. --- dlls/ddraw/surface.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 6435774..b7136e1 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5607,9 +5607,9 @@ HRESULT ddraw_surface_create_texture(struct ddraw_surface *surface, DWORD surfac else layers = 1; - /* DDSCAPS_SYSTEMMEMORY textures are in WINED3D_POOL_SYSTEM_MEM. - * Should I forward the MANAGED cap to the managed pool? */ - if (desc->ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY) + if (desc->ddsCaps.dwCaps2 & DDSCAPS2_TEXTUREMANAGE) + pool = WINED3D_POOL_MANAGED; + else if (desc->ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY) pool = WINED3D_POOL_SYSTEM_MEM; else pool = WINED3D_POOL_DEFAULT;

1 0

Stefan Dösinger : ddraw/tests: Test DDCAPS2_TEXTUREMANAGE compatibility, with other flags.
by Alexandre Julliard Sept. 5, 2013

Sept. 5, 2013

Module: wine Branch: master Commit: 8da09ba196e6e9256ae93698729aa69776ff5270 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8da09ba196e6e9256ae936987… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Sep 4 23:19:20 2013 +0200 ddraw/tests: Test DDCAPS2_TEXTUREMANAGE compatibility, with other flags. --- dlls/ddraw/ddraw.c | 15 +++++++ dlls/ddraw/tests/ddraw4.c | 96 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 96 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 207 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 26f1984..652d20b 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2699,6 +2699,21 @@ static HRESULT CreateSurface(struct ddraw *ddraw, DDSURFACEDESC2 *DDSD, } } + if (DDSD->ddsCaps.dwCaps2 & DDSCAPS2_TEXTUREMANAGE) + { + if (!(DDSD->ddsCaps.dwCaps & DDSCAPS_TEXTURE)) + { + WARN("DDSCAPS2_TEXTUREMANAGE used without DDSCAPS_TEXTURE, returning DDERR_INVALIDCAPS.\n"); + return DDERR_INVALIDCAPS; + } + if (DDSD->ddsCaps.dwCaps & (DDSCAPS_VIDEOMEMORY | DDSCAPS_SYSTEMMEMORY)) + { + WARN("DDSCAPS2_TEXTUREMANAGE used width DDSCAPS_VIDEOMEMORY " + "or DDSCAPS_SYSTEMMEMORY, returning DDERR_INVALIDCAPS.\n"); + return DDERR_INVALIDCAPS; + } + } + /* According to the msdn this flag is ignored by CreateSurface */ if (DDSD->dwSize >= sizeof(DDSURFACEDESC2)) DDSD->ddsCaps.dwCaps2 &= ~DDSCAPS2_MIPMAPSUBLEVEL; diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index fbaa6ca..b0e014d 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -3819,6 +3819,101 @@ static void test_coop_level_activateapp(void) IDirectDraw4_Release(ddraw); } +static void test_texturemanage(void) +{ + IDirectDraw4 *ddraw; + HRESULT hr; + DDSURFACEDESC2 ddsd; + IDirectDrawSurface4 *surface; + unsigned int i; + DDCAPS hal_caps, hel_caps; + DWORD needed_caps = DDSCAPS_TEXTURE | DDSCAPS_VIDEOMEMORY; + static const struct + { + DWORD caps_in, caps2_in; + HRESULT hr; + DWORD caps_out, caps2_out; + } + tests[] = + { + {DDSCAPS_SYSTEMMEMORY | DDSCAPS_TEXTURE, DDSCAPS2_TEXTUREMANAGE, DDERR_INVALIDCAPS, + ~0U, ~0U}, + {DDSCAPS_VIDEOMEMORY | DDSCAPS_TEXTURE, DDSCAPS2_TEXTUREMANAGE, DDERR_INVALIDCAPS, + ~0U, ~0U}, + {DDSCAPS_TEXTURE, DDSCAPS2_TEXTUREMANAGE, DD_OK, + DDSCAPS_SYSTEMMEMORY | DDSCAPS_TEXTURE, DDSCAPS2_TEXTUREMANAGE}, + {DDSCAPS_VIDEOMEMORY | DDSCAPS_TEXTURE, 0, DD_OK, + DDSCAPS_VIDEOMEMORY | DDSCAPS_TEXTURE | DDSCAPS_LOCALVIDMEM, 0}, + {DDSCAPS_SYSTEMMEMORY | DDSCAPS_TEXTURE, 0, DD_OK, + DDSCAPS_SYSTEMMEMORY | DDSCAPS_TEXTURE, 0}, + + {0, DDSCAPS2_TEXTUREMANAGE, DDERR_INVALIDCAPS, + ~0U, ~0U}, + {DDSCAPS_SYSTEMMEMORY, DDSCAPS2_TEXTUREMANAGE, DDERR_INVALIDCAPS, + ~0U, ~0U}, + {DDSCAPS_VIDEOMEMORY, DDSCAPS2_TEXTUREMANAGE, DDERR_INVALIDCAPS, + ~0U, ~0U}, + {DDSCAPS_VIDEOMEMORY, 0, DD_OK, + DDSCAPS_LOCALVIDMEM | DDSCAPS_VIDEOMEMORY, 0}, + {DDSCAPS_SYSTEMMEMORY, 0, DD_OK, + DDSCAPS_SYSTEMMEMORY, 0}, + }; + + if (!(ddraw = create_ddraw())) + { + skip("Failed to create IDirectDraw4 object, skipping tests.\n"); + return; + } + + hr = IDirectDraw4_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + + memset(&hal_caps, 0, sizeof(hal_caps)); + hal_caps.dwSize = sizeof(hal_caps); + memset(&hel_caps, 0, sizeof(hel_caps)); + hel_caps.dwSize = sizeof(hel_caps); + hr = IDirectDraw4_GetCaps(ddraw, &hal_caps, &hel_caps); + ok(SUCCEEDED(hr), "Failed to get caps, hr %#x.\n", hr); + if ((hal_caps.ddsCaps.dwCaps & needed_caps) != needed_caps) + { + skip("Managed textures not supported, skipping managed texture test.\n"); + IDirectDraw4_Release(ddraw); + return; + } + + for (i = 0; i < sizeof(tests) / sizeof(*tests); i++) + { + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS; + ddsd.ddsCaps.dwCaps = tests[i].caps_in; + ddsd.ddsCaps.dwCaps2 = tests[i].caps2_in; + ddsd.dwWidth = 4; + ddsd.dwHeight = 4; + + hr = IDirectDraw4_CreateSurface(ddraw, &ddsd, &surface, NULL); + ok(hr == tests[i].hr, "Got unexpected, hr %#x, case %u.\n", hr, i); + if (FAILED(hr)) + continue; + + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + hr = IDirectDrawSurface4_GetSurfaceDesc(surface, &ddsd); + ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); + + ok(ddsd.ddsCaps.dwCaps == tests[i].caps_out, + "Input caps %#x, %#x, expected output caps %#x, got %#x, case %u.\n", + tests[i].caps_in, tests[i].caps2_in, tests[i].caps_out, ddsd.ddsCaps.dwCaps, i); + ok(ddsd.ddsCaps.dwCaps2 == tests[i].caps2_out, + "Input caps %#x, %#x, expected output caps %#x, got %#x, case %u.\n", + tests[i].caps_in, tests[i].caps2_in, tests[i].caps2_out, ddsd.ddsCaps.dwCaps2, i); + + IDirectDrawSurface4_Release(surface); + } + + IDirectDraw4_Release(ddraw); +} + START_TEST(ddraw4) { test_process_vertices(); @@ -3849,4 +3944,5 @@ START_TEST(ddraw4) test_coop_level_versions(); test_lighting_interface_versions(); test_coop_level_activateapp(); + test_texturemanage(); } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 2ed1b94..5197ccea 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -3633,6 +3633,101 @@ static void test_coop_level_activateapp(void) IDirectDraw7_Release(ddraw); } +static void test_texturemanage(void) +{ + IDirectDraw7 *ddraw; + HRESULT hr; + DDSURFACEDESC2 ddsd; + IDirectDrawSurface7 *surface; + unsigned int i; + DDCAPS hal_caps, hel_caps; + DWORD needed_caps = DDSCAPS_TEXTURE | DDSCAPS_VIDEOMEMORY; + static const struct + { + DWORD caps_in, caps2_in; + HRESULT hr; + DWORD caps_out, caps2_out; + } + tests[] = + { + {DDSCAPS_SYSTEMMEMORY | DDSCAPS_TEXTURE, DDSCAPS2_TEXTUREMANAGE, DDERR_INVALIDCAPS, + ~0U, ~0U}, + {DDSCAPS_VIDEOMEMORY | DDSCAPS_TEXTURE, DDSCAPS2_TEXTUREMANAGE, DDERR_INVALIDCAPS, + ~0U, ~0U}, + {DDSCAPS_TEXTURE, DDSCAPS2_TEXTUREMANAGE, DD_OK, + DDSCAPS_SYSTEMMEMORY | DDSCAPS_TEXTURE, DDSCAPS2_TEXTUREMANAGE}, + {DDSCAPS_VIDEOMEMORY | DDSCAPS_TEXTURE, 0, DD_OK, + DDSCAPS_VIDEOMEMORY | DDSCAPS_TEXTURE | DDSCAPS_LOCALVIDMEM, 0}, + {DDSCAPS_SYSTEMMEMORY | DDSCAPS_TEXTURE, 0, DD_OK, + DDSCAPS_SYSTEMMEMORY | DDSCAPS_TEXTURE, 0}, + + {0, DDSCAPS2_TEXTUREMANAGE, DDERR_INVALIDCAPS, + ~0U, ~0U}, + {DDSCAPS_SYSTEMMEMORY, DDSCAPS2_TEXTUREMANAGE, DDERR_INVALIDCAPS, + ~0U, ~0U}, + {DDSCAPS_VIDEOMEMORY, DDSCAPS2_TEXTUREMANAGE, DDERR_INVALIDCAPS, + ~0U, ~0U}, + {DDSCAPS_VIDEOMEMORY, 0, DD_OK, + DDSCAPS_LOCALVIDMEM | DDSCAPS_VIDEOMEMORY, 0}, + {DDSCAPS_SYSTEMMEMORY, 0, DD_OK, + DDSCAPS_SYSTEMMEMORY, 0}, + }; + + if (!(ddraw = create_ddraw())) + { + skip("Failed to create IDirectDraw7 object, skipping tests.\n"); + return; + } + + hr = IDirectDraw7_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + + memset(&hal_caps, 0, sizeof(hal_caps)); + hal_caps.dwSize = sizeof(hal_caps); + memset(&hel_caps, 0, sizeof(hel_caps)); + hel_caps.dwSize = sizeof(hel_caps); + hr = IDirectDraw7_GetCaps(ddraw, &hal_caps, &hel_caps); + ok(SUCCEEDED(hr), "Failed to get caps, hr %#x.\n", hr); + if ((hal_caps.ddsCaps.dwCaps & needed_caps) != needed_caps) + { + skip("Managed textures not supported, skipping managed texture test.\n"); + IDirectDraw7_Release(ddraw); + return; + } + + for (i = 0; i < sizeof(tests) / sizeof(*tests); i++) + { + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS; + ddsd.ddsCaps.dwCaps = tests[i].caps_in; + ddsd.ddsCaps.dwCaps2 = tests[i].caps2_in; + ddsd.dwWidth = 4; + ddsd.dwHeight = 4; + + hr = IDirectDraw7_CreateSurface(ddraw, &ddsd, &surface, NULL); + ok(hr == tests[i].hr, "Got unexpected, hr %#x, case %u.\n", hr, i); + if (FAILED(hr)) + continue; + + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + hr = IDirectDrawSurface7_GetSurfaceDesc(surface, &ddsd); + ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); + + ok(ddsd.ddsCaps.dwCaps == tests[i].caps_out, + "Input caps %#x, %#x, expected output caps %#x, got %#x, case %u.\n", + tests[i].caps_in, tests[i].caps2_in, tests[i].caps_out, ddsd.ddsCaps.dwCaps, i); + ok(ddsd.ddsCaps.dwCaps2 == tests[i].caps2_out, + "Input caps %#x, %#x, expected output caps %#x, got %#x, case %u.\n", + tests[i].caps_in, tests[i].caps2_in, tests[i].caps2_out, ddsd.ddsCaps.dwCaps2, i); + + IDirectDrawSurface7_Release(surface); + } + + IDirectDraw7_Release(ddraw); +} + START_TEST(ddraw7) { HMODULE module = GetModuleHandleA("ddraw.dll"); @@ -3671,4 +3766,5 @@ START_TEST(ddraw7) test_fog_special(); test_lighting_interface_versions(); test_coop_level_activateapp(); + test_texturemanage(); }

1 0

Stefan Dösinger : wined3d: Use the ftoa helper function in the ARB shader backend.
by Alexandre Julliard Sept. 5, 2013

Sept. 5, 2013

Module: wine Branch: master Commit: b73464a41337992c612e14035375c0da70d7eb36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b73464a41337992c612e14035… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Sep 5 10:42:12 2013 +0200 wined3d: Use the ftoa helper function in the ARB shader backend. This is the ARB equivalent to e0494afa007a1d1ba2f4b649beedca27cb20808e. --- dlls/wined3d/arb_program_shader.c | 94 ++++++++++++++++++++++--------------- dlls/wined3d/glsl_shader.c | 76 +++++------------------------- dlls/wined3d/shader.c | 5 ++ dlls/wined3d/utils.c | 49 +++++++++++++++++++ dlls/wined3d/wined3d_private.h | 4 ++ 5 files changed, 127 insertions(+), 101 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b73464a41337992c612e1…

1 0

Nikolay Sivov : ntdll: Inherit default activation context from creation thread.
by Alexandre Julliard Sept. 5, 2013

Sept. 5, 2013

Module: wine Branch: master Commit: 93c59714c0ba67cb9215433125a414eeee8633e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93c59714c0ba67cb921543312… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 5 11:35:17 2013 +0400 ntdll: Inherit default activation context from creation thread. --- dlls/kernel32/tests/thread.c | 14 +++++++++++--- dlls/ntdll/thread.c | 17 ++++++++++++++++- 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 0f3564f..33797d8 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -287,7 +287,6 @@ static DWORD WINAPI thread_actctx_func(void *p) cur = (void*)0xdeadbeef; ret = pGetCurrentActCtx(&cur); ok(ret, "thread GetCurrentActCtx failed, %u\n", GetLastError()); -todo_wine ok(cur == param->handle, "got %p, expected %p\n", cur, param->handle); param->thread_context = cur; @@ -1550,6 +1549,17 @@ static void test_thread_actctx(void) ok(b, "GetCurentActCtx failed: %u\n", GetLastError()); ok(handle == 0, "active context %p\n", handle); + /* without active context */ + param.thread_context = (void*)0xdeadbeef; + param.handle = NULL; + thread = CreateThread(NULL, 0, thread_actctx_func, &param, 0, &tid); + ok(thread != NULL, "failed, got %u\n", GetLastError()); + + ret = WaitForSingleObject(thread, 1000); + ok(ret == WAIT_OBJECT_0, "wait timeout\n"); + ok(param.thread_context == NULL, "got wrong thread context %p\n", param.thread_context); + CloseHandle(thread); + b = pActivateActCtx(context, &cookie); ok(b, "activation failed: %u\n", GetLastError()); @@ -1568,7 +1578,6 @@ static void test_thread_actctx(void) ret = WaitForSingleObject(thread, 1000); ok(ret == WAIT_OBJECT_0, "wait timeout\n"); -todo_wine ok(param.thread_context == context, "got wrong thread context %p, %p\n", param.thread_context, context); CloseHandle(thread); @@ -1579,7 +1588,6 @@ todo_wine ret = WaitForSingleObject(thread, 1000); ok(ret == WAIT_OBJECT_0, "wait timeout\n"); -todo_wine ok(param.thread_context == context, "got wrong thread context %p, %p\n", param.thread_context, context); CloseHandle(thread); diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 703e83c..9c34c0c 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -432,7 +432,7 @@ NTSTATUS WINAPI RtlCreateUserThread( HANDLE process, const SECURITY_DESCRIPTOR * pthread_attr_t attr; struct ntdll_thread_data *thread_data; struct startup_info *info = NULL; - HANDLE handle = 0; + HANDLE handle = 0, actctx = 0; TEB *teb = NULL; DWORD tid = 0; int request_pipe[2]; @@ -497,6 +497,21 @@ NTSTATUS WINAPI RtlCreateUserThread( HANDLE process, const SECURITY_DESCRIPTOR * teb->StaticUnicodeString.Buffer = teb->StaticUnicodeBuffer; teb->StaticUnicodeString.MaximumLength = sizeof(teb->StaticUnicodeBuffer); + /* create default activation context frame for new thread */ + RtlGetActiveActivationContext(&actctx); + if (actctx) + { + RTL_ACTIVATION_CONTEXT_STACK_FRAME *frame; + + frame = RtlAllocateHeap(GetProcessHeap(), 0, sizeof(*frame)); + frame->Previous = NULL; + frame->ActivationContext = actctx; + frame->Flags = 0; + teb->ActivationContextStack.ActiveFrame = frame; + + RtlAddRefActivationContext(actctx); + } + info = (struct startup_info *)(teb + 1); info->teb = teb; info->entry_point = start;

1 0

Rafał Mużyło : configure: Don' t use X_PRE_LIBS.
by Alexandre Julliard Sept. 5, 2013

Sept. 5, 2013

Module: wine Branch: master Commit: bb50d6fd9512a9a05306c56112bbcdc6de6c8d65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb50d6fd9512a9a05306c5611… Author: Rafał Mużyło <galtgendo(a)gmail.com> Date: Wed Sep 4 21:57:45 2013 +0200 configure: Don't use X_PRE_LIBS. --- configure | 4 ++-- configure.ac | 4 ++-- dlls/glu32/Makefile.in | 2 +- dlls/winex11.drv/Makefile.in | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/configure b/configure index 6b2c2c8..3143509 100755 --- a/configure +++ b/configure @@ -9308,7 +9308,7 @@ if ${ac_cv_lib_GLU_gluLookAt+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lGLU $OPENGL_LIBS $X_LIBS $X_PRE_LIBS $XLIB -lm $X_EXTRA_LIBS $LIBS" +LIBS="-lGLU $OPENGL_LIBS $X_LIBS $XLIB -lm $X_EXTRA_LIBS $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -9360,7 +9360,7 @@ if ${ac_cv_lib_soname_OSMesa+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_soname_save_LIBS=$LIBS -LIBS="-lOSMesa $X_LIBS $X_PRE_LIBS $XLIB -lm $X_EXTRA_LIBS $LIBS" +LIBS="-lOSMesa $X_LIBS $XLIB -lm $X_EXTRA_LIBS $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ diff --git a/configure.ac b/configure.ac index 7c1cb1c..7b662b4 100644 --- a/configure.ac +++ b/configure.ac @@ -1206,14 +1206,14 @@ This probably prevents linking to OpenGL. Try deleting the file and restarting c $X_LIBS $XLIB -lm $X_EXTRA_LIBS) if test "x$with_glu" != "xno" then - AC_CHECK_LIB(GLU,gluLookAt,[:],,[$OPENGL_LIBS $X_LIBS $X_PRE_LIBS $XLIB -lm $X_EXTRA_LIBS]) + AC_CHECK_LIB(GLU,gluLookAt,[:],,[$OPENGL_LIBS $X_LIBS $XLIB -lm $X_EXTRA_LIBS]) WINE_NOTICE_WITH(glu,[test "x$ac_cv_lib_GLU_gluLookAt" != xyes], [libGLU ${notice_platform}development files not found, GLU won't be supported.]) fi if test "x$with_osmesa" != "xno" then - WINE_CHECK_SONAME(OSMesa,glAccum,,,[$X_LIBS $X_PRE_LIBS $XLIB -lm $X_EXTRA_LIBS]) + WINE_CHECK_SONAME(OSMesa,glAccum,,,[$X_LIBS $XLIB -lm $X_EXTRA_LIBS]) WINE_NOTICE_WITH(osmesa,[test "x$ac_cv_lib_soname_OSMesa" = "x"], [libOSMesa ${notice_platform}development files not found (or too old), OpenGL rendering in bitmaps won't be supported.]) fi diff --git a/dlls/glu32/Makefile.in b/dlls/glu32/Makefile.in index df2b39e..21a6b85 100644 --- a/dlls/glu32/Makefile.in +++ b/dlls/glu32/Makefile.in @@ -1,7 +1,7 @@ MODULE = glu32.dll IMPORTLIB = glu32 EXTRAINCL = @X_CFLAGS@ -EXTRALIBS = -lGLU @OPENGL_LIBS@ @X_LIBS@ @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@ +EXTRALIBS = -lGLU @OPENGL_LIBS@ @X_LIBS@ @XLIB@ @X_EXTRA_LIBS@ C_SRCS = \ glu.c diff --git a/dlls/winex11.drv/Makefile.in b/dlls/winex11.drv/Makefile.in index 194c409..35553f3 100644 --- a/dlls/winex11.drv/Makefile.in +++ b/dlls/winex11.drv/Makefile.in @@ -2,7 +2,7 @@ MODULE = winex11.drv IMPORTS = uuid user32 gdi32 advapi32 DELAYIMPORTS = comctl32 ole32 shell32 imm32 EXTRAINCL = @X_CFLAGS@ -EXTRALIBS = @X_LIBS@ @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@ +EXTRALIBS = @X_LIBS@ @XLIB@ @X_EXTRA_LIBS@ C_SRCS = \ bitblt.c \

1 0

Hans Leidekker : rpcrt4: Add support for NTLM and Negotiate.
by Alexandre Julliard Sept. 5, 2013

Sept. 5, 2013

Module: wine Branch: master Commit: 9ea95f4105cb2c68ff823c822130000e22807675 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ea95f4105cb2c68ff823c822… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 4 15:01:10 2013 +0200 rpcrt4: Add support for NTLM and Negotiate. --- dlls/rpcrt4/rpc_transport.c | 550 +++++++++++++++++++++++++++++++++++++------ 1 files changed, 472 insertions(+), 78 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9ea95f4105cb2c68ff823…

1 0

Michael Stefaniuc : ntdll: Avoid TRUE FALSE conditional expressions.
by Alexandre Julliard Sept. 5, 2013

Sept. 5, 2013

Module: wine Branch: master Commit: 74b191a605af019f5bd3b579be44e527bb499fdf URL: http://source.winehq.org/git/wine.git/?a=commit;h=74b191a605af019f5bd3b579b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Sep 5 11:17:22 2013 +0200 ntdll: Avoid TRUE FALSE conditional expressions. --- dlls/ntdll/om.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/om.c b/dlls/ntdll/om.c index 8b92f1b..47a2614 100644 --- a/dlls/ntdll/om.c +++ b/dlls/ntdll/om.c @@ -165,8 +165,8 @@ NTSTATUS WINAPI NtQueryObject(IN HANDLE handle, status = wine_server_call( req ); if (status == STATUS_SUCCESS) { - p->InheritHandle = (reply->old_flags & HANDLE_FLAG_INHERIT) ? TRUE : FALSE; - p->ProtectFromClose = (reply->old_flags & HANDLE_FLAG_PROTECT_FROM_CLOSE) ? TRUE : FALSE; + p->InheritHandle = (reply->old_flags & HANDLE_FLAG_INHERIT) != 0; + p->ProtectFromClose = (reply->old_flags & HANDLE_FLAG_PROTECT_FROM_CLOSE) != 0; if (used_len) *used_len = sizeof(*p); } }

1 0

Henri Verbeet : d3dcompiler: Avoid LPCVOID.
by Alexandre Julliard Sept. 5, 2013

Sept. 5, 2013

Module: wine Branch: master Commit: 1046aa6e48f7c9a2f89c91ee3fe375ead5a29e3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1046aa6e48f7c9a2f89c91ee3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 5 09:54:43 2013 +0200 d3dcompiler: Avoid LPCVOID. --- dlls/d3dcompiler_43/compiler.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index 371f670..d09b5f6 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -193,11 +193,8 @@ static void *wpp_open_mem(const char *filename, int type) if(!desc) return NULL; - hr = ID3DInclude_Open(current_include, - type ? D3D_INCLUDE_LOCAL : D3D_INCLUDE_SYSTEM, - filename, parent_include, (LPCVOID *)&desc->buffer, - &desc->size); - if(FAILED(hr)) + if (FAILED(hr = ID3DInclude_Open(current_include, type ? D3D_INCLUDE_LOCAL : D3D_INCLUDE_SYSTEM, + filename, parent_include, (const void **)&desc->buffer, &desc->size))) { HeapFree(GetProcessHeap(), 0, desc); return NULL;

1 0