September 2013 - Wine-Commits

Francois Gouget : oleaut32/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard Sept. 13, 2013

Sept. 13, 2013

Module: wine Branch: master Commit: 51e717345bd2d076a9918b8b804eb31957f1fb4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=51e717345bd2d076a9918b8b8… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Sep 12 23:55:23 2013 +0200 oleaut32/tests: Fix compilation on systems that don't support nameless unions. --- dlls/oleaut32/tests/typelib.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 17a3b99..e1ede75 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -4224,8 +4224,8 @@ static void test_SetVarHelpContext(void) ok(pdesc->memid == 0x40000000, "got wrong memid: %x\n", pdesc->memid); ok(pdesc->elemdescVar.tdesc.vt == VT_INT, "got wrong vardesc type: %u\n", pdesc->elemdescVar.tdesc.vt); ok(pdesc->varkind == VAR_CONST, "got wrong varkind: %u\n", pdesc->varkind); - ok(V_VT(U(pdesc)->lpvarValue) == VT_INT, "got wrong value type: %u\n", V_VT(U(pdesc)->lpvarValue)); - ok(V_INT(U(pdesc)->lpvarValue) == 1, "got wrong value: 0x%x\n", V_INT(U(pdesc)->lpvarValue)); + ok(V_VT(U(*pdesc).lpvarValue) == VT_INT, "got wrong value type: %u\n", V_VT(U(*pdesc).lpvarValue)); + ok(V_INT(U(*pdesc).lpvarValue) == 1, "got wrong value: 0x%x\n", V_INT(U(*pdesc).lpvarValue)); hr = ITypeInfo_GetDocumentation(ti, pdesc->memid, NULL, NULL, &ctx, NULL); ok(hr == S_OK, "got %08x\n", hr); @@ -4409,8 +4409,8 @@ static void test_SetVarDocString(void) ok(pdesc->memid == 0x40000000, "got wrong memid: %x\n", pdesc->memid); ok(pdesc->elemdescVar.tdesc.vt == VT_INT, "got wrong vardesc type: %u\n", pdesc->elemdescVar.tdesc.vt); ok(pdesc->varkind == VAR_CONST, "got wrong varkind: %u\n", pdesc->varkind); - ok(V_VT(U(pdesc)->lpvarValue) == VT_INT, "got wrong value type: %u\n", V_VT(U(pdesc)->lpvarValue)); - ok(V_INT(U(pdesc)->lpvarValue) == 1, "got wrong value: 0x%x\n", V_INT(U(pdesc)->lpvarValue)); + ok(V_VT(U(*pdesc).lpvarValue) == VT_INT, "got wrong value type: %u\n", V_VT(U(*pdesc).lpvarValue)); + ok(V_INT(U(*pdesc).lpvarValue) == 1, "got wrong value: 0x%x\n", V_INT(U(*pdesc).lpvarValue)); hr = ITypeInfo_GetDocumentation(ti, pdesc->memid, &namestr, &docstr, NULL, NULL); ok(hr == S_OK, "got %08x\n", hr);

1 0

Dmitry Timoshkov : ntdll: NtReadFile should fail for overlapped IO on files if offset is negative.
by Alexandre Julliard Sept. 13, 2013

Sept. 13, 2013

Module: wine Branch: master Commit: eb10471bac5510ab5a265069c472e9085e721191 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb10471bac5510ab5a265069c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Sep 13 15:45:53 2013 +0900 ntdll: NtReadFile should fail for overlapped IO on files if offset is negative. --- dlls/ntdll/file.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 2d07255..15e8829 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -606,7 +606,7 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent, if (type == FD_TYPE_FILE) { - if (!(options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT)) && !offset) + if (!(options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT)) && (!offset || offset->QuadPart < 0)) { status = STATUS_INVALID_PARAMETER; goto done;

1 0

Dmitry Timoshkov : ntdll: Make NtWriteFile explicitly check for negative offset and fail.
by Alexandre Julliard Sept. 13, 2013

Sept. 13, 2013

Module: wine Branch: master Commit: b314a253203127a38613d844dc05a82141093cca URL: http://source.winehq.org/git/wine.git/?a=commit;h=b314a253203127a38613d844d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Sep 13 15:45:44 2013 +0900 ntdll: Make NtWriteFile explicitly check for negative offset and fail. --- dlls/ntdll/file.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index dd67b3d..2d07255 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -982,6 +982,11 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, } off = st.st_size; } + else if (offset->QuadPart < 0) + { + status = STATUS_INVALID_PARAMETER; + goto done; + } /* async I/O doesn't make sense on regular files */ while ((result = pwrite( unix_handle, buffer, length, off )) == -1)

1 0

Henri Verbeet : d3d9: Avoid LPCWSTR.
by Alexandre Julliard Sept. 13, 2013

Sept. 13, 2013

Module: wine Branch: master Commit: e55e24a73132ad20e1b0b56898fbc38fb2853e83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e55e24a73132ad20e1b0b5689… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 13 10:18:12 2013 +0200 d3d9: Avoid LPCWSTR. --- dlls/d3d9/d3d9_main.c | 15 +++++++++------ include/d3d9.h | 14 +++++++------- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/dlls/d3d9/d3d9_main.c b/dlls/d3d9/d3d9_main.c index ad2e330..2059b98 100644 --- a/dlls/d3d9/d3d9_main.c +++ b/dlls/d3d9/d3d9_main.c @@ -106,8 +106,9 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) /*********************************************************************** * D3DPERF_BeginEvent (D3D9.@) */ -int WINAPI D3DPERF_BeginEvent(D3DCOLOR color, LPCWSTR name) { - TRACE("(color %#x, name %s) : stub\n", color, debugstr_w(name)); +int WINAPI D3DPERF_BeginEvent(D3DCOLOR color, const WCHAR *name) +{ + TRACE("color 0x%08x, name %s.\n", color, debugstr_w(name)); return D3DPERF_event_level++; } @@ -151,13 +152,15 @@ BOOL WINAPI D3DPERF_QueryRepeatFrame(void) { /*********************************************************************** * D3DPERF_SetMarker (D3D9.@) */ -void WINAPI D3DPERF_SetMarker(D3DCOLOR color, LPCWSTR name) { - FIXME("(color %#x, name %s) : stub\n", color, debugstr_w(name)); +void WINAPI D3DPERF_SetMarker(D3DCOLOR color, const WCHAR *name) +{ + FIXME("color 0x%08x, name %s stub!\n", color, debugstr_w(name)); } /*********************************************************************** * D3DPERF_SetRegion (D3D9.@) */ -void WINAPI D3DPERF_SetRegion(D3DCOLOR color, LPCWSTR name) { - FIXME("(color %#x, name %s) : stub\n", color, debugstr_w(name)); +void WINAPI D3DPERF_SetRegion(D3DCOLOR color, const WCHAR *name) +{ + FIXME("color 0x%08x, name %s stub!\n", color, debugstr_w(name)); } diff --git a/include/d3d9.h b/include/d3d9.h index ce39c10..dc6518b 100644 --- a/include/d3d9.h +++ b/include/d3d9.h @@ -2087,13 +2087,13 @@ DECLARE_INTERFACE_(IDirect3DDevice9Ex,IDirect3DDevice9) extern "C" { #endif /* defined(__cplusplus) */ -int WINAPI D3DPERF_BeginEvent(D3DCOLOR,LPCWSTR); -int WINAPI D3DPERF_EndEvent(void); -DWORD WINAPI D3DPERF_GetStatus(void); -BOOL WINAPI D3DPERF_QueryRepeatFrame(void); -void WINAPI D3DPERF_SetMarker(D3DCOLOR,LPCWSTR); -void WINAPI D3DPERF_SetOptions(DWORD); -void WINAPI D3DPERF_SetRegion(D3DCOLOR,LPCWSTR); +int WINAPI D3DPERF_BeginEvent(D3DCOLOR color, const WCHAR *name); +int WINAPI D3DPERF_EndEvent(void); +DWORD WINAPI D3DPERF_GetStatus(void); +BOOL WINAPI D3DPERF_QueryRepeatFrame(void); +void WINAPI D3DPERF_SetMarker(D3DCOLOR color, const WCHAR *name); +void WINAPI D3DPERF_SetOptions(DWORD options); +void WINAPI D3DPERF_SetRegion(D3DCOLOR color, const WCHAR *name); /* Define the main entrypoint as well */ IDirect3D9* WINAPI Direct3DCreate9(UINT SDKVersion);

1 0

Henri Verbeet : wined3d: Never set the first render target to the front buffer in wined3d_device_init_3d ().
by Alexandre Julliard Sept. 13, 2013

Sept. 13, 2013

Module: wine Branch: master Commit: fc85f4f7d6b051a0ba72ffe7791d120318ac6ccf URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc85f4f7d6b051a0ba72ffe77… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 13 10:18:11 2013 +0200 wined3d: Never set the first render target to the front buffer in wined3d_device_init_3d(). --- dlls/wined3d/device.c | 16 +++++++--------- 1 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 561525b..627f0eb 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -878,6 +878,7 @@ HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; struct wined3d_swapchain *swapchain = NULL; struct wined3d_context *context; + DWORD clear_flags = 0; HRESULT hr; DWORD state; @@ -941,13 +942,9 @@ HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, { TRACE("Setting rendertarget to %p.\n", swapchain->back_buffers); device->fb.render_targets[0] = swapchain->back_buffers[0]; + wined3d_surface_incref(device->fb.render_targets[0]); + clear_flags |= WINED3DCLEAR_TARGET; } - else - { - TRACE("Setting rendertarget to %p.\n", swapchain->front_buffer); - device->fb.render_targets[0] = swapchain->front_buffer; - } - wined3d_surface_incref(device->fb.render_targets[0]); /* Depth Stencil support */ device->fb.depth_stencil = device->auto_depth_stencil; @@ -991,9 +988,10 @@ HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, context_release(context); /* Clear the screen */ - wined3d_device_clear(device, 0, NULL, WINED3DCLEAR_TARGET - | (swapchain_desc->enable_auto_depth_stencil ? WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL : 0), - &black, 1.0f, 0); + if (swapchain_desc->enable_auto_depth_stencil) + clear_flags |= WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL; + if (clear_flags) + wined3d_device_clear(device, 0, NULL, clear_flags, &black, 1.0f, 0); device->d3d_initialized = TRUE;

1 0

Nikolay Sivov : ntdll: Added compatible ProgID section.
by Alexandre Julliard Sept. 13, 2013

Sept. 13, 2013

Module: wine Branch: master Commit: 84d9b2502e3d57aa89970d04dda04df507fd4c14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84d9b2502e3d57aa89970d04d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 13 11:06:51 2013 +0400 ntdll: Added compatible ProgID section. --- dlls/kernel32/tests/actctx.c | 5 - dlls/ntdll/actctx.c | 248 +++++++++++++++++++++++++++++++++++++++++- dlls/ole32/tests/compobj.c | 18 +++ 3 files changed, 265 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=84d9b2502e3d57aa89970…

1 0

Huw Davies : Don't save the selected state.
by Alexandre Julliard Sept. 13, 2013

Sept. 13, 2013

Module: fontforge Branch: master Commit: bd54d56438ffeb436e73f262440bc716d969e8c9 URL: http://source.winehq.org/git/fontforge.git/?a=commit;h=bd54d56438ffeb436e73… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Sep 13 11:27:45 2013 +0100 Don't save the selected state. --- fontforge/sfd.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/fontforge/sfd.c b/fontforge/sfd.c index aa19b78..96e2bb4 100644 --- a/fontforge/sfd.c +++ b/fontforge/sfd.c @@ -620,7 +620,7 @@ static void SFDDumpSplineSet(FILE *sfd,SplineSet *spl) { (double) sp->prevcp.x, (double) sp->prevcp.y, (double) sp->me.x, (double) sp->me.y ); #endif - fprintf(sfd, "%d", sp->pointtype|(sp->selected<<2)| + fprintf(sfd, "%d", sp->pointtype|/*(sp->selected<<2)|*/ (sp->nextcpdef<<3)|(sp->prevcpdef<<4)| (sp->roundx<<5)|(sp->roundy<<6)| (sp->ttfindex==0xffff?(1<<7):0)|

1 0

André Hentschel : wineusr: Add a note about access rights to unix devices.
by Alexandre Julliard Sept. 13, 2013

Sept. 13, 2013

Module: docs Branch: master Commit: 0bc3120e0f929acd4a1437daede1b9de385f53a2 URL: http://source.winehq.org/git/docs.git/?a=commit;h=0bc3120e0f929acd4a1437dae… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Sep 11 21:45:53 2013 +0200 wineusr: Add a note about access rights to unix devices. --- en/wineusr-configuring.sgml | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/en/wineusr-configuring.sgml b/en/wineusr-configuring.sgml index 1be0389..ff54fa5 100644 --- a/en/wineusr-configuring.sgml +++ b/en/wineusr-configuring.sgml @@ -606,7 +606,8 @@ ln -sf /usr/local/etc/wine.systemreg system.reg number, such as <filename class="devicefile">lpt1</filename>. You should link these directly to the corresponding Unix devices, such as <filename class="devicefile">/dev/ttyS0</filename> and - <filename class="devicefile">/dev/lp0</filename>. For example, to configure + <filename class="devicefile">/dev/lp0</filename>. Make sure you have the needed + access rights to that device. For example, to configure one serial port and one parallel port, run the following commands: <screen> ln -s /dev/ttyS0 com1 @@ -618,7 +619,7 @@ ln -s /dev/lp0 lpt1 <title>Network Shares</title> <para> - Windows shares can are mapped into the <filename class="directory">unc/</filename> + Windows shares can be mapped into the <filename class="directory">unc/</filename> directory so anything trying to access <filename>\\<replaceable>myserver</replaceable>\<replaceable>some</replaceable>\<replaceable>file</replaceable></filename> will look in

1 0

Andrew Eikum : ieframe: Register CLSID_WebBrowser as an ActiveX control.
by Alexandre Julliard Sept. 12, 2013

Sept. 12, 2013

Module: wine Branch: master Commit: b6570bb88c52f1edeb096a7b85a5ebd1cf1551a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6570bb88c52f1edeb096a7b8… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Sep 12 10:49:25 2013 -0500 ieframe: Register CLSID_WebBrowser as an ActiveX control. Also cleanup the RGS to not create an unintended '{}' registry entry for InternetShortcut. --- dlls/ieframe/ieframe.rgs | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/ieframe/ieframe.rgs b/dlls/ieframe/ieframe.rgs index cf8f3b4..f99e6b6 100644 --- a/dlls/ieframe/ieframe.rgs +++ b/dlls/ieframe/ieframe.rgs @@ -34,9 +34,13 @@ HKCR { shellex { - MayChangeDefaultMenu {} + MayChangeDefaultMenu } } + '{8856f961-340a-11d0-a96b-00c04fd705a2}' + { + Control + } } 'InternetShortcut' {

1 0

Stefan Dösinger : wined3d: Move the decoded stream info into the context.
by Alexandre Julliard Sept. 12, 2013

Sept. 12, 2013

Module: wine Branch: master Commit: d8c43aabf7fb872ec07e2302be4cacbed65d9a4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8c43aabf7fb872ec07e2302b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Sep 12 12:23:29 2013 +0200 wined3d: Move the decoded stream info into the context. --- dlls/wined3d/arb_program_shader.c | 13 +-- dlls/wined3d/buffer.c | 2 +- dlls/wined3d/context.c | 215 ++++++++++++++++++++++++++++++++++++- dlls/wined3d/device.c | 213 +------------------------------------ dlls/wined3d/drawprim.c | 10 +- dlls/wined3d/glsl_shader.c | 8 +- dlls/wined3d/state.c | 29 +++--- dlls/wined3d/wined3d_private.h | 19 ++-- 8 files changed, 252 insertions(+), 257 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d8c43aabf7fb872ec07e2…

1 0