February 2010 - Wine-commits

Henri Verbeet : wined3d: Update the swapchain' s present parameters when changing the backbuffer.
by Alexandre Julliard 02 Feb '10

02 Feb '10

Module: wine Branch: master Commit: 93c49f1777764658192eed75e983cf7986669274 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93c49f1777764658192eed75e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 2 12:06:55 2010 +0100 wined3d: Update the swapchain's present parameters when changing the backbuffer. This fixes a bug exposed by commit b5907e23cc595de1f0aba2a615c8c4510b433d36. --- dlls/wined3d/device.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 955b221..02c468f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5621,6 +5621,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetFrontBackBuffers(IWineD3DDevice *ifa if(Swapchain->backBuffer[0]) { IWineD3DSurface_SetContainer(Swapchain->backBuffer[0], (IWineD3DBase *) Swapchain); ((IWineD3DSurfaceImpl *)Swapchain->backBuffer[0])->Flags |= SFLAG_SWAPCHAIN; + Swapchain->presentParms.BackBufferWidth = BackImpl->currentDesc.Width; + Swapchain->presentParms.BackBufferHeight = BackImpl->currentDesc.Height; + Swapchain->presentParms.BackBufferFormat = BackImpl->resource.format_desc->format; } else { HeapFree(GetProcessHeap(), 0, Swapchain->backBuffer); Swapchain->backBuffer = NULL;

1 0

Henri Verbeet : wined3d: Select the fragment pipeline during adapter initialization.
by Alexandre Julliard 02 Feb '10

02 Feb '10

Module: wine Branch: master Commit: fb21551b2d87a179a6463aae146b43035eb53c51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb21551b2d87a179a6463aae1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 2 12:06:56 2010 +0100 wined3d: Select the fragment pipeline during adapter initialization. --- dlls/wined3d/device.c | 2 +- dlls/wined3d/directx.c | 36 ++++++++++++++++++++++++------------ dlls/wined3d/utils.c | 16 ---------------- dlls/wined3d/wined3d_private.h | 4 ++-- 4 files changed, 27 insertions(+), 31 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 02c468f..1bec60c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6933,7 +6933,7 @@ HRESULT device_init(IWineD3DDeviceImpl *device, IWineD3DImpl *wined3d, device->vs_clipping = shader_caps.VSClipping; memset(&ffp_caps, 0, sizeof(ffp_caps)); - fragment_pipeline = select_fragment_implementation(adapter, device_type); + fragment_pipeline = adapter->fragment_pipe; device->frag_pipe = fragment_pipeline; fragment_pipeline->get_caps(device_type, &adapter->gl_info, &ffp_caps); device->max_ffp_textures = ffp_caps.MaxSimultaneousTextures; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 7e98292..5cb633d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1630,9 +1630,26 @@ static enum wined3d_pci_device wined3d_guess_card(const struct wined3d_gl_info * } } +static const struct fragment_pipeline *select_fragment_implementation(struct wined3d_adapter *adapter) +{ + const struct wined3d_gl_info *gl_info = &adapter->gl_info; + int vs_selected_mode, ps_selected_mode; + + select_shader_mode(gl_info, &ps_selected_mode, &vs_selected_mode); + if ((ps_selected_mode == SHADER_ARB || ps_selected_mode == SHADER_GLSL) + && gl_info->supported[ARB_FRAGMENT_PROGRAM]) return &arbfp_fragment_pipeline; + else if (ps_selected_mode == SHADER_ATI) return &atifs_fragment_pipeline; + else if (gl_info->supported[NV_REGISTER_COMBINERS] + && gl_info->supported[NV_TEXTURE_SHADER2]) return &nvts_fragment_pipeline; + else if (gl_info->supported[NV_REGISTER_COMBINERS]) return &nvrc_fragment_pipeline; + else return &ffp_fragment_pipeline; +} + /* Context activation is done by the caller. */ -static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_driver_info *driver_info, struct wined3d_gl_info *gl_info) +static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_adapter *adapter) { + struct wined3d_driver_info *driver_info = &adapter->driver_info; + struct wined3d_gl_info *gl_info = &adapter->gl_info; const char *GL_Extensions = NULL; const char *WGL_Extensions = NULL; const char *gl_string = NULL; @@ -2066,6 +2083,8 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_driver_info *driver_info, str LEAVE_GL(); + adapter->fragment_pipe = select_fragment_implementation(adapter); + /* 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). */ @@ -2771,8 +2790,6 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceType(IWineD3D *iface, UINT Adapter static BOOL CheckBumpMapCapability(struct wined3d_adapter *adapter, WINED3DDEVTYPE DeviceType, const struct GlPixelFormatDesc *format_desc) { - const struct fragment_pipeline *fp; - switch(format_desc->format) { case WINED3DFMT_R8G8_SNORM: @@ -2783,8 +2800,7 @@ static BOOL CheckBumpMapCapability(struct wined3d_adapter *adapter, /* Ask the fixed function pipeline implementation if it can deal * with the conversion. If we've got a GL extension giving native * support this will be an identity conversion. */ - fp = select_fragment_implementation(adapter, DeviceType); - if (fp->color_fixup_supported(format_desc->color_fixup)) + if (adapter->fragment_pipe->color_fixup_supported(format_desc->color_fixup)) { TRACE_(d3d_caps)("[OK]\n"); return TRUE; @@ -2975,7 +2991,6 @@ static BOOL CheckTextureCapability(struct wined3d_adapter *adapter, { const struct wined3d_gl_info *gl_info = &adapter->gl_info; const shader_backend_t *shader_backend; - const struct fragment_pipeline *fp; switch (format_desc->format) { @@ -3171,9 +3186,8 @@ static BOOL CheckTextureCapability(struct wined3d_adapter *adapter, || gl_info->supported[EXT_TEXTURE_COMPRESSION_RGTC]) { shader_backend = select_shader_backend(adapter, DeviceType); - fp = select_fragment_implementation(adapter, DeviceType); if (shader_backend->shader_color_fixup_supported(format_desc->color_fixup) - && fp->color_fixup_supported(format_desc->color_fixup)) + && adapter->fragment_pipe->color_fixup_supported(format_desc->color_fixup)) { TRACE_(d3d_caps)("[OK]\n"); return TRUE; @@ -3813,7 +3827,6 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter, struct shader_caps shader_caps; struct fragment_caps fragment_caps; const shader_backend_t *shader_backend; - const struct fragment_pipeline *frag_pipeline = NULL; DWORD ckey_caps, blit_caps, fx_caps; TRACE_(d3d_caps)("(%p)->(Adptr:%d, DevType: %x, pCaps: %p)\n", This, Adapter, DeviceType, pCaps); @@ -4194,8 +4207,7 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter, shader_backend->shader_get_caps(DeviceType, &adapter->gl_info, &shader_caps); memset(&fragment_caps, 0, sizeof(fragment_caps)); - frag_pipeline = select_fragment_implementation(adapter, DeviceType); - frag_pipeline->get_caps(DeviceType, &adapter->gl_info, &fragment_caps); + adapter->fragment_pipe->get_caps(DeviceType, &adapter->gl_info, &fragment_caps); /* Add shader misc caps. Only some of them belong to the shader parts of the pipeline */ pCaps->PrimitiveMiscCaps |= fragment_caps.PrimitiveMiscCaps; @@ -4720,7 +4732,7 @@ BOOL InitAdapters(IWineD3DImpl *This) goto nogl_adapter; } - ret = IWineD3DImpl_FillGLCaps(&adapter->driver_info, &adapter->gl_info); + ret = IWineD3DImpl_FillGLCaps(adapter); if(!ret) { ERR("Failed to initialize gl caps for default adapter\n"); WineD3D_ReleaseFakeGLContext(&fake_gl_ctx); diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index b92b884..318d75d 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2851,22 +2851,6 @@ const shader_backend_t *select_shader_backend(struct wined3d_adapter *adapter, W return &none_shader_backend; } -const struct fragment_pipeline *select_fragment_implementation(struct wined3d_adapter *adapter, - WINED3DDEVTYPE device_type) -{ - const struct wined3d_gl_info *gl_info = &adapter->gl_info; - int vs_selected_mode, ps_selected_mode; - - select_shader_mode(gl_info, &ps_selected_mode, &vs_selected_mode); - if ((ps_selected_mode == SHADER_ARB || ps_selected_mode == SHADER_GLSL) - && gl_info->supported[ARB_FRAGMENT_PROGRAM]) return &arbfp_fragment_pipeline; - else if (ps_selected_mode == SHADER_ATI) return &atifs_fragment_pipeline; - else if (gl_info->supported[NV_REGISTER_COMBINERS] - && gl_info->supported[NV_TEXTURE_SHADER2]) return &nvts_fragment_pipeline; - else if (gl_info->supported[NV_REGISTER_COMBINERS]) return &nvrc_fragment_pipeline; - else return &ffp_fragment_pipeline; -} - const struct blit_shader *select_blit_implementation(struct wined3d_adapter *adapter, WINED3DDEVTYPE device_type) { const struct wined3d_gl_info *gl_info = &adapter->gl_info; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c5713c0..038fa3f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1362,6 +1362,8 @@ struct wined3d_adapter unsigned int TextureRam; /* Amount of texture memory both video ram + AGP/TurboCache/HyperMemory/.. */ unsigned int UsedTextureRam; LUID luid; + + const struct fragment_pipeline *fragment_pipe; }; BOOL initPixelFormats(struct wined3d_gl_info *gl_info, enum wined3d_pci_vendor vendor) DECLSPEC_HIDDEN; @@ -2568,8 +2570,6 @@ unsigned int count_bits(unsigned int mask) DECLSPEC_HIDDEN; const struct blit_shader *select_blit_implementation(struct wined3d_adapter *adapter, WINED3DDEVTYPE device_type) DECLSPEC_HIDDEN; -const struct fragment_pipeline *select_fragment_implementation(struct wined3d_adapter *adapter, - WINED3DDEVTYPE device_type) DECLSPEC_HIDDEN; const shader_backend_t *select_shader_backend(struct wined3d_adapter *adapter, WINED3DDEVTYPE device_type) DECLSPEC_HIDDEN; void select_shader_mode(const struct wined3d_gl_info *gl_info, int *ps_selected, int *vs_selected) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Select the shader backend during adapter initialization.
by Alexandre Julliard 02 Feb '10

02 Feb '10

Module: wine Branch: master Commit: cee8e9d88189e291e0e45524122f5d5dff594c7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cee8e9d88189e291e0e455241… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 2 12:06:57 2010 +0100 wined3d: Select the shader backend during adapter initialization. --- dlls/wined3d/device.c | 2 +- dlls/wined3d/directx.c | 22 ++++++++++++++-------- dlls/wined3d/utils.c | 10 ---------- dlls/wined3d/wined3d_private.h | 3 +-- 4 files changed, 16 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1bec60c..56e970d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6924,7 +6924,7 @@ HRESULT device_init(IWineD3DDeviceImpl *device, IWineD3DImpl *wined3d, for (i = 0; i < PATCHMAP_SIZE; ++i) list_init(&device->patches[i]); select_shader_mode(&adapter->gl_info, &device->ps_selected_mode, &device->vs_selected_mode); - device->shader_backend = select_shader_backend(adapter, device_type); + device->shader_backend = adapter->shader_backend; memset(&shader_caps, 0, sizeof(shader_caps)); device->shader_backend->shader_get_caps(device_type, &adapter->gl_info, &shader_caps); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 5cb633d..c9d3f90 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1645,6 +1645,16 @@ static const struct fragment_pipeline *select_fragment_implementation(struct win else return &ffp_fragment_pipeline; } +static const shader_backend_t *select_shader_backend(struct wined3d_adapter *adapter) +{ + int vs_selected_mode, ps_selected_mode; + + select_shader_mode(&adapter->gl_info, &ps_selected_mode, &vs_selected_mode); + if (vs_selected_mode == SHADER_GLSL || ps_selected_mode == SHADER_GLSL) return &glsl_shader_backend; + if (vs_selected_mode == SHADER_ARB || ps_selected_mode == SHADER_ARB) return &arb_program_shader_backend; + return &none_shader_backend; +} + /* Context activation is done by the caller. */ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_adapter *adapter) { @@ -2084,6 +2094,7 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_adapter *adapter) LEAVE_GL(); adapter->fragment_pipe = select_fragment_implementation(adapter); + adapter->shader_backend = select_shader_backend(adapter); /* 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 @@ -2990,7 +3001,6 @@ static BOOL CheckTextureCapability(struct wined3d_adapter *adapter, WINED3DDEVTYPE DeviceType, const struct GlPixelFormatDesc *format_desc) { const struct wined3d_gl_info *gl_info = &adapter->gl_info; - const shader_backend_t *shader_backend; switch (format_desc->format) { @@ -3068,8 +3078,7 @@ static BOOL CheckTextureCapability(struct wined3d_adapter *adapter, /* Ask the shader backend if it can deal with the conversion. If * we've got a GL extension giving native support this will be an * identity conversion. */ - shader_backend = select_shader_backend(adapter, DeviceType); - if (shader_backend->shader_color_fixup_supported(format_desc->color_fixup)) + if (adapter->shader_backend->shader_color_fixup_supported(format_desc->color_fixup)) { TRACE_(d3d_caps)("[OK]\n"); return TRUE; @@ -3185,8 +3194,7 @@ static BOOL CheckTextureCapability(struct wined3d_adapter *adapter, if (gl_info->supported[ATI_TEXTURE_COMPRESSION_3DC] || gl_info->supported[EXT_TEXTURE_COMPRESSION_RGTC]) { - shader_backend = select_shader_backend(adapter, DeviceType); - if (shader_backend->shader_color_fixup_supported(format_desc->color_fixup) + if (adapter->shader_backend->shader_color_fixup_supported(format_desc->color_fixup) && adapter->fragment_pipe->color_fixup_supported(format_desc->color_fixup)) { TRACE_(d3d_caps)("[OK]\n"); @@ -3826,7 +3834,6 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter, int ps_selected_mode; struct shader_caps shader_caps; struct fragment_caps fragment_caps; - const shader_backend_t *shader_backend; DWORD ckey_caps, blit_caps, fx_caps; TRACE_(d3d_caps)("(%p)->(Adptr:%d, DevType: %x, pCaps: %p)\n", This, Adapter, DeviceType, pCaps); @@ -4203,8 +4210,7 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter, pCaps->VertexTextureFilterCaps = 0; memset(&shader_caps, 0, sizeof(shader_caps)); - shader_backend = select_shader_backend(adapter, DeviceType); - shader_backend->shader_get_caps(DeviceType, &adapter->gl_info, &shader_caps); + adapter->shader_backend->shader_get_caps(DeviceType, &adapter->gl_info, &shader_caps); memset(&fragment_caps, 0, sizeof(fragment_caps)); adapter->fragment_pipe->get_caps(DeviceType, &adapter->gl_info, &fragment_caps); diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 318d75d..5e6da24 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2841,16 +2841,6 @@ void select_shader_mode(const struct wined3d_gl_info *gl_info, int *ps_selected, else *ps_selected = SHADER_NONE; } -const shader_backend_t *select_shader_backend(struct wined3d_adapter *adapter, WINED3DDEVTYPE device_type) -{ - int vs_selected_mode, ps_selected_mode; - - select_shader_mode(&adapter->gl_info, &ps_selected_mode, &vs_selected_mode); - if (vs_selected_mode == SHADER_GLSL || ps_selected_mode == SHADER_GLSL) return &glsl_shader_backend; - if (vs_selected_mode == SHADER_ARB || ps_selected_mode == SHADER_ARB) return &arb_program_shader_backend; - return &none_shader_backend; -} - const struct blit_shader *select_blit_implementation(struct wined3d_adapter *adapter, WINED3DDEVTYPE device_type) { const struct wined3d_gl_info *gl_info = &adapter->gl_info; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 038fa3f..fca1a9a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1364,6 +1364,7 @@ struct wined3d_adapter LUID luid; const struct fragment_pipeline *fragment_pipe; + const shader_backend_t *shader_backend; }; BOOL initPixelFormats(struct wined3d_gl_info *gl_info, enum wined3d_pci_vendor vendor) DECLSPEC_HIDDEN; @@ -2570,8 +2571,6 @@ unsigned int count_bits(unsigned int mask) DECLSPEC_HIDDEN; const struct blit_shader *select_blit_implementation(struct wined3d_adapter *adapter, WINED3DDEVTYPE device_type) DECLSPEC_HIDDEN; -const shader_backend_t *select_shader_backend(struct wined3d_adapter *adapter, - WINED3DDEVTYPE device_type) DECLSPEC_HIDDEN; void select_shader_mode(const struct wined3d_gl_info *gl_info, int *ps_selected, int *vs_selected) DECLSPEC_HIDDEN; typedef struct local_constant {

1 0

Paul Chitescu : qcap: Test the correct variable when deciding how to grab V4L frame.
by Alexandre Julliard 02 Feb '10

02 Feb '10

Module: wine Branch: master Commit: d643748c9433654c71b2727e8e7a1b17b96d1b69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d643748c9433654c71b2727e8… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Tue Feb 2 13:33:54 2010 +0200 qcap: Test the correct variable when deciding how to grab V4L frame. --- dlls/qcap/v4l.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index 85d4d4d..91dd8f4 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -563,7 +563,7 @@ static void Resize(const Capture * capBox, LPBYTE output, const BYTE *input) static void V4l_GetFrame(Capture * capBox, unsigned char ** pInput) { - if (capBox->pmap) + if (capBox->mmap) { if (xioctl(capBox->fd, VIDIOCSYNC, &capBox->grab_buf[capBox->curframe]) == -1) WARN("Syncing ioctl failed: %d\n", errno);

1 0

Frédéric Delanoy : wordpad: Update French translation.
by Alexandre Julliard 02 Feb '10

02 Feb '10

Module: wine Branch: master Commit: f6aaddbd3bcd94731b91ed2762b590fd55d91635 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6aaddbd3bcd94731b91ed276… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Feb 1 23:39:27 2010 +0100 wordpad: Update French translation. --- programs/wordpad/Fr.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/wordpad/Fr.rc b/programs/wordpad/Fr.rc index 7831974..376d605 100644 --- a/programs/wordpad/Fr.rc +++ b/programs/wordpad/Fr.rc @@ -221,8 +221,8 @@ BEGIN STRING_PREVIEW_PREVPAGE, "Page précédente" STRING_PREVIEW_TWOPAGES, "Deux pages" STRING_PREVIEW_ONEPAGE, "Une page" - STRING_PREVIEW_ZOOMIN, "Zoom in" - STRING_PREVIEW_ZOOMOUT, "Zoom out" + STRING_PREVIEW_ZOOMIN, "Zoom avant" + STRING_PREVIEW_ZOOMOUT, "Zoom arrière" STRING_PREVIEW_CLOSE, "Fermer" END

1 0

Jörg Höhle : winecoreaudio: Fix a float cast in the computation of MIDI volume.
by Alexandre Julliard 02 Feb '10

02 Feb '10

Module: wine Branch: master Commit: ffeef37be214da8ae07262882c624fa925877929 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffeef37be214da8ae07262882… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Jan 27 19:03:47 2010 +0100 winecoreaudio: Fix a float cast in the computation of MIDI volume. --- dlls/winecoreaudio.drv/midi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index 6d988db..a31a076 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -546,7 +546,7 @@ static DWORD MIDIOut_GetVolume(WORD wDevID, DWORD *lpdwVolume) float right; AudioUnit_GetVolume(destinations[wDevID].synth, &left, &right); - *lpdwVolume = ((WORD) left * 0xFFFFl) + (((WORD) right * 0xFFFFl) << 16); + *lpdwVolume = (WORD) (left * 0xFFFF) + ((WORD) (right * 0xFFFF) << 16); return MMSYSERR_NOERROR; }

1 0

Alexandre Julliard : user32/tests: Dispatch a message in case we can a WM_PAINT.
by Alexandre Julliard 02 Feb '10

02 Feb '10

Module: wine Branch: master Commit: c4568edd64a321adf33cfac9ce1ce33f4fe9b049 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4568edd64a321adf33cfac9c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 2 11:24:46 2010 +0100 user32/tests: Dispatch a message in case we can a WM_PAINT. --- dlls/user32/tests/win.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 6fb6ce0..c92b3ed 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -2980,6 +2980,7 @@ static void test_mouse_input(HWND hwnd) if (msg.message == WM_TIMER || ignore_message(msg.message)) continue; ok(msg.hwnd == popup && msg.message == WM_MOUSEMOVE, "hwnd %p message %04x\n", msg.hwnd, msg.message); + DispatchMessage(&msg); } ret = peek_message(&msg); ok( !ret, "message %04x available\n", msg.message);

1 0

André Hentschel : oleaut32: Rewrite RollUdate to be easier to change and to support more conversions.
by Alexandre Julliard 02 Feb '10

02 Feb '10

Module: wine Branch: master Commit: 1b51c21fb30ee3fa4366d3628d343361e1696ef3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b51c21fb30ee3fa4366d3628… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Feb 1 21:26:44 2010 +0100 oleaut32: Rewrite RollUdate to be easier to change and to support more conversions. --- dlls/oleaut32/tests/vartest.c | 30 ++++++++++----- dlls/oleaut32/variant.c | 81 +++++++++++++++++++++++++++-------------- 2 files changed, 74 insertions(+), 37 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 8d7cf11..377a847 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -1639,26 +1639,36 @@ static void test_VarDateFromUdate(void) CHECKPTR(VarDateFromUdate); UD2T(1,1,1980,0,0,0,0,2,1,0,S_OK,29221.0); /* 1 Jan 1980 */ UD2T(2,1,1980,0,0,0,0,3,2,0,S_OK,29222.0); /* 2 Jan 1980 */ + UD2T(2,1,1980,0,0,0,0,4,5,0,S_OK,29222.0); /* 2 Jan 1980 */ UD2T(31,12,1990,0,0,0,0,0,0,0,S_OK,33238.0); /* 31 Dec 1990 */ UD2T(31,12,90,0,0,0,0,0,0,0,S_OK,33238.0); /* year < 100 is 1900+year! */ UD2T(30,12,1899,0,0,0,0,6,364,0,S_OK,0.0); /* 30 Dec 1899 - VT_DATE 0.0 */ UD2T(1,1,100,0,0,0,0,0,0,0,S_OK,-657434.0); /* 1 Jan 100 - Min */ UD2T(31,12,9999,0,0,0,0,0,0,0,S_OK,2958465.0); /* 31 Dec 9999 - Max */ UD2T(1,1,10000,0,0,0,0,0,0,0,E_INVALIDARG,0.0); /* > 31 Dec 9999 => err */ + UD2T(1,1,-10000,0,0,0,0,0,0,0,E_INVALIDARG,0.0);/* < -9999 => err */ UD2T(30,12,1899,0,0,0,0,0,0,0,S_OK,0.0); /* 30 Dec 1899 0:00:00 */ UD2T(30,12,1899,0,0,0,999,0,0,0,S_OK,0.0); /* Ignore milliseconds */ - UD2T(1,1,1980,18,1,16,0,2,1,0,S_OK,29221.75087962963); /* 6:18:02 PM */ - todo_wine UD2T(0,1,1980,42,1,16,0,2,1,0,S_OK,29221.75087962963); /* Test rolled hours */ - todo_wine UD2T(1,1,1980,17,61,16,0,2,1,0,S_OK,29221.75087962963); /* Test rolled minutes */ - todo_wine UD2T(1,1,1980,18,0,76,0,2,1,0,S_OK,29221.75087962963); /* Test rolled seconds */ - todo_wine UD2T(2,1,1980,-6,1,16,0,2,1,0,S_OK,29221.75087962963); /* Test backrolled hours */ - todo_wine UD2T(1,1,1980,19,-59,16,0,2,1,0,S_OK,29221.75087962963); /* Test backrolled minutes */ - todo_wine UD2T(1,1,1980,18,2,-44,0,2,1,0,S_OK,29221.75087962963); /* Test backrolled seconds */ - - UD2T(0,1,1980,0,0,0,0,2,1,0,S_OK,29220.0); /* Rolls back to 31 Dec 1899 */ - UD2T(1,13,1980,0,0,0,0,2,1,0,S_OK,29587.0); /* Rolls fwd to 1/1/1981 */ + UD2T(1,1,1980,18,1,16,0,2,1,0,S_OK,29221.75087962963); /* 6:18:02 PM */ + UD2T(0,1,1980,42,1,16,0,2,1,0,S_OK,29221.75087962963); /* Test fwdrolled hours */ + UD2T(1,1,1980,17,61,16,0,2,1,0,S_OK,29221.75087962963); /* Test fwdrolled minutes */ + UD2T(1,1,1980,18,0,76,0,2,1,0,S_OK,29221.75087962963); /* Test fwdrolled seconds */ + UD2T(3,1,1980,-30,1,16,0,2,1,0,S_OK,29221.75087962963); /* Test backrolled hours */ + UD2T(1,1,1980,20,-119,16,0,2,1,0,S_OK,29221.75087962963); /* Test backrolled minutes */ + UD2T(1,1,1980,18,3,-104,0,2,1,0,S_OK,29221.75087962963); /* Test backrolled seconds */ + UD2T(1,12001,-1020,18,1,16,0,0,0,0,S_OK,29221.75087962963); /* Test rolled year and month */ + UD2T(1,-23,1982,18,1,16,0,0,0,0,S_OK,29221.75087962963); /* Test backrolled month */ + todo_wine UD2T(-59,3,1980,18,1,16,0,0,0,0,S_OK,29221.75087962963); /* Test backrolled days */ + todo_wine UD2T(1,1,0,0,0,0,0,0,0,0,S_OK,36526); /* Test zero year */ + + UD2T(0,0,1980,0,0,0,0,0,0,0,S_OK,29189); /* Test zero day and month */ + UD2T(0,1,1980,0,0,0,0,2,1,0,S_OK,29220.0); /* Test zero day = LastDayOfMonth */ + UD2T(-1,1,1980,18,1,16,0,0,0,0,S_OK,29219.75087962963); /* Test day -1 = LastDayOfMonth - 1 */ + UD2T(1,1,-1,18,1,16,0,0,0,0,S_OK,36161.75087962963); /* Test year -1 = 1999 */ + UD2T(1,-1,1980,18,1,16,0,0,0,0,S_OK,29160.7508796296); /* Test month -1 = 11 */ + UD2T(1,13,1980,0,0,0,0,2,1,0,S_OK,29587.0); /* Rolls fwd to 1/1/1981 */ } static void test_st2dt(int line, WORD d, WORD m, WORD y, WORD h, WORD mn, diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 56ab2b3..dabe746 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -1129,30 +1129,47 @@ static inline double VARIANT_JulianFromDMY(USHORT year, USHORT month, USHORT day static HRESULT VARIANT_RollUdate(UDATE *lpUd) { static const BYTE days[] = { 0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }; + short iYear, iMonth, iDay, iHour, iMinute, iSecond; - TRACE("Raw date: %d/%d/%d %d:%d:%d\n", lpUd->st.wDay, lpUd->st.wMonth, - lpUd->st.wYear, lpUd->st.wHour, lpUd->st.wMinute, lpUd->st.wSecond); + /* interpret values signed */ + iYear = lpUd->st.wYear; + iMonth = lpUd->st.wMonth; + iDay = lpUd->st.wDay; + iHour = lpUd->st.wHour; + iMinute = lpUd->st.wMinute; + iSecond = lpUd->st.wSecond; - /* Years < 100 are treated as 1900 + year */ - if (lpUd->st.wYear < 100) - lpUd->st.wYear += 1900; + TRACE("Raw date: %d/%d/%d %d:%d:%d\n", iDay, iMonth, + iYear, iHour, iMinute, iSecond); - if (!lpUd->st.wMonth) - { - /* Roll back to December of the previous year */ - lpUd->st.wMonth = 12; - lpUd->st.wYear--; - } - else while (lpUd->st.wMonth > 12) + if (iYear > 9999 || iYear < -9999) + return E_INVALIDARG; /* Invalid value */ + /* Years < 100 are treated as 1900 + year */ + if (iYear >= 0 && iYear < 100) + iYear += 1900; + + iMinute += (iSecond - (iSecond % 60)) / 60; + iSecond = iSecond % 60; + iHour += (iMinute - (iMinute % 60)) / 60; + iMinute = iMinute % 60; + iDay += (iHour - (iHour % 24)) / 24; + iHour = iHour % 24; + /* FIXME: Roll Days */ + iYear += (iMonth - (iMonth % 12)) / 12; + iMonth = iMonth % 12; + + if (iSecond<0){iSecond+=60; iMinute--;} + if (iMinute<0){iMinute+=60; iHour--;} + if (iHour<0) {iHour+=24; iDay--;} + if (iDay<0) { - /* Roll forward the correct number of months */ - lpUd->st.wYear++; - lpUd->st.wMonth -= 12; + iDay+=days[iMonth]; + iMonth--; + if (iMonth == 2 && IsLeapYear(iYear)) + iDay++; } - - if (lpUd->st.wYear > 9999 || lpUd->st.wHour > 23 || - lpUd->st.wMinute > 59 || lpUd->st.wSecond > 59) - return E_INVALIDARG; /* Invalid values */ + if (iMonth<=0) {iMonth+=12; iYear--;} + if (iYear<0) iYear+=2000; if (!lpUd->st.wDay) { @@ -1178,22 +1195,30 @@ static HRESULT VARIANT_RollUdate(UDATE *lpUd) int rollForward = 0; /* Possibly need to roll the date forward */ - if (lpUd->st.wMonth == 2 && IsLeapYear(lpUd->st.wYear)) - rollForward = lpUd->st.wDay - 29; /* February has 29 days on leap years */ + if (iMonth == 2 && IsLeapYear(iYear)) + rollForward = iDay - 29; /* February has 29 days on leap years */ else - rollForward = lpUd->st.wDay - days[lpUd->st.wMonth]; + rollForward = iDay - days[iMonth]; if (rollForward > 0) { - lpUd->st.wDay = rollForward; - lpUd->st.wMonth++; - if (lpUd->st.wMonth > 12) + iDay = rollForward; + iMonth++; + if (iMonth > 12) { - lpUd->st.wMonth = 1; /* Roll forward into January of the next year */ - lpUd->st.wYear++; + iMonth = 1; /* Roll forward into January of the next year */ + iYear++; } } } + + lpUd->st.wYear = iYear; + lpUd->st.wMonth = iMonth; + lpUd->st.wDay = iDay; + lpUd->st.wHour = iHour; + lpUd->st.wMinute = iMinute; + lpUd->st.wSecond = iSecond; + TRACE("Rolled date: %d/%d/%d %d:%d:%d\n", lpUd->st.wDay, lpUd->st.wMonth, lpUd->st.wYear, lpUd->st.wHour, lpUd->st.wMinute, lpUd->st.wSecond); return S_OK; @@ -1250,6 +1275,8 @@ INT WINAPI DosDateTimeToVariantTime(USHORT wDosDate, USHORT wDosTime, ud.st.wMinute = DOS_MINUTE(wDosTime); ud.st.wSecond = DOS_SECOND(wDosTime); ud.st.wDayOfWeek = ud.st.wMilliseconds = 0; + if (ud.st.wHour > 23 || ud.st.wMinute > 59 || ud.st.wSecond > 59) + return FALSE; /* Invalid values in Dos*/ return VarDateFromUdate(&ud, 0, pDateOut) == S_OK; }

1 0

Trey Hunner : cmd: Add support for 'if /i'.
by Alexandre Julliard 02 Feb '10

02 Feb '10

Module: wine Branch: master Commit: afb374b7aa3f16b4e0de574314bef11b597a4363 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afb374b7aa3f16b4e0de57431… Author: Trey Hunner <treyhunner(a)gmail.com> Date: Tue Feb 2 01:09:06 2010 -0800 cmd: Add support for 'if /i'. --- programs/cmd/builtins.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 2c2761d..c63360b 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1277,6 +1277,7 @@ void WCMD_if (WCHAR *p, CMD_LIST **cmdList) { static const WCHAR existW[] = {'e','x','i','s','t','\0'}; static const WCHAR defdW[] = {'d','e','f','i','n','e','d','\0'}; static const WCHAR eqeqW[] = {'=','=','\0'}; + static const WCHAR parmI[] = {'/','I','\0'}; if (!lstrcmpiW (param1, notW)) { negate = 1; @@ -1305,7 +1306,12 @@ void WCMD_if (WCHAR *p, CMD_LIST **cmdList) { } else if ((s = strstrW (p, eqeqW))) { s += 2; - if (!lstrcmpiW (condition, WCMD_parameter (s, 0, NULL))) test = 1; + if (strstrW (quals, parmI) == NULL) { + if (!lstrcmpW (condition, WCMD_parameter (s, 0, NULL))) test = 1; + } + else { + if (!lstrcmpiW (condition, WCMD_parameter (s, 0, NULL))) test = 1; + } WCMD_parameter (s, 1, &command); } else {

1 0

Jörg Höhle : winmm: Reset MIDIHDR flags prior to return from midiStreamOut.
by Alexandre Julliard 02 Feb '10

02 Feb '10

Module: wine Branch: master Commit: bc76916b906100581e9e42f8a06ab34e8410d13a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc76916b906100581e9e42f8a… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Feb 2 08:37:09 2010 +0100 winmm: Reset MIDIHDR flags prior to return from midiStreamOut. --- dlls/winmm/winmm.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index 6205466..3fee0a8 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -1833,7 +1833,8 @@ MMRESULT WINAPI midiStreamOut(HMIDISTRM hMidiStrm, LPMIDIHDR lpMidiHdr, if (!MMSYSTEM_GetMidiStream(hMidiStrm, &lpMidiStrm, NULL)) { ret = MMSYSERR_INVALHANDLE; } else { - lpMidiHdr->dwFlags |= MHDR_ISSTRM; + lpMidiHdr->dwFlags |= MHDR_ISSTRM | MHDR_INQUEUE; + lpMidiHdr->dwFlags &= ~MHDR_DONE; if (!PostThreadMessageA(lpMidiStrm->dwThreadID, WINE_MSM_HEADER, cbMidiHdr, (LPARAM)lpMidiHdr)) {

1 0