February 2010 - Wine-Commits

Matteo Bruni : wpp: Assure if_stack is clean before returning.
by Alexandre Julliard Feb. 5, 2010

Feb. 5, 2010

Module: wine Branch: master Commit: b40bb31995b70a9bf88f194deac34084c16a4c86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b40bb31995b70a9bf88f194de… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Thu Feb 4 18:56:52 2010 +0100 wpp: Assure if_stack is clean before returning. --- libs/wpp/wpp.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/libs/wpp/wpp.c b/libs/wpp/wpp.c index 47989f1..de4286f 100644 --- a/libs/wpp/wpp.c +++ b/libs/wpp/wpp.c @@ -193,9 +193,11 @@ int wpp_parse( const char *input, FILE *output ) ret = ppy_parse(); /* If there were errors during processing, return an error code */ - if(!ret && pp_status.state) ret = pp_status.state; + if (!ret && pp_status.state) ret = pp_status.state; if (input) wpp_callbacks->close(pp_status.file); + /* Clean if_stack, it could remain dirty on errors */ + while (pp_get_if_depth()) pp_pop_if(); pp_pop_define_state(); return ret; }

1 0

Henri Verbeet : wined3d: Add the general combiner limit to wined3d_gl_info.
by Alexandre Julliard Feb. 5, 2010

Feb. 5, 2010

Module: wine Branch: master Commit: b59dd0e4e8b0ed172b093c1cf3a7cd945b88f2f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b59dd0e4e8b0ed172b093c1cf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 4 18:30:04 2010 +0100 wined3d: Add the general combiner limit to wined3d_gl_info. --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/nvidia_texture_shader.c | 2 +- dlls/wined3d/wined3d_gl.h | 1 + 3 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 8ba33ba..1215414 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1923,7 +1923,9 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_adapter *adapter) { GLint tmp; glGetIntegerv(GL_MAX_GENERAL_COMBINERS_NV, &tmp); + gl_info->limits.general_combiners = tmp; gl_info->limits.texture_stages = min(MAX_TEXTURES, tmp); + TRACE_(d3d_caps)("Max general combiners: %d.\n", tmp); } else { diff --git a/dlls/wined3d/nvidia_texture_shader.c b/dlls/wined3d/nvidia_texture_shader.c index 56e2ee7..64bb883 100644 --- a/dlls/wined3d/nvidia_texture_shader.c +++ b/dlls/wined3d/nvidia_texture_shader.c @@ -670,7 +670,7 @@ static void nvrc_fragment_get_caps(const struct wined3d_gl_info *gl_info, struct WINED3DTEXOPCAPS_PREMODULATE */ #endif - pCaps->MaxTextureBlendStages = gl_info->limits.texture_stages; + pCaps->MaxTextureBlendStages = min(MAX_TEXTURES, gl_info->limits.general_combiners); pCaps->MaxSimultaneousTextures = gl_info->limits.textures; pCaps->PrimitiveMiscCaps |= WINED3DPMISCCAPS_TSSARGTEMP; diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 07ce7af..5a3fbb4 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -4619,6 +4619,7 @@ struct wined3d_gl_limits UINT fragment_samplers; UINT vertex_samplers; UINT combined_samplers; + UINT general_combiners; UINT sampler_stages; UINT clipplanes; UINT texture_size;

1 0

Dylan Smith : richedit: Removed unused local variable yStart.
by Alexandre Julliard Feb. 5, 2010

Feb. 5, 2010

Module: wine Branch: master Commit: e9693d627295280ee9f622588522b2189178be8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9693d627295280ee9f622588… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Feb 4 12:52:57 2010 -0500 richedit: Removed unused local variable yStart. --- dlls/riched20/wrap.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 00229b2..75f47a2 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -580,7 +580,6 @@ BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) ME_DisplayItem *item; ME_Context c; BOOL bModified = FALSE; - int yStart = -1; int totalWidth = 0; ME_InitContext(&c, editor, ITextHost_TxGetDC(editor->texthost)); @@ -598,11 +597,7 @@ BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) ME_WrapTextParagraph(&c, item); if (bRedraw) - { item->member.para.nFlags |= MEPF_REPAINT; - if (yStart == -1) - yStart = c.pt.y; - } bModified = bModified | bRedraw;

1 0

Henri Verbeet : wined3d: Use the HDC from the acquired context to call SwapBuffer().
by Alexandre Julliard Feb. 5, 2010

Feb. 5, 2010

Module: wine Branch: master Commit: ba8e6f713bcae6ba3aa90061ddce0fa9069af25c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba8e6f713bcae6ba3aa90061d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 4 18:30:08 2010 +0100 wined3d: Use the HDC from the acquired context to call SwapBuffer(). These should be the same, but this way the relation is clearer. --- dlls/wined3d/swapchain.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 838d461..cbdb961 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -274,7 +274,7 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, CO IWineD3DSurface_BltFast(This->backBuffer[0], 0, 0, This->device->logo_surface, NULL, WINEDDBLTFAST_SRCCOLORKEY); } - TRACE("presetting HDC %p\n", This->context[0]->hdc); + TRACE("Presenting HDC %p.\n", context->hdc); render_to_fbo = This->render_to_fbo; @@ -341,7 +341,7 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, CO } if (This->num_contexts > 1) wglFinish(); - SwapBuffers(This->context[0]->hdc); /* TODO: cycle through the swapchain buffers */ + SwapBuffers(context->hdc); /* TODO: cycle through the swapchain buffers */ TRACE("SwapBuffers called, Starting new frame\n"); /* FPS support */

1 0

Maarten Lankhorst : avrt: Add stub for AvSetMmThreadPriority.
by Alexandre Julliard Feb. 5, 2010

Feb. 5, 2010

Module: wine Branch: master Commit: 1879912939d2fa5c7ddc896597f9c5d8387f6ea9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1879912939d2fa5c7ddc89659… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Feb 4 13:27:09 2010 +0100 avrt: Add stub for AvSetMmThreadPriority. --- dlls/avrt/avrt.spec | 2 +- dlls/avrt/main.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/avrt/avrt.spec b/dlls/avrt/avrt.spec index a253d9a..640a12a 100644 --- a/dlls/avrt/avrt.spec +++ b/dlls/avrt/avrt.spec @@ -11,4 +11,4 @@ @ stub AvSetMmMaxThreadCharacteristicsW @ stdcall AvSetMmThreadCharacteristicsA(str ptr) @ stdcall AvSetMmThreadCharacteristicsW(wstr ptr) -@ stub AvSetMmThreadPriority +@ stdcall AvSetMmThreadPriority(ptr long) diff --git a/dlls/avrt/main.c b/dlls/avrt/main.c index 4552c6f..111ffcd 100644 --- a/dlls/avrt/main.c +++ b/dlls/avrt/main.c @@ -90,3 +90,9 @@ BOOL WINAPI AvRevertMmThreadCharacteristics(HANDLE AvrtHandle) FIXME("(%p): stub\n", AvrtHandle); return 1; } + +BOOL WINAPI AvSetMmThreadPriority(HANDLE AvrtHandle, AVRT_PRIORITY prio) +{ + FIXME("(%p)->(%u) stub\n", AvrtHandle, prio); + return 1; +}

1 0

Peter Rosin : ntdll: Document RtlSetThreadErrorMode and RtlGetThreadErrorMode.
by Alexandre Julliard Feb. 5, 2010

Feb. 5, 2010

Module: wine Branch: master Commit: 091f0fedfe3736cf9690d32bef6ddfb3dd1fb50b URL: http://source.winehq.org/git/wine.git/?a=commit;h=091f0fedfe3736cf9690d32be… Author: Peter Rosin <peda(a)lysator.liu.se> Date: Thu Feb 4 08:20:10 2010 +0100 ntdll: Document RtlSetThreadErrorMode and RtlGetThreadErrorMode. --- dlls/ntdll/rtl.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 69a2955..d4a7045 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -1168,6 +1168,16 @@ NTSTATUS WINAPI RtlDecompressBuffer(USHORT CompressionFormat, PUCHAR Uncompresse /*********************************************************************** * RtlSetThreadErrorMode [NTDLL.@] + * + * Set the thread local error mode. + * + * PARAMS + * mode [I] The new error mode + * oldmode [O] Destination of the old error mode (may be NULL) + * + * RETURNS + * Success: STATUS_SUCCESS + * Failure: STATUS_INVALID_PARAMETER_1 */ NTSTATUS WINAPI RtlSetThreadErrorMode( DWORD mode, LPDWORD oldmode ) { @@ -1183,6 +1193,14 @@ NTSTATUS WINAPI RtlSetThreadErrorMode( DWORD mode, LPDWORD oldmode ) /*********************************************************************** * RtlGetThreadErrorMode [NTDLL.@] + * + * Get the thread local error mode. + * + * PARAMS + * None. + * + * RETURNS + * The current thread local error mode. */ DWORD WINAPI RtlGetThreadErrorMode( void ) {

1 0

André Hentschel : oleaut32/tests: Use testvalues from VarDateFromUdate also for regression testing of DosDateTimeToVariantTime .
by Alexandre Julliard Feb. 5, 2010

Feb. 5, 2010

Module: wine Branch: master Commit: 691e15b427c6be44744f8796099d09d18c8c7e09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=691e15b427c6be44744f87960… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Feb 4 21:16:18 2010 +0100 oleaut32/tests: Use testvalues from VarDateFromUdate also for regression testing of DosDateTimeToVariantTime. --- dlls/oleaut32/tests/vartest.c | 35 +++++++++++++++++++++++++++++++++++ 1 files changed, 35 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index c5d65a2..ef2445a 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -1779,6 +1779,41 @@ static void test_DosDateTimeToVariantTime(void) DOS2DT(1,1,1980,0,0,60,0,0.0); /* Invalid seconds */ DOS2DT(1,1,1980,23,0,0,1,29221.95833333333); /* 1/1/1980 11:00:00 PM */ DOS2DT(1,1,1980,24,0,0,0,0.0); /* Invalid hours */ + + DOS2DT(1,1,1980,0,0,1,1,29221.0); + DOS2DT(2,1,1980,0,0,0,1,29222.0); + DOS2DT(2,1,1980,0,0,0,1,29222.0); + DOS2DT(31,12,1990,0,0,0,1,33238.0); + DOS2DT(31,12,90,0,0,0,1,40543.0); + DOS2DT(30,12,1899,0,0,0,1,46751.0); + DOS2DT(1,1,100,0,0,0,1,43831.0); + DOS2DT(31,12,9999,0,0,0,1,59901.0); + DOS2DT(1,1,10000,0,0,0,1,59902.0); + DOS2DT(1,1,-10000,0,0,0,1,48214.0); + + DOS2DT(30,12,1899,0,0,0,1,46751.0); + DOS2DT(30,12,1899,0,0,1,1,46751.0); + + DOS2DT(1,1,1980,18,1,16,1,29221.75087962963); + DOS2DT(1,300,1980,18,1,16,1,29556.75087962963); + DOS2DT(300,1,1980,18,1,16,1,29232.75087962963); + DOS2DT(0,1,1980,42,1,16,1,29220.4175462963); + DOS2DT(1,1,1980,17,61,16,0,0.0); + DOS2DT(1,1,1980,18,0,76,1,29221.75013888889); + DOS2DT(1,-300,1980,18,1,16,1,29312.75087962963); + DOS2DT(-300,1,1980,18,1,16,1,29240.75087962963); + DOS2DT(3,1,1980,-30,1,16,1,29223.08421296296); + DOS2DT(1,1,1980,20,-119,16,1,29221.83976851852); + DOS2DT(1,1,1980,18,3,-104,1,29221.75236111111); + DOS2DT(1,12001,-1020,18,1,16,1,55519.75087962963); + DOS2DT(1,-23,1982,18,1,16,1,30195.75087962963); + DOS2DT(-59,3,1980,18,1,16,1,29285.75087962963); + DOS2DT(1,1,0,0,0,0,1,54058.0); + DOS2DT(0,0,1980,0,0,0,1,29189.0); + DOS2DT(0,1,1980,0,0,0,1,29220.0); + DOS2DT(-1,1,1980,18,1,16,1,29251.75087962963); + DOS2DT(1,1,-1,18,1,16,1,53693.75087962963); + DOS2DT(1,-1,1980,18,1,16,0,0); } static void test_dt2dos(int line, double dt, INT r, WORD d, WORD m, WORD y,

1 0

Henri Verbeet : wined3d: Set the texture stage limit based on the fragment pipe caps.
by Alexandre Julliard Feb. 5, 2010

Feb. 5, 2010

Module: wine Branch: master Commit: 4c7bcb883b2affd7cd023e66c554c912fd15d5bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c7bcb883b2affd7cd023e66c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 4 18:30:05 2010 +0100 wined3d: Set the texture stage limit based on the fragment pipe caps. --- dlls/wined3d/directx.c | 27 ++++++++++++--------------- dlls/wined3d/state.c | 2 +- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 1215414..7335a71 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1674,6 +1674,7 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_adapter *adapter) const char *GL_Extensions = NULL; const char *WGL_Extensions = NULL; const char *gl_string = NULL; + struct fragment_caps fragment_caps; enum wined3d_pci_vendor vendor; enum wined3d_pci_device device; GLint gl_max; @@ -1739,7 +1740,6 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_adapter *adapter) memset(gl_info->supported, 0, sizeof(gl_info->supported)); gl_info->limits.buffers = 1; gl_info->limits.textures = 1; - gl_info->limits.texture_stages = 1; gl_info->limits.fragment_samplers = 1; gl_info->limits.vertex_samplers = 0; gl_info->limits.combined_samplers = gl_info->limits.fragment_samplers + gl_info->limits.vertex_samplers; @@ -1907,6 +1907,13 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_adapter *adapter) gl_info->supported[ATI_FRAGMENT_SHADER] = FALSE; } } + + if (gl_info->supported[NV_REGISTER_COMBINERS]) + { + glGetIntegerv(GL_MAX_GENERAL_COMBINERS_NV, &gl_max); + gl_info->limits.general_combiners = gl_max; + TRACE_(d3d_caps)("Max general combiners: %d.\n", gl_max); + } if (gl_info->supported[ARB_DRAW_BUFFERS]) { glGetIntegerv(GL_MAX_DRAW_BUFFERS_ARB, &gl_max); @@ -1919,20 +1926,6 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_adapter *adapter) gl_info->limits.textures = min(MAX_TEXTURES, gl_max); TRACE_(d3d_caps)("Max textures: %d.\n", gl_info->limits.textures); - if (gl_info->supported[NV_REGISTER_COMBINERS]) - { - GLint tmp; - glGetIntegerv(GL_MAX_GENERAL_COMBINERS_NV, &tmp); - gl_info->limits.general_combiners = tmp; - gl_info->limits.texture_stages = min(MAX_TEXTURES, tmp); - TRACE_(d3d_caps)("Max general combiners: %d.\n", tmp); - } - else - { - gl_info->limits.texture_stages = min(MAX_TEXTURES, gl_max); - } - TRACE_(d3d_caps)("Max texture stages: %d.\n", gl_info->limits.texture_stages); - if (gl_info->supported[ARB_FRAGMENT_PROGRAM]) { GLint tmp; @@ -2110,6 +2103,10 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_adapter *adapter) adapter->shader_backend = select_shader_backend(adapter); adapter->blitter = select_blit_implementation(adapter); + adapter->fragment_pipe->get_caps(gl_info, &fragment_caps); + gl_info->limits.texture_stages = fragment_caps.MaxTextureBlendStages; + TRACE_(d3d_caps)("Max texture stages: %u.\n", gl_info->limits.texture_stages); + /* In some cases the number of texture stages can be larger than the number * of samplers. The GF4 for example can use only 2 samplers (no fragment * shaders), but 8 texture stages (register combiners). */ diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 6f27baf..5efe069 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -5552,7 +5552,7 @@ static void ffp_fragment_get_caps(const struct wined3d_gl_info *gl_info, struct if (gl_info->supported[ARB_TEXTURE_ENV_DOT3]) pCaps->TextureOpCaps |= WINED3DTEXOPCAPS_DOTPRODUCT3; - pCaps->MaxTextureBlendStages = gl_info->limits.texture_stages; + pCaps->MaxTextureBlendStages = gl_info->limits.textures; pCaps->MaxSimultaneousTextures = gl_info->limits.textures; }

1 0

Peter Rosin : kernel32: Document SetThreadErrorMode and GetThreadErrorMode.
by Alexandre Julliard Feb. 5, 2010

Feb. 5, 2010

Module: wine Branch: master Commit: 678cb27b3aa40404de09c131c95344f66274d856 URL: http://source.winehq.org/git/wine.git/?a=commit;h=678cb27b3aa40404de09c131c… Author: Peter Rosin <peda(a)lysator.liu.se> Date: Thu Feb 4 14:22:28 2010 +0100 kernel32: Document SetThreadErrorMode and GetThreadErrorMode. --- dlls/kernel32/thread.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/thread.c b/dlls/kernel32/thread.c index e3754c2..f6a2b0f 100644 --- a/dlls/kernel32/thread.c +++ b/dlls/kernel32/thread.c @@ -671,6 +671,17 @@ static DWORD rtlmode_to_win32mode( DWORD rtlmode ) /*********************************************************************** * SetThreadErrorMode (KERNEL32.@) + * + * Set the thread local error mode. + * + * PARAMS + * mode [I] The new error mode, a bitwise or of SEM_FAILCRITICALERRORS, + * SEM_NOGPFAULTERRORBOX and SEM_NOOPENFILEERRORBOX. + * oldmode [O] Destination of the old error mode (may be NULL) + * + * RETURNS + * Success: TRUE + * Failure: FALSE, check GetLastError */ BOOL WINAPI SetThreadErrorMode( DWORD mode, LPDWORD oldmode ) { @@ -707,6 +718,14 @@ BOOL WINAPI SetThreadErrorMode( DWORD mode, LPDWORD oldmode ) /*********************************************************************** * GetThreadErrorMode (KERNEL32.@) + * + * Get the thread local error mode. + * + * PARAMS + * None. + * + * RETURNS + * The current thread local error mode. */ DWORD WINAPI GetThreadErrorMode( void ) {

1 0

Henri Verbeet : wined3d: Call SetDestWindowOverride() before acquiring a context.
by Alexandre Julliard Feb. 5, 2010

Feb. 5, 2010

Module: wine Branch: master Commit: d0afc7567b33f64f0a441d9a3ffeeeb4a81a5e43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0afc7567b33f64f0a441d9a3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 4 18:30:07 2010 +0100 wined3d: Call SetDestWindowOverride() before acquiring a context. --- dlls/wined3d/swapchain.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 6b44cd5..838d461 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -217,6 +217,8 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, CO unsigned int sync; int retval; + IWineD3DSwapChain_SetDestWindowOverride(iface, hDestWindowOverride); + context = context_acquire(This->device, This->backBuffer[0], CTXUSAGE_RESOURCELOAD); /* Render the cursor onto the back buffer, using our nifty directdraw blitting code :-) */ @@ -274,11 +276,6 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, CO TRACE("presetting HDC %p\n", This->context[0]->hdc); - /* Don't call checkGLcall, as glGetError is not applicable here */ - if (hDestWindowOverride && This->win_handle != hDestWindowOverride) { - IWineD3DSwapChain_SetDestWindowOverride(iface, hDestWindowOverride); - } - render_to_fbo = This->render_to_fbo; if (pSourceRect) @@ -522,7 +519,7 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_SetDestWindowOverride(IWineD3DSwapCh WINED3DLOCKED_RECT r; BYTE *mem; - if(window == This->win_handle) return WINED3D_OK; + if (!window || window == This->win_handle) return WINED3D_OK; TRACE("Performing dest override of swapchain %p from window %p to %p\n", This, This->win_handle, window); if (This->context[0] == This->device->contexts[0])

1 0