June 2013 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Don't use state_colormat() with the GLSL vertex pipe.
by Alexandre Julliard June 14, 2013

June 14, 2013

Module: wine Branch: master Commit: 8a7ddfbb53c2234907ac21ea89fd4f69b3cb8a67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a7ddfbb53c2234907ac21ea8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 14 09:07:11 2013 +0200 wined3d: Don't use state_colormat() with the GLSL vertex pipe. None of the code in there should be needed for the GLSL vertex pipe, and the "untracked materials" counter in particular will trigger an unnecessary fallback to drawStridedSlow(). --- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/state.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ffe4d25..412c601 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -6895,7 +6895,7 @@ static const struct StateEntryTemplate glsl_vertex_pipe_vp_states[] = {STATE_RENDER(WINED3D_RS_CLIPPLANEENABLE), {STATE_RENDER(WINED3D_RS_CLIPPING), NULL }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_LIGHTING), {STATE_VDECL, NULL }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_AMBIENT), {STATE_RENDER(WINED3D_RS_AMBIENT), state_ambient }, WINED3D_GL_EXT_NONE }, - {STATE_RENDER(WINED3D_RS_COLORVERTEX), {STATE_VDECL, NULL }, WINED3D_GL_EXT_NONE }, + {STATE_RENDER(WINED3D_RS_COLORVERTEX), {STATE_RENDER(WINED3D_RS_COLORVERTEX), glsl_vertex_pipe_shader}, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_LOCALVIEWER), {STATE_VDECL, NULL }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_NORMALIZENORMALS), {STATE_VDECL, NULL }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_DIFFUSEMATERIALSOURCE), {STATE_VDECL, NULL }, WINED3D_GL_EXT_NONE }, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 491ee91..74261ec 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4574,7 +4574,7 @@ void vertexdeclaration(struct wined3d_context *context, const struct wined3d_sta && !isStateDirty(context, STATE_TRANSFORM(WINED3D_TS_VIEW))) transform_world(context, state, STATE_TRANSFORM(WINED3D_TS_WORLD_MATRIX(0))); if (!isStateDirty(context, STATE_RENDER(WINED3D_RS_COLORVERTEX))) - state_colormat(context, state, STATE_RENDER(WINED3D_RS_COLORVERTEX)); + context_apply_state(context, state, STATE_RENDER(WINED3D_RS_COLORVERTEX)); if (!isStateDirty(context, STATE_RENDER(WINED3D_RS_LIGHTING))) state_lighting(context, state, STATE_RENDER(WINED3D_RS_LIGHTING));

1 0

Henri Verbeet : wined3d: Allow a custom pitch to be specified in wined3d_surface_set_mem().
by Alexandre Julliard June 14, 2013

June 14, 2013

Module: wine Branch: master Commit: 4de77fa23f1c41dbafdcf8382dcb5daf39b6b5c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4de77fa23f1c41dbafdcf8382… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 14 09:07:10 2013 +0200 wined3d: Allow a custom pitch to be specified in wined3d_surface_set_mem(). --- dlls/d3d9/device.c | 2 +- dlls/ddraw/surface.c | 18 +++++++++++++----- dlls/wined3d/surface.c | 9 +++++++-- dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_private.h | 5 +++-- include/wine/wined3d.h | 2 +- 6 files changed, 26 insertions(+), 12 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 49de853..738a274 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -766,7 +766,7 @@ static HRESULT WINAPI d3d9_device_CreateTexture(IDirect3DDevice9Ex *iface, resource = wined3d_texture_get_sub_resource(object->wined3d_texture, 0); surface = wined3d_resource_get_parent(resource); - wined3d_surface_set_mem(surface->wined3d_surface, *shared_handle); + wined3d_surface_set_mem(surface->wined3d_surface, *shared_handle, 0); } TRACE("Created texture %p.\n", object); diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 4ca02bd..4108fcd 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -4233,7 +4233,7 @@ static HRESULT WINAPI ddraw_surface7_SetSurfaceDesc(IDirectDrawSurface7 *iface, | DDSD_HEIGHT | DDSD_PITCH | DDSD_CAPS; enum wined3d_format_id format_id; BOOL update_wined3d = FALSE; - UINT width, height; + UINT pitch, width, height; TRACE("iface %p, surface_desc %p, flags %#x.\n", iface, DDSD, Flags); @@ -4293,6 +4293,7 @@ static HRESULT WINAPI ddraw_surface7_SetSurfaceDesc(IDirectDrawSurface7 *iface, TRACE("Surface pitch changed from %u to %u.\n", This->surface_desc.u1.lPitch, DDSD->u1.lPitch); update_wined3d = TRUE; } + pitch = DDSD->u1.lPitch; width = DDSD->dwWidth; } else if (DDSD->dwFlags & DDSD_PITCH) @@ -4302,6 +4303,7 @@ static HRESULT WINAPI ddraw_surface7_SetSurfaceDesc(IDirectDrawSurface7 *iface, } else { + pitch = This->surface_desc.u1.lPitch; width = This->surface_desc.dwWidth; } @@ -4370,8 +4372,7 @@ static HRESULT WINAPI ddraw_surface7_SetSurfaceDesc(IDirectDrawSurface7 *iface, if (DDSD->dwFlags & DDSD_LPSURFACE && DDSD->lpSurface) { - hr = wined3d_surface_set_mem(This->wined3d_surface, DDSD->lpSurface); - if (FAILED(hr)) + if (FAILED(hr = wined3d_surface_set_mem(This->wined3d_surface, DDSD->lpSurface, pitch))) { /* No need for a trace here, wined3d does that for us */ switch(hr) @@ -5843,8 +5844,15 @@ HRESULT ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, } if (desc->dwFlags & DDSD_LPSURFACE) { - hr = wined3d_surface_set_mem(surface->wined3d_surface, desc->lpSurface); - if (FAILED(hr)) + UINT pitch = 0; + + if (desc->dwFlags & DDSD_PITCH) + { + pitch = desc->u1.lPitch; + surface->surface_desc.u1.lPitch = pitch; + } + + if (FAILED(hr = wined3d_surface_set_mem(surface->wined3d_surface, desc->lpSurface, pitch))) { ERR("Failed to set surface memory, hr %#x.\n", hr); wined3d_surface_decref(surface->wined3d_surface); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 773424a..a325ac0 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -101,7 +101,7 @@ static void surface_cleanup(struct wined3d_surface *surface) } if (surface->flags & SFLAG_USERPTR) - wined3d_surface_set_mem(surface, NULL); + wined3d_surface_set_mem(surface, NULL, 0); if (surface->overlay_dest) list_remove(&surface->overlay_entry); @@ -3202,6 +3202,9 @@ DWORD CDECL wined3d_surface_get_pitch(const struct wined3d_surface *surface) TRACE("surface %p.\n", surface); + if (surface->pitch) + return surface->pitch; + if (format->flags & WINED3DFMT_FLAG_BLOCKS) { /* Since compressed formats are block based, pitch means the amount of @@ -3221,7 +3224,7 @@ DWORD CDECL wined3d_surface_get_pitch(const struct wined3d_surface *surface) return pitch; } -HRESULT CDECL wined3d_surface_set_mem(struct wined3d_surface *surface, void *mem) +HRESULT CDECL wined3d_surface_set_mem(struct wined3d_surface *surface, void *mem, UINT pitch) { TRACE("surface %p, mem %p.\n", surface, mem); @@ -3290,6 +3293,8 @@ HRESULT CDECL wined3d_surface_set_mem(struct wined3d_surface *surface, void *mem surface_modify_location(surface, SFLAG_INSYSMEM, TRUE); } + surface->pitch = pitch; + return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 8357d2b..f451b7a 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -226,7 +226,7 @@ @ cdecl wined3d_surface_releasedc(ptr ptr) @ cdecl wined3d_surface_restore(ptr) @ cdecl wined3d_surface_set_color_key(ptr long ptr) -@ cdecl wined3d_surface_set_mem(ptr ptr) +@ cdecl wined3d_surface_set_mem(ptr ptr long) @ cdecl wined3d_surface_set_overlay_position(ptr long long) @ cdecl wined3d_surface_set_palette(ptr ptr) @ cdecl wined3d_surface_set_priority(ptr long) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4ac9098..82a4584 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2095,8 +2095,9 @@ struct wined3d_surface DWORD flags; - UINT pow2Width; - UINT pow2Height; + UINT pitch; + UINT pow2Width; + UINT pow2Height; /* A method to retrieve the drawable size. Not in the Vtable to make it changeable */ void (*get_drawable_size)(const struct wined3d_context *context, UINT *width, UINT *height); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index a7a53f1..86e8b5b 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2332,7 +2332,7 @@ HRESULT __cdecl wined3d_surface_releasedc(struct wined3d_surface *surface, HDC d HRESULT __cdecl wined3d_surface_restore(struct wined3d_surface *surface); HRESULT __cdecl wined3d_surface_set_color_key(struct wined3d_surface *surface, DWORD flags, const struct wined3d_color_key *color_key); -HRESULT __cdecl wined3d_surface_set_mem(struct wined3d_surface *surface, void *mem); +HRESULT __cdecl wined3d_surface_set_mem(struct wined3d_surface *surface, void *mem, UINT pitch); HRESULT __cdecl wined3d_surface_set_overlay_position(struct wined3d_surface *surface, LONG x, LONG y); void __cdecl wined3d_surface_set_palette(struct wined3d_surface *surface, struct wined3d_palette *palette); DWORD __cdecl wined3d_surface_set_priority(struct wined3d_surface *surface, DWORD new_priority);

1 0

Francois Gouget : user32/tests: Add a trailing '\n' to a few ok() calls.
by Alexandre Julliard June 14, 2013

June 14, 2013

Module: wine Branch: master Commit: bd97f64d04d68940039fcc9059792af1c9d4d532 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd97f64d04d68940039fcc905… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jun 13 22:21:26 2013 +0200 user32/tests: Add a trailing '\n' to a few ok() calls. --- dlls/user32/tests/win.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index abd7f8d..515a57e 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -1524,13 +1524,13 @@ static void test_MDI_child_stack(HWND mdi_client) cs.lParam = (LPARAM)mdi_lParam_test_message; child_1 = (HWND)SendMessageA(mdi_client, WM_MDICREATE, 0, (LPARAM)&cs); - ok(child_1 != 0, "expected child_1 to be non NULL"); + ok(child_1 != 0, "expected child_1 to be non NULL\n"); child_2 = (HWND)SendMessageA(mdi_client, WM_MDICREATE, 0, (LPARAM)&cs); - ok(child_2 != 0, "expected child_2 to be non NULL"); + ok(child_2 != 0, "expected child_2 to be non NULL\n"); child_3 = (HWND)SendMessageA(mdi_client, WM_MDICREATE, 0, (LPARAM)&cs); - ok(child_3 != 0, "expected child_3 to be non NULL"); + ok(child_3 != 0, "expected child_3 to be non NULL\n"); child_4 = (HWND)SendMessageA(mdi_client, WM_MDICREATE, 0, (LPARAM)&cs); - ok(child_4 != 0, "expected child_4 to be non NULL"); + ok(child_4 != 0, "expected child_4 to be non NULL\n"); stack[0] = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0); stack[1] = GetWindow(stack[0], GW_HWNDNEXT);

1 0

Dmitry Timoshkov : winspool.drv: Avoid converting garbage if there was no DEVMODE passed in.
by Alexandre Julliard June 14, 2013

June 14, 2013

Module: wine Branch: master Commit: aa0cc00b48c458d02d3a069a92da8a358f97efdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa0cc00b48c458d02d3a069a9… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jun 14 12:18:49 2013 +0900 winspool.drv: Avoid converting garbage if there was no DEVMODE passed in. --- dlls/winspool.drv/info.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index fc74e76..2ab2401 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -2410,7 +2410,7 @@ LONG WINAPI DocumentPropertiesW(HWND hWnd, HANDLE hPrinter, if(ret < 0) return ret; pDevModeOutputA = HeapAlloc(GetProcessHeap(), 0, ret); } - pDevModeInputA = DEVMODEdupWtoA(pDevModeInput); + pDevModeInputA = (fMode & DM_IN_BUFFER) ? DEVMODEdupWtoA(pDevModeInput) : NULL; ret = DocumentPropertiesA(hWnd, hPrinter, pDeviceNameA, pDevModeOutputA, pDevModeInputA, fMode); if(pDevModeOutput) {

1 0

Alistair Leslie-Hughes : oleaut32/tests: Add DECIMAL tests.
by Alexandre Julliard June 13, 2013

June 13, 2013

Module: wine Branch: master Commit: 661c2b8a0ed4495b21f4d666222434c47241ae14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=661c2b8a0ed4495b21f4d6662… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jun 13 11:14:42 2013 +1000 oleaut32/tests: Add DECIMAL tests. --- dlls/oleaut32/tests/vartype.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 345a822..bce6fff 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -4335,6 +4335,9 @@ static void test_VarDecAdd(void) ok(hres == DISP_E_OVERFLOW,"Expected overflow, got (%d,%d,%d,(%8x,%8x)x) hres 0x%08x\n", S(U(out)).scale, S(U(out)).sign, out.Hi32, S1(U1(out)).Mid32, S1(U1(out)).Lo32, hres); + SETDEC(l,3,128,0,123456); SETDEC64(r,0,0,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF); + MATH2(VarDecAdd); todo_wine EXPECTDEC64(0,0,-1,0xFFFFFFFF,0xFFFFFF84); + /* Promotes to the highest scale, so here the results are in the scale of 2 */ SETDEC(l,2,0,0,0); SETDEC(r,0,0,0,0); MATH2(VarDecAdd); EXPECTDEC(2,0,0,0); SETDEC(l,2,0,0,100); SETDEC(r,0,0,0,1); MATH2(VarDecAdd); EXPECTDEC(2,0,0,200); @@ -4555,6 +4558,8 @@ static void test_VarDecCmp(void) SETDEC(out,0,DECIMAL_NEG,-1,-1); SETDEC(l,0,DECIMAL_NEG,0,0); MATH1(VarDecCmp); EXPECT_GT; SETDEC(out,0,DECIMAL_NEG,-1,-1); SETDEC(l,0,DECIMAL_NEG,-1,-1); MATH1(VarDecCmp); EXPECT_EQ; + SETDEC(l,3,0,0,123456); SETDEC64(out,0,0,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF); + MATH1(VarDecCmp); todo_wine EXPECT_LT; } static void test_VarDecCmpR8(void)

1 0

Aric Stewart : fonts: Include Arabic characters in Tahoma.
by Alexandre Julliard June 13, 2013

June 13, 2013

Module: wine Branch: master Commit: 121f82bff7665794be6fee841ddfda6973cc7c46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=121f82bff7665794be6fee841… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jun 10 18:38:28 2013 -0500 fonts: Include Arabic characters in Tahoma. Glyphs from Public Domain DejaVu Sans, a font based on Bitstream Vera. --- fonts/tahoma.sfd | 9969 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- fonts/tahoma.ttf | Bin 100420 -> 143904 bytes 2 files changed, 9647 insertions(+), 322 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=121f82bff7665794be6fe…

1 0

Alistair Leslie-Hughes : oledb32: Add remaining INIT Properties.
by Alexandre Julliard June 13, 2013

June 13, 2013

Module: wine Branch: master Commit: 5e42382c31d70342d7885a8cfbb44fd28dfae9d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e42382c31d70342d7885a8cf… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jun 11 14:18:31 2013 +1000 oledb32: Add remaining INIT Properties. --- dlls/oledb32/datainit.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c index dba3087..13d9f55 100644 --- a/dlls/oledb32/datainit.c +++ b/dlls/oledb32/datainit.c @@ -296,34 +296,54 @@ struct dbproperty { VARTYPE type; }; +static const WCHAR asyncW[] = {'A','s','y','n','c','h','r','o','n','o','u','s',' ','P','r','o','c','e','s','s','i','n','g',0}; +static const WCHAR bindW[] = {'B','i','n','d',' ','F','l','a','g','s',0}; +static const WCHAR cacheW[] = {'C','a','c','h','e',' ','A','u','t','h','e','n','i','c','a','t','i','o','n',0}; static const WCHAR conn_timeout[] = {'C','o','n','n','e','c','t',' ','T','i','m','e','o','u','t',0}; static const WCHAR datasourceW[] = {'D','a','t','a',' ','S','o','u','r','c','e',0}; +static const WCHAR encryptW[] = {'E','n','c','r','y','p','t',' ','P','a','s','s','w','o','r','d',0}; static const WCHAR extendedW[] = {'E','x','t','e','n','d','e','d',' ','P','r','o','p','e','r','t','i','e','s',0}; static const WCHAR gen_timeout[] = {'G','e','n','e','r','a','l',' ','T','i','m','e','o','u','t',0}; +static const WCHAR impersonW[] = {'I','m','p','e','r','s','o','n','a','t','i','o','n',' ','L','e','v','e','l',0}; static const WCHAR initcatW[] = {'I','n','i','t','i','a','l',' ','C','a','t','a','l','o','g',0}; +static const WCHAR integratedW[] = {'I','n','t','e','g','r','a','t','e','d',' ','S','e','c','u','r','i','t','y',0}; static const WCHAR localeIDW[] = {'L','o','c','a','l','e',' ','I','d','e','n','t','i','f','i','e','r',0}; static const WCHAR locationW[] = {'L','o','c','a','t','i','o','n',0}; +static const WCHAR lockownerW[] = {'L','o','c','k',' ','O','w','n','e','r',0}; +static const WCHAR maskpassW[] = {'M','a','s','k',' ','P','a','s','s','w','o','r','d',0}; static const WCHAR modeW[] = {'M','o','d','e',0}; static const WCHAR oledbservW[] = {'O','L','E',' ','D','B',' ','S','e','r','v','i','c','i','e','s',0}; static const WCHAR passwordW[] = {'P','a','s','s','w','o','r','d',0}; static const WCHAR persistW[] = {'P','e','r','s','i','s','t',' ','S','e','c','u','r','i','t','y',' ','I','n','f','o',0}; +static const WCHAR persistEncW[] = {'P','e','r','s','i','s','t',' ','E','n','c','r','y','p','t','e','d',0}; static const WCHAR promptW[] = {'P','r','o','m','p','t',0}; +static const WCHAR protectW[] = {'P','r','o','t','e','c','t','i','o','n',' ','l','e','v','e','l',0}; static const WCHAR useridW[] = {'U','s','e','r',' ','I','D',0}; static const WCHAR winhandleW[] = {'W','i','n','d','o','w',' ','H','a','n','d','l','e',0}; static const struct dbproperty dbproperties[] = { + { asyncW, DBPROP_INIT_ASYNCH, DBPROPOPTIONS_OPTIONAL, VT_I4 }, + { bindW, DBPROP_INIT_BINDFLAGS, DBPROPOPTIONS_OPTIONAL, VT_I4 }, + { cacheW, DBPROP_AUTH_CACHE_AUTHINFO, DBPROPOPTIONS_OPTIONAL, VT_BOOL }, { conn_timeout,DBPROP_INIT_TIMEOUT, DBPROPOPTIONS_OPTIONAL, VT_I4 }, { datasourceW, DBPROP_INIT_DATASOURCE, DBPROPOPTIONS_REQUIRED, VT_BSTR }, { extendedW, DBPROP_INIT_PROVIDERSTRING, DBPROPOPTIONS_REQUIRED, VT_BSTR }, + { encryptW, DBPROP_AUTH_ENCRYPT_PASSWORD, DBPROPOPTIONS_REQUIRED, VT_BOOL }, { gen_timeout, DBPROP_INIT_GENERALTIMEOUT, DBPROPOPTIONS_OPTIONAL, VT_I4 }, + { impersonW, DBPROP_INIT_IMPERSONATION_LEVEL, DBPROPOPTIONS_OPTIONAL, VT_I4 }, { initcatW, DBPROP_CATALOGLOCATION, DBPROPOPTIONS_OPTIONAL, VT_BSTR }, + { integratedW, DBPROP_AUTH_INTEGRATED, DBPROPOPTIONS_OPTIONAL, VT_BSTR }, { localeIDW, DBPROP_INIT_LCID, DBPROPOPTIONS_OPTIONAL, VT_I4 }, { locationW, DBPROP_INIT_LOCATION, DBPROPOPTIONS_OPTIONAL, VT_BSTR }, + { lockownerW, DBPROP_INIT_LOCKOWNER, DBPROPOPTIONS_OPTIONAL, VT_BSTR }, + { maskpassW, DBPROP_AUTH_MASK_PASSWORD, DBPROPOPTIONS_OPTIONAL, VT_BOOL }, { modeW, DBPROP_INIT_MODE, DBPROPOPTIONS_OPTIONAL, VT_I4 }, { oledbservW, DBPROP_INIT_OLEDBSERVICES, DBPROPOPTIONS_OPTIONAL, VT_I4 }, { passwordW, DBPROP_AUTH_PASSWORD, DBPROPOPTIONS_OPTIONAL, VT_BSTR }, + { persistEncW, DBPROP_AUTH_PERSIST_ENCRYPTED, DBPROPOPTIONS_OPTIONAL, VT_BOOL }, { persistW, DBPROP_AUTH_PERSIST_SENSITIVE_AUTHINFO, DBPROPOPTIONS_OPTIONAL, VT_BOOL }, { promptW, DBPROP_INIT_PROMPT, DBPROPOPTIONS_OPTIONAL, VT_I2 }, + { protectW, DBPROP_INIT_PROTECTION_LEVEL, DBPROPOPTIONS_OPTIONAL, VT_I4 }, { useridW, DBPROP_AUTH_USERID, DBPROPOPTIONS_OPTIONAL, VT_BSTR }, #ifndef _WIN64 { winhandleW, DBPROP_INIT_HWND, DBPROPOPTIONS_OPTIONAL, VT_I4 },

1 0

Aric Stewart : fonts: Include Arabic characters in Tahoma Bold.
by Alexandre Julliard June 13, 2013

June 13, 2013

Module: wine Branch: master Commit: 2fd3ec7d068ef925e5720222e92cfda4f6badd2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fd3ec7d068ef925e5720222e… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jun 12 14:41:14 2013 -0500 fonts: Include Arabic characters in Tahoma Bold. Glyphs from Public Domain DejaVu Sans Bold, a font based on Bitstream Vera. --- fonts/tahomabd.sfd | 9376 +++++++++++++++++++++++++++++++++++++++++++++++++++- fonts/tahomabd.ttf | Bin 92268 -> 135872 bytes 2 files changed, 9309 insertions(+), 67 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2fd3ec7d068ef925e5720…

1 0

André Hentschel : winemaker: Add includes separately for vcproj files.
by Alexandre Julliard June 13, 2013

June 13, 2013

Module: wine Branch: master Commit: bf236d423f915c2a0c981acfde43e3c6168d7de7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf236d423f915c2a0c981acfd… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jun 12 23:00:30 2013 +0200 winemaker: Add includes separately for vcproj files. --- tools/winemaker | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index 3ddd834..611a490 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -959,8 +959,10 @@ sub source_scan_project_file($$$) if ($vc_compiler_tool->getName eq "AdditionalIncludeDirectories") { $configt=$vc_compiler_tool->getValue; $configt=~s/\\/\//g; - $configt=~s/;/ -I/g; - push @{@$project_settings[$T_INCLUDE_PATH]},"-I".$configt; + my @addincl = split(/\s*;\s*/, $configt); + foreach $configt (@addincl) { + push @{@$project_settings[$T_INCLUDE_PATH]},"-I".$configt; + } } } }

1 0

Alexandre Julliard : secur32: Set the SSL server name to enable the SNI extension.
by Alexandre Julliard June 13, 2013

June 13, 2013

Module: wine Branch: master Commit: c51880149551e54f29ca39970080c0ac94c2d859 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c51880149551e54f29ca39970… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 13 15:50:38 2013 +0200 secur32: Set the SSL server name to enable the SNI extension. --- dlls/secur32/schannel.c | 12 ++++++++++++ dlls/secur32/schannel_gnutls.c | 9 +++++++++ dlls/secur32/schannel_macosx.c | 9 +++++++++ dlls/secur32/secur32_priv.h | 1 + 4 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index ecc189d..240062f 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -825,6 +825,18 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( return SEC_E_INTERNAL_ERROR; } + if (pszTargetName) + { + UINT len = WideCharToMultiByte( CP_UNIXCP, 0, pszTargetName, -1, NULL, 0, NULL, NULL ); + char *target = HeapAlloc( GetProcessHeap(), 0, len ); + + if (target) + { + WideCharToMultiByte( CP_UNIXCP, 0, pszTargetName, -1, target, len, NULL, NULL ); + schan_imp_set_session_target( ctx->session, target ); + HeapFree( GetProcessHeap(), 0, target ); + } + } phNewContext->dwLower = handle; phNewContext->dwUpper = 0; } diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index cbe64e8..ed9bfde 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -66,6 +66,7 @@ MAKE_FUNCPTR(gnutls_priority_set_direct); MAKE_FUNCPTR(gnutls_record_get_max_size); MAKE_FUNCPTR(gnutls_record_recv); MAKE_FUNCPTR(gnutls_record_send); +MAKE_FUNCPTR(gnutls_server_name_set); MAKE_FUNCPTR(gnutls_transport_get_ptr); MAKE_FUNCPTR(gnutls_transport_set_errno); MAKE_FUNCPTR(gnutls_transport_set_ptr); @@ -182,6 +183,13 @@ void schan_imp_set_session_transport(schan_imp_session session, pgnutls_transport_set_ptr(s, (gnutls_transport_ptr_t)t); } +void schan_imp_set_session_target(schan_imp_session session, const char *target) +{ + gnutls_session_t s = (gnutls_session_t)session; + + pgnutls_server_name_set( s, GNUTLS_NAME_DNS, target, strlen(target) ); +} + SECURITY_STATUS schan_imp_handshake(schan_imp_session session) { gnutls_session_t s = (gnutls_session_t)session; @@ -491,6 +499,7 @@ BOOL schan_imp_init(void) LOAD_FUNCPTR(gnutls_record_get_max_size); LOAD_FUNCPTR(gnutls_record_recv); LOAD_FUNCPTR(gnutls_record_send); + LOAD_FUNCPTR(gnutls_server_name_set) LOAD_FUNCPTR(gnutls_transport_get_ptr) LOAD_FUNCPTR(gnutls_transport_set_errno) LOAD_FUNCPTR(gnutls_transport_set_ptr) diff --git a/dlls/secur32/schannel_macosx.c b/dlls/secur32/schannel_macosx.c index 9463c94..5d88223 100644 --- a/dlls/secur32/schannel_macosx.c +++ b/dlls/secur32/schannel_macosx.c @@ -734,6 +734,15 @@ void schan_imp_set_session_transport(schan_imp_session session, s->transport = t; } +void schan_imp_set_session_target(schan_imp_session session, const char *target) +{ + struct mac_session *s = (struct mac_session*)session; + + TRACE("(%p/%p, %s)\n", s, s->context, debugstr_a(target)); + + SSLSetPeerDomainName( s->context, target, strlen(target) ); +} + SECURITY_STATUS schan_imp_handshake(schan_imp_session session) { struct mac_session *s = (struct mac_session*)session; diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index dc08429..ea1fcfb 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -247,6 +247,7 @@ extern BOOL schan_imp_create_session(schan_imp_session *session, schan_credentia extern void schan_imp_dispose_session(schan_imp_session session) DECLSPEC_HIDDEN; extern void schan_imp_set_session_transport(schan_imp_session session, struct schan_transport *t) DECLSPEC_HIDDEN; +extern void schan_imp_set_session_target(schan_imp_session session, const char *target) DECLSPEC_HIDDEN; extern SECURITY_STATUS schan_imp_handshake(schan_imp_session session) DECLSPEC_HIDDEN; extern unsigned int schan_imp_get_session_cipher_block_size(schan_imp_session session) DECLSPEC_HIDDEN; extern unsigned int schan_imp_get_max_message_size(schan_imp_session session) DECLSPEC_HIDDEN;

1 0