wine-commits July 2010

wine-commits@winehq.org

2 participants
892 discussions

Maarten Lankhorst : mciqtz32: Fix mciOpen.
by Alexandre Julliard 30 Jul '10

30 Jul '10

Module: wine Branch: master Commit: 910b95d328c18be4a168e080127b28d36fb2139c URL: http://source.winehq.org/git/wine.git/?a=commit;h=910b95d328c18be4a168e0801… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Jul 26 15:54:22 2010 +0200 mciqtz32: Fix mciOpen. --- dlls/mciqtz32/mciqtz.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index 9d90957..d610c19 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -225,6 +225,7 @@ static DWORD MCIQTZ_mciOpen(UINT wDevID, DWORD dwFlags, } else if (style) IVideoWindow_put_WindowStyle(wma->vidwin, style); + IBasicVideo_GetVideoSize(wma->vidbasic, &rc.right, &rc.bottom); wma->opened = TRUE; if (dwFlags & MCI_NOTIFY) @@ -251,6 +252,7 @@ err: if (wma->uninit) CoUninitialize(); + wma->uninit = 0; return MCIERR_INTERNAL; }

1 0

Maarten Lankhorst : mciqtz32: Simplify mciWhere.
by Alexandre Julliard 30 Jul '10

30 Jul '10

Module: wine Branch: master Commit: baa7dcb90efe9e0332eaa8739c88159389f7e5d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=baa7dcb90efe9e0332eaa8739… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Jul 26 15:44:22 2010 +0200 mciqtz32: Simplify mciWhere. --- dlls/mciqtz32/mciqtz.c | 32 +++++++++----------------------- 1 files changed, 9 insertions(+), 23 deletions(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index f486677..9d90957 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -688,23 +688,14 @@ static DWORD MCIQTZ_mciWhere(UINT wDevID, DWORD dwFlags, LPMCI_DGV_RECT_PARMS lp if (dwFlags & MCI_DGV_WHERE_SOURCE) { if (dwFlags & MCI_DGV_WHERE_MAX) FIXME("MCI_DGV_WHERE_SOURCE_MAX stub %s\n", wine_dbgstr_rect(&rc)); - IBasicVideo_get_SourceLeft(wma->vidbasic, &rc.left); - IBasicVideo_get_SourceTop(wma->vidbasic, &rc.top); - IBasicVideo_get_SourceWidth(wma->vidbasic, &rc.right); - IBasicVideo_get_SourceHeight(wma->vidbasic, &rc.bottom); - /* Undo conversion done below */ - rc.right += rc.left; - rc.bottom += rc.top; + IBasicVideo_GetSourcePosition(wma->vidbasic, &rc.left, &rc.top, &rc.right, &rc.bottom); TRACE("MCI_DGV_WHERE_SOURCE %s\n", wine_dbgstr_rect(&rc)); } if (dwFlags & MCI_DGV_WHERE_DESTINATION) { - if (dwFlags & MCI_DGV_WHERE_MAX) { - GetClientRect(hWnd, &rc); - TRACE("MCI_DGV_WHERE_DESTINATION_MAX %s\n", wine_dbgstr_rect(&rc)); - } else { - FIXME("MCI_DGV_WHERE_DESTINATION not supported yet\n"); - goto out; - } + if (dwFlags & MCI_DGV_WHERE_MAX) + FIXME("MCI_DGV_WHERE_DESTINATION_MAX stub %s\n", wine_dbgstr_rect(&rc)); + IBasicVideo_GetDestinationPosition(wma->vidbasic, &rc.left, &rc.top, &rc.right, &rc.bottom); + TRACE("MCI_DGV_WHERE_DESTINATION %s\n", wine_dbgstr_rect(&rc)); } if (dwFlags & MCI_DGV_WHERE_FRAME) { if (dwFlags & MCI_DGV_WHERE_MAX) @@ -723,22 +714,17 @@ static DWORD MCIQTZ_mciWhere(UINT wDevID, DWORD dwFlags, LPMCI_DGV_RECT_PARMS lp if (dwFlags & MCI_DGV_WHERE_WINDOW) { if (dwFlags & MCI_DGV_WHERE_MAX) { GetWindowRect(GetDesktopWindow(), &rc); + rc.right -= rc.left; + rc.bottom -= rc.top; TRACE("MCI_DGV_WHERE_WINDOW_MAX %s\n", wine_dbgstr_rect(&rc)); } else { - GetWindowRect(hWnd, &rc); + IVideoWindow_GetWindowPosition(wma->vidwin, &rc.left, &rc.top, &rc.right, &rc.bottom); TRACE("MCI_DGV_WHERE_WINDOW %s\n", wine_dbgstr_rect(&rc)); } } ret = 0; - out: - /* In MCI, RECT structure is used differently: rc.right = width & rc.bottom = height - * So convert the normal RECT into a MCI RECT before returning */ - lpParms->rc.left = rc.left; - lpParms->rc.top = rc.top; - lpParms->rc.right = rc.right - rc.left; - lpParms->rc.bottom = rc.bottom - rc.top; - + lpParms->rc = rc; return ret; }

1 0

Maarten Lankhorst : mciqtz32: Add support for MCI_STATUS_MODE.
by Alexandre Julliard 30 Jul '10

30 Jul '10

Module: wine Branch: master Commit: c2a0c774e261f74ec9f61bc9dc198adef7b7e104 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2a0c774e261f74ec9f61bc9d… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri May 21 22:06:00 2010 +0200 mciqtz32: Add support for MCI_STATUS_MODE. --- dlls/mciqtz32/mciqtz.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index 50faf13..f486677 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -625,9 +625,17 @@ static DWORD MCIQTZ_mciStatus(UINT wDevID, DWORD dwFlags, LPMCI_DGV_STATUS_PARMS case MCI_STATUS_NUMBER_OF_TRACKS: FIXME("MCI_STATUS_NUMBER_OF_TRACKS not implemented yet\n"); return MCIERR_UNRECOGNIZED_COMMAND; - case MCI_STATUS_MODE: - FIXME("MCI_STATUS_MODE not implemented yet\n"); - return MCIERR_UNRECOGNIZED_COMMAND; + case MCI_STATUS_MODE: { + LONG state = State_Stopped; + IMediaControl_GetState(wma->pmctrl, -1, &state); + if (state == State_Stopped) + state = MCI_MODE_STOP; + else if (state == State_Running) + state = MCI_MODE_PLAY; + else if (state == State_Paused) + state = MCI_MODE_PAUSE; + break; + } case MCI_STATUS_MEDIA_PRESENT: FIXME("MCI_STATUS_MEDIA_PRESENT not implemented yet\n"); return MCIERR_UNRECOGNIZED_COMMAND;

1 0

Maarten Lankhorst : mciqtz32: Add support for mciWindow.
by Alexandre Julliard 30 Jul '10

30 Jul '10

Module: wine Branch: master Commit: 1e5ce5309eb4295b6e39fce1184c81a3eb9991b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e5ce5309eb4295b6e39fce11… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri May 21 12:17:58 2010 +0200 mciqtz32: Add support for mciWindow. --- dlls/mciqtz32/mciqtz.c | 47 +++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 45 insertions(+), 2 deletions(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index 6dabaa5..50faf13 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -734,6 +734,48 @@ out: return ret; } +/*************************************************************************** + * MCIQTZ_mciWindow [internal] + */ +static DWORD MCIQTZ_mciWindow(UINT wDevID, DWORD dwFlags, LPMCI_DGV_WINDOW_PARMSW lpParms) +{ + WINE_MCIQTZ *wma = MCIQTZ_mciGetOpenDev(wDevID); + + TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); + + if (!lpParms) + return MCIERR_NULL_PARAMETER_BLOCK; + if (!wma) + return MCIERR_INVALID_DEVICE_ID; + if (dwFlags & MCI_TEST) + return 0; + + if (dwFlags & MCI_DGV_WINDOW_HWND && (IsWindow(lpParms->hWnd) || !lpParms->hWnd)) { + LONG style = 0; + TRACE("Setting hWnd to %p\n", lpParms->hWnd); + IVideoWindow_put_Visible(wma->vidwin, OAFALSE); + IVideoWindow_get_WindowStyle(wma->vidwin, &style); + style &= ~WS_CHILD; + if (lpParms->hWnd) + IVideoWindow_put_WindowStyle(wma->vidwin, style|WS_CHILD); + else + IVideoWindow_put_WindowStyle(wma->vidwin, style); + IVideoWindow_put_Owner(wma->vidwin, (OAHWND)lpParms->hWnd); + IVideoWindow_put_MessageDrain(wma->vidwin, (OAHWND)lpParms->hWnd); + IVideoWindow_put_Visible(wma->vidwin, OATRUE); + wma->parent = lpParms->hWnd; + } + if (dwFlags & MCI_DGV_WINDOW_STATE) { + TRACE("Setting nCmdShow to %d\n", lpParms->nCmdShow); + IVideoWindow_put_WindowState(wma->vidwin, lpParms->nCmdShow); + } + if (dwFlags & MCI_DGV_WINDOW_TEXT) { + TRACE("Setting caption to %s\n", debugstr_w(lpParms->lpstrText)); + IVideoWindow_put_Caption(wma->vidwin, lpParms->lpstrText); + } + return 0; +} + /****************************************************************************** * MCIAVI_mciUpdate [internal] */ @@ -858,11 +900,12 @@ LRESULT CALLBACK MCIQTZ_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, case MCI_SETAUDIO: return MCIQTZ_mciSetAudio (dwDevID, dwParam1, (LPMCI_DGV_SETAUDIO_PARMSW) dwParam2); case MCI_UPDATE: return MCIQTZ_mciUpdate(dwDevID, dwParam1, (LPMCI_DGV_UPDATE_PARMS)dwParam2); + case MCI_WINDOW: + return MCIQTZ_mciWindow(dwDevID, dwParam1, (LPMCI_DGV_WINDOW_PARMSW)dwParam2); + case MCI_PUT: case MCI_RECORD: case MCI_RESUME: case MCI_INFO: - case MCI_PUT: - case MCI_WINDOW: case MCI_LOAD: case MCI_SAVE: case MCI_FREEZE:

1 0

Maarten Lankhorst : mciqtz32: Remove individual queryinterfaces.
by Alexandre Julliard 30 Jul '10

30 Jul '10

Module: wine Branch: master Commit: 7737c0ad66c3280472f1ca9fbd568d115053340f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7737c0ad66c3280472f1ca9fb… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Jun 3 21:08:15 2010 +0200 mciqtz32: Remove individual queryinterfaces. --- dlls/mciqtz32/mciqtz.c | 233 +++++++++++++++------------------------ dlls/mciqtz32/mciqtz_private.h | 3 + 2 files changed, 93 insertions(+), 143 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7737c0ad66c3280472f1c…

1 0

Louis Lenders : wine.inf: Add key HKCU,%CurrentVersion%\Run.
by Alexandre Julliard 30 Jul '10

30 Jul '10

Module: wine Branch: master Commit: 864aa6103f9274de181296f8ad16b2b905cba9c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=864aa6103f9274de181296f8a… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Thu Jul 29 21:06:59 2010 +0200 wine.inf: Add key HKCU,%CurrentVersion%\Run. --- tools/wine.inf.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 5e710c5..aa7b4f0 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -454,6 +454,7 @@ HKLM,%CurrentVersion%\Setup,"BootDir",,"%30%" HKLM,%CurrentVersion%\Setup,"SharedDir",,"%25%" HKLM,%CurrentVersion%\Shell Extensions\Approved,,16 HKLM,%CurrentVersion%\Uninstall,,16 +HKCU,%CurrentVersion%\Run,,16 HKLM,%CurrentVersionNT%,"RegisteredOrganization",2,"" HKLM,%CurrentVersionNT%,"RegisteredOwner",2,"" HKLM,%CurrentVersionNT%,"SystemRoot",,"%10%"

1 0

Louis Lenders : wine.inf: Add key HKLM\SOFTWARE\Microsoft\NET Framework Setup\NDP\v3.5\1033.
by Alexandre Julliard 30 Jul '10

30 Jul '10

Module: wine Branch: master Commit: 05896a88959eb750cb586428fbc43a2c898cb4b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05896a88959eb750cb586428f… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Thu Jul 29 20:53:40 2010 +0200 wine.inf: Add key HKLM\SOFTWARE\Microsoft\NET Framework Setup\NDP\v3.5\1033. --- tools/wine.inf.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index c11e6e1..5e710c5 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -503,6 +503,7 @@ HKLM,Software\Microsoft\NET Framework Setup\NDP\v3.0,Version,2,3.2.30729 HKLM,Software\Microsoft\NET Framework Setup\NDP\v3.5,Install,0x10003,1 HKLM,Software\Microsoft\NET Framework Setup\NDP\v3.5,SP,0x10003,1 HKLM,Software\Microsoft\NET Framework Setup\NDP\v3.5,Version,2,3.5.30729.01 +HKLM,Software\Microsoft\NET Framework Setup\NDP\v3.5\1033,Install,0x10003,1 [Metrics] HKCU,%Metrics%,"ScrollWidth",2,"16"

1 0

Stefan Dösinger : wined3d: Use the correct type in device_unit_free_for_vs.
by Alexandre Julliard 30 Jul '10

30 Jul '10

Module: wine Branch: master Commit: 8db119b7001ab1ce47ca086eef5edf1d44076fc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8db119b7001ab1ce47ca086ee… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jul 30 06:41:49 2010 +0200 wined3d: Use the correct type in device_unit_free_for_vs. --- dlls/wined3d/device.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7f6eb8e..f18b477 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3486,8 +3486,8 @@ static void device_map_psamplers(IWineD3DDeviceImpl *This, const struct wined3d_ } } -static BOOL device_unit_free_for_vs(IWineD3DDeviceImpl *This, const DWORD *pshader_sampler_tokens, - const DWORD *vshader_sampler_tokens, DWORD unit) +static BOOL device_unit_free_for_vs(IWineD3DDeviceImpl *This, const WINED3DSAMPLER_TEXTURE_TYPE *pshader_sampler_tokens, + const WINED3DSAMPLER_TEXTURE_TYPE *vshader_sampler_tokens, DWORD unit) { DWORD current_mapping = This->rev_tex_unit_map[unit];

1 0

Stefan Dösinger : wined3d: Make glClearColor parameters floats.
by Alexandre Julliard 30 Jul '10

30 Jul '10

Module: wine Branch: master Commit: 723d87c280f78238378b6086ea420f1e7ff583db URL: http://source.winehq.org/git/wine.git/?a=commit;h=723d87c280f78238378b6086e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jul 30 06:40:41 2010 +0200 wined3d: Make glClearColor parameters floats. --- dlls/wined3d/directx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 4820737..be44e68 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -711,7 +711,7 @@ static BOOL match_fbo_tex_update(const struct wined3d_gl_info *gl_info, const ch glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 4, 4, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, data); checkGLcall("glTexSubImage2D"); - glClearColor(0.996, 0.729, 0.745, 0.792); + glClearColor(0.996f, 0.729f, 0.745f, 0.792f); glClear(GL_COLOR_BUFFER_BIT); checkGLcall("glClear");

1 0

Stefan Dösinger : wined3d: The flag parameter in shader_hw_sample is a WORD.
by Alexandre Julliard 30 Jul '10

30 Jul '10

Module: wine Branch: master Commit: 51cd12f35af75c03a5ca6e767ce2e0ed15326bd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51cd12f35af75c03a5ca6e767… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 28 15:43:16 2010 +0200 wined3d: The flag parameter in shader_hw_sample is a WORD. --- dlls/wined3d/arb_program_shader.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 665c02b..ab82bb8 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1887,7 +1887,7 @@ static void pshader_hw_tex(const struct wined3d_shader_instruction *ins) char reg_dest[40]; char reg_coord[40]; DWORD reg_sampler_code; - DWORD myflags = 0; + WORD myflags = 0; /* All versions have a destination register */ shader_arb_get_dst_param(ins, dst, reg_dest); @@ -3052,7 +3052,7 @@ static void shader_hw_texldd(const struct wined3d_shader_instruction *ins) DWORD sampler_idx = ins->src[1].reg.idx; char reg_dest[40]; char reg_src[3][40]; - DWORD flags = TEX_DERIV; + WORD flags = TEX_DERIV; shader_arb_get_dst_param(ins, &ins->dst[0], reg_dest); shader_arb_get_src_param(ins, &ins->src[0], 0, reg_src[0]); @@ -3070,7 +3070,7 @@ static void shader_hw_texldl(const struct wined3d_shader_instruction *ins) DWORD sampler_idx = ins->src[1].reg.idx; char reg_dest[40]; char reg_coord[40]; - DWORD flags = TEX_LOD; + WORD flags = TEX_LOD; shader_arb_get_dst_param(ins, &ins->dst[0], reg_dest); shader_arb_get_src_param(ins, &ins->src[0], 0, reg_coord);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2010