May 2011 - Wine-commits - list.winehq.org

Alexandre Julliard : winex11: Fix check for desktop process in non-desktop mode.
by Alexandre Julliard 05 May '11

05 May '11

Module: wine Branch: master Commit: 57fc5e7fcc0168c63622f307fe46fc21a60f418d URL: http://source.winehq.org/git/wine.git/?a=commit;h=57fc5e7fcc0168c63622f307f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 5 13:35:55 2011 +0200 winex11: Fix check for desktop process in non-desktop mode. --- dlls/winex11.drv/mouse.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 96d93e5..fdc92ab 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -1207,7 +1207,8 @@ BOOL CDECL X11DRV_ClipCursor( LPCRECT clip ) return TRUE; } - if (X11DRV_get_win_data( GetDesktopWindow() )) return TRUE; /* don't clip in the desktop process */ + if (GetWindowThreadProcessId( GetDesktopWindow(), NULL ) == GetCurrentThreadId()) + return TRUE; /* don't clip in the desktop process */ /* we are clipping if the clip rectangle is smaller than the screen */ if (grab_pointer && (clip->left > virtual_screen_rect.left ||

1 0

Alexandre Julliard : user32: Catch bad pointer passed to SetSysColors.
by Alexandre Julliard 05 May '11

05 May '11

Module: wine Branch: master Commit: 666c40f398087466bd0cc2ff0f511bf7154f7708 URL: http://source.winehq.org/git/wine.git/?a=commit;h=666c40f398087466bd0cc2ff0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 5 13:35:59 2011 +0200 user32: Catch bad pointer passed to SetSysColors. --- dlls/user32/sysparams.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index dcf11ef..0bd1dd2 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -2927,6 +2927,8 @@ BOOL WINAPI SetSysColors( INT nChanges, const INT *lpSysColor, { int i; + if (IS_INTRESOURCE(lpSysColor)) return FALSE; /* stupid app passes a color instead of an array */ + for (i = 0; i < nChanges; i++) SYSPARAMS_SetSysColor( lpSysColor[i], lpColorValues[i] ); /* Send WM_SYSCOLORCHANGE message to all windows */

1 0

Huw Davies : advapi32: Fix incorrect pointer increment.
by Alexandre Julliard 05 May '11

05 May '11

Module: wine Branch: master Commit: e8859699e851e685b8d964e1e026eee093350c46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8859699e851e685b8d964e1e… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu May 5 12:11:20 2011 +0100 advapi32: Fix incorrect pointer increment. --- dlls/advapi32/lsa.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c index 4806216..385ace4 100644 --- a/dlls/advapi32/lsa.c +++ b/dlls/advapi32/lsa.c @@ -414,7 +414,7 @@ NTSTATUS WINAPI LsaLookupNames2( LSA_HANDLE policy, ULONG flags, ULONG count, (*sids)[i].Sid = sid; (*sids)[i].Use = use; - sid += sid_size; + sid = (SID *)((char *)sid + sid_size); sid_size_total -= sid_size; if (domain_size) {

1 0

Alexandre Julliard : makefiles: Add support for .x template files.
by Alexandre Julliard 05 May '11

05 May '11

Module: wine Branch: master Commit: 0435b5825e331675530883ede3b681be874fde0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0435b5825e331675530883ede… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 5 15:02:25 2011 +0200 makefiles: Add support for .x template files. --- Make.rules.in | 2 +- include/Makefile.in | 5 +++-- tools/make_makefiles | 4 ++++ tools/makedep.c | 27 +++++++++++++++++++++++++-- 4 files changed, 33 insertions(+), 5 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index cd9c22e..bd2013c 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -27,7 +27,7 @@ IDL_GEN_HEADERS = $(IDL_H_SRCS:.idl=.h) $(IDL_C_SRCS:.idl=.h) $(IDL_I_SRCS:.idl= CLEAN_FILES = *.o *.a *.so *.ln *.res *.fake *.$(LIBEXT) \\\#*\\\# *~ *% .\\\#* *.bak *.orig *.rej *.flc core CLEAN_TARGETS = $(IDL_GEN_C_SRCS) $(IDL_GEN_HEADERS) $(IDL_TLB_SRCS:.idl=.tlb) $(IDL_P_SRCS:%=dlldata.c) \ $(BISON_SRCS:.y=.tab.c) $(BISON_SRCS:.y=.tab.h) $(LEX_SRCS:.l=.yy.c) \ - $(PO_SRCS:%=rsrc.pot) $(MC_SRCS:%=msg.pot) + $(PO_SRCS:%=rsrc.pot) $(MC_SRCS:%=msg.pot) $(XTEMPLATE_SRCS:.x=.h) OBJS = $(C_SRCS:.c=.o) $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o) $(IDL_GEN_C_SRCS:.c=.o) \ $(IDL_R_SRCS:.idl=_r.res) $(RC_SRCS:.rc=.res) $(MC_SRCS:.mc=.res) $(EXTRA_OBJS) diff --git a/include/Makefile.in b/include/Makefile.in index 1155d30..0bd54f7 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -110,6 +110,7 @@ IDL_TLB_SRCS = \ SRCDIR_INCLUDES = \ $(IDL_TLB_SRCS) \ $(PUBLIC_IDL_H_SRCS) \ + $(XTEMPLATE_SRCS) \ accctrl.h \ access.idl \ aclapi.h \ @@ -575,9 +576,9 @@ IDL_H_SRCS = $(PUBLIC_IDL_H_SRCS) $(PRIVATE_IDL_H_SRCS) @MAKE_RULES@ -OBJDIR_INCLUDES = $(PUBLIC_IDL_H_SRCS:.idl=.h) +OBJDIR_INCLUDES = $(PUBLIC_IDL_H_SRCS:.idl=.h) $(XTEMPLATE_SRCS:.x=.h) -all: $(IDL_H_SRCS:.idl=.h) $(IDL_TLB_SRCS:.idl=.tlb) +all: $(IDL_H_SRCS:.idl=.h) $(IDL_TLB_SRCS:.idl=.tlb) $(XTEMPLATE_SRCS:.x=.h) install install-dev:: $(OBJDIR_INCLUDES) $(INSTALLDIRS) for f in $(SRCDIR_INCLUDES); do case $$f in \ diff --git a/tools/make_makefiles b/tools/make_makefiles index 182aef5..b512d62 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -122,6 +122,7 @@ my @ignore_srcs = ( [ 'IDL_S_SRCS', '\.idl', '_s.c' ], [ 'PUBLIC_IDL_H_SRCS', '\.idl', '.h' ], [ 'PRIVATE_IDL_H_SRCS', '\.idl', '.h' ], + [ 'XTEMPLATE_SRCS', '\.x', '.h' ], ); my %exported_wine_headers = ( @@ -362,6 +363,7 @@ sub assign_sources_to_makefiles(@) if ($name =~ /stdole2\.idl$/) { push @{${$make}{"=IDL_TLB_SRCS"}}, $name; } elsif ($private_idl_headers{$name}) { push @{${$make}{"=SRCDIR_INCLUDES"}}, $name; } elsif ($name =~ /\.h$/) { push @{${$make}{"=SRCDIR_INCLUDES"}}, $name; } + elsif ($name =~ /\.x$/) { push @{${$make}{"=XTEMPLATE_SRCS"}}, $name; } elsif ($name =~ /\.rh$/) { push @{${$make}{"=SRCDIR_INCLUDES"}}, $name; } elsif ($name =~ /\.inl$/) { push @{${$make}{"=SRCDIR_INCLUDES"}}, $name; } elsif ($name =~ /\.idl$/) { push @{${$make}{"=PUBLIC_IDL_H_SRCS"}}, $name; } @@ -386,6 +388,7 @@ sub assign_sources_to_makefiles(@) # add extra variables to include source list my $make = $makefiles{"include/Makefile"}; + unshift @{${$make}{"=SRCDIR_INCLUDES"}}, "\$(XTEMPLATE_SRCS)"; unshift @{${$make}{"=SRCDIR_INCLUDES"}}, "\$(PUBLIC_IDL_H_SRCS)"; unshift @{${$make}{"=SRCDIR_INCLUDES"}}, "\$(IDL_TLB_SRCS)"; } @@ -492,6 +495,7 @@ sub update_makefiles(@) replace_makefile_variable( $file, "PRIVATE_IDL_H_SRCS" ); replace_makefile_variable( $file, "PUBLIC_IDL_H_SRCS" ); replace_makefile_variable( $file, "IDL_TLB_SRCS" ); + replace_makefile_variable( $file, "XTEMPLATE_SRCS" ); replace_makefile_variable( $file, "SRCDIR_INCLUDES" ); replace_makefile_variable( $file, "EXTRASUBDIRS" ); } diff --git a/tools/makedep.c b/tools/makedep.c index f1b0a12..7818a2e 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -471,6 +471,28 @@ static FILE *open_include_file( INCL_FILE *pFile ) free( filename ); } + /* check for corresponding .x file in global includes */ + + if (strendswith( pFile->name, "tmpl.h" )) + { + if (top_src_dir) + filename = strmake( "%s/include/%.*s.x", + top_src_dir, strlen(pFile->name) - 2, pFile->name ); + else if (top_obj_dir) + filename = strmake( "%s/include/%.*s.x", + top_obj_dir, strlen(pFile->name) - 2, pFile->name ); + else + filename = NULL; + + if (filename && (file = fopen( filename, "r" ))) + { + pFile->sourcename = filename; + pFile->filename = strmake( "%s/include/%s", top_obj_dir, pFile->name ); + return file; + } + free( filename ); + } + /* now try in global includes */ if (top_obj_dir) { @@ -761,9 +783,10 @@ static void parse_file( INCL_FILE *pFile, int src ) return; } - /* don't try to open .tlb or .res files */ + /* don't try to open certain types of files */ if (strendswith( pFile->name, ".tlb" ) || - strendswith( pFile->name, ".res" )) + strendswith( pFile->name, ".res" ) || + strendswith( pFile->name, ".x" )) { pFile->filename = xstrdup( pFile->name ); return;

1 0

Dylan Smith : tools: Add a tool to build .x template files.
by Alexandre Julliard 05 May '11

05 May '11

Module: wine Branch: master Commit: e6a824d5feaaec7fd637efe46d37df00e56e9175 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6a824d5feaaec7fd637efe46… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Apr 28 15:52:20 2011 -0400 tools: Add a tool to build .x template files. --- .gitignore | 1 + Make.vars.in | 1 + tools/Makefile.in | 5 + tools/make_xftmpl.c | 566 +++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 573 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e6a824d5feaaec7fd637e…

1 0

Dylan Smith : include: Generate rmxftmpl.h from rmxftmpl. x using new build tool.
by Alexandre Julliard 05 May '11

05 May '11

Module: wine Branch: master Commit: c44ab0cd41d13dcf7ba24e35fed8a220f149dfdf URL: http://source.winehq.org/git/wine.git/?a=commit;h=c44ab0cd41d13dcf7ba24e35f… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Apr 28 15:52:20 2011 -0400 include: Generate rmxftmpl.h from rmxftmpl.x using new build tool. --- .gitignore | 1 + include/Makefile.in | 6 + include/rmxftmpl.x | 268 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 275 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index d59a211..b2ca697 100644 --- a/.gitignore +++ b/.gitignore @@ -216,6 +216,7 @@ include/propsys.h include/pstore.h include/qedit.h include/richole.h +include/rmxftmpl.h include/sensevts.h include/servprov.h include/shdeprecated.h diff --git a/include/Makefile.in b/include/Makefile.in index 0bd54f7..590d5d0 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -107,6 +107,9 @@ PUBLIC_IDL_H_SRCS = \ IDL_TLB_SRCS = \ stdole2.idl +XTEMPLATE_SRCS = \ + rmxftmpl.x + SRCDIR_INCLUDES = \ $(IDL_TLB_SRCS) \ $(PUBLIC_IDL_H_SRCS) \ @@ -580,6 +583,9 @@ OBJDIR_INCLUDES = $(PUBLIC_IDL_H_SRCS:.idl=.h) $(XTEMPLATE_SRCS:.x=.h) all: $(IDL_H_SRCS:.idl=.h) $(IDL_TLB_SRCS:.idl=.tlb) $(XTEMPLATE_SRCS:.x=.h) +rmxftmpl.h: rmxftmpl.x $(MAKEXFTMPL) + $(MAKEXFTMPL) -i D3DRM_XTEMPLATES -s D3DRM_XTEMPLATE_BYTES -o $@ $(srcdir)/rmxftmpl.x + install install-dev:: $(OBJDIR_INCLUDES) $(INSTALLDIRS) for f in $(SRCDIR_INCLUDES); do case $$f in \ wine/*) $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(includedir)/`expr $$f : 'wine/$.*$'` ;; \ diff --git a/include/rmxftmpl.x b/include/rmxftmpl.x new file mode 100644 index 0000000..e7144b0 --- /dev/null +++ b/include/rmxftmpl.x @@ -0,0 +1,268 @@ +xof 0302txt 0064 +// Copyright (C) 2011 Dylan Smith +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + +template Header +{ + <3D82AB43-62DA-11CF-AB39-0020AF71E433> + WORD major; + WORD minor; + DWORD flags; +} + +template Vector +{ + <3D82AB5E-62DA-11CF-AB39-0020AF71E433> + FLOAT x; + FLOAT y; + FLOAT z; +} + +template Coords2d +{ + <F6F23F44-7686-11CF-8F52-0040333594A3> + FLOAT u; + FLOAT v; +} + +template Matrix4x4 +{ + <F6F23F45-7686-11CF-8F52-0040333594A3> + array FLOAT matrix[16]; +} + +template ColorRGBA +{ + <35FF44E0-6C7C-11CF-8F52-0040333594A3> + FLOAT red; + FLOAT green; + FLOAT blue; + FLOAT alpha; +} + +template ColorRGB +{ + <D3E16E81-7835-11CF-8F52-0040333594A3> + FLOAT red; + FLOAT green; + FLOAT blue; +} + +template IndexedColor +{ + <1630B820-7842-11CF-8F52-0040333594A3> + DWORD index; + ColorRGBA indexColor; +} + +template Boolean +{ + <537DA6A0-CA37-11D0-941C-0080C80CFA7B> + DWORD truefalse; +} + +template Boolean2d +{ + <4885AE63-78E8-11CF-8F52-0040333594A3> + Boolean u; + Boolean v; +} + +template MaterialWrap +{ + <4885AE60-78E8-11CF-8F52-0040333594A3> + Boolean u; + Boolean v; +} + +template TextureFilename +{ + <A42790E1-7810-11CF-8F52-0040333594A3> + STRING filename; +} + +template Material +{ + <3D82AB4D-62DA-11CF-AB39-0020AF71E433> + ColorRGBA faceColor; + FLOAT power; + ColorRGB specularColor; + ColorRGB emissiveColor; + [ ... ] +} + +template MeshFace +{ + <3D82AB5F-62DA-11CF-AB39-0020AF71E433> + DWORD nFaceVertexIndices; + array DWORD faceVertexIndices[nFaceVertexIndices]; +} + +template MeshFaceWraps +{ + <ED1EC5C0-C0A8-11D0-941C-0080C80CFA7B> + DWORD nFaceWrapValues; + array Boolean2d faceWrapValues[nFaceWrapValues]; +} + +template MeshTextureCoords +{ + <F6F23F40-7686-11CF-8F52-0040333594A3> + DWORD nTextureCoords; + array Coords2d textureCoords[nTextureCoords]; +} + +template MeshMaterialList +{ + <F6F23F42-7686-11CF-8F52-0040333594A3> + DWORD nMaterials; + DWORD nFaceIndexes; + array DWORD faceIndexes[nFaceIndexes]; + [ Material ] +} + +template MeshNormals +{ + <F6F23F43-7686-11CF-8F52-0040333594A3> + DWORD nNormals; + array Vector normals[nNormals]; + DWORD nFaceNormals; + array MeshFace faceNormals[nFaceNormals]; +} + +template MeshVertexColors +{ + <1630B821-7842-11CF-8F52-0040333594A3> + DWORD nVertexColors; + array IndexedColor vertexColors[nVertexColors]; +} + +template Mesh +{ + <3D82AB44-62DA-11CF-AB39-0020AF71E433> + DWORD nVertices; + array Vector vertices[nVertices]; + DWORD nFaces; + array MeshFace faces[nFaces]; + [ ... ] +} + +template FrameTransformMatrix +{ + <F6F23F41-7686-11CF-8F52-0040333594A3> + Matrix4x4 frameMatrix; +} + +template Frame +{ + <3D82AB46-62DA-11CF-AB39-0020AF71E433> + [ ... ] +} + +template FloatKeys +{ + <10DD46A9-775B-11CF-8F52-0040333594A3> + DWORD nValues; + array FLOAT values[nValues]; +} + +template TimedFloatKeys +{ + <F406B180-7B3B-11CF-8F52-0040333594A3> + DWORD time; + FloatKeys tfkeys; +} + +template AnimationKey +{ + <10DD46A8-775B-11CF-8F52-0040333594A3> + DWORD keyType; + DWORD nKeys; + array TimedFloatKeys keys[nKeys]; +} + +template AnimationOptions +{ + <E2BF56C0-840F-11CF-8F52-0040333594A3> + DWORD openclosed; + DWORD positionquality; +} + +template Animation +{ + <3D82AB4F-62DA-11CF-AB39-0020AF71E433> + [ ... ] +} + +template AnimationSet +{ + <3D82AB50-62DA-11CF-AB39-0020AF71E433> + [ Animation ] +} + +template InlineData +{ + <3A23EEA0-94B1-11D0-AB39-0020AF71E433> + [ BINARY ] +} + +template Url +{ + <3A23EEA1-94B1-11D0-AB39-0020AF71E433> + DWORD nUrls; + array STRING urls[nUrls]; +} + +template ProgressiveMesh +{ + <8A63C360-997D-11D0-941C-0080C80CFA7B> + [ Url, InlineData ] +} + +template Guid +{ + <A42790E0-7810-11CF-8F52-0040333594A3> + DWORD data1; + WORD data2; + WORD data3; + array UCHAR data4[8]; +} + +template StringProperty +{ + <7F0F21E0-BFE1-11D1-82C0-00A0C9697271> + STRING key; + STRING value; +} + +template PropertyBag +{ + <7F0F21E1-BFE1-11D1-82C0-00A0C9697271> + [ StringProperty ] +} + +template ExternalVisual +{ + <98116AA0-BDBA-11D1-82C0-00A0C9697271> + Guid guidExternalVisual; + [ ... ] +} + +template RightHanded +{ + <7F5D5EA0-D53A-11D1-82C0-00A0C9697271> + DWORD bRightHanded; +}

1 0

Damjan Jovanovic : mmsystem.dll16: Fix MCI_STATUS mapping for digitalvideo.
by Alexandre Julliard 05 May '11

05 May '11

Module: wine Branch: master Commit: 840aacc1a263afef9b40595436cb0fb3a653e5fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=840aacc1a263afef9b4059543… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu May 5 15:30:54 2011 +0200 mmsystem.dll16: Fix MCI_STATUS mapping for digitalvideo. --- dlls/mmsystem.dll16/mci16.c | 60 ++++++++++++++++++++++++++++++++++++++---- 1 files changed, 54 insertions(+), 6 deletions(-) diff --git a/dlls/mmsystem.dll16/mci16.c b/dlls/mmsystem.dll16/mci16.c index f38df6a..adc4469 100644 --- a/dlls/mmsystem.dll16/mci16.c +++ b/dlls/mmsystem.dll16/mci16.c @@ -128,10 +128,21 @@ static LPWSTR MCI_strdupAtoW( LPCSTR str ) return ret; } +static DWORD MCI_get_device_type(UINT16 deviceId) +{ + MCI_GETDEVCAPS_PARMS parms; + MCIERROR err; + + err = mciSendCommandW(deviceId, MCI_GETDEVCAPS, MCI_GETDEVCAPS_DEVICE_TYPE | MCI_WAIT, (DWORD_PTR)&parms); + if (err != MMSYSERR_NOERROR) + return MCI_DEVTYPE_OTHER; + return parms.dwReturn; +} + /************************************************************************** * MCI_MapMsg16To32W [internal] */ -static MMSYSTEM_MapType MCI_MapMsg16To32W(WORD wMsg, DWORD dwFlags, DWORD_PTR* lParam) +static MMSYSTEM_MapType MCI_MapMsg16To32W(UINT16 wDevID, WORD wMsg, DWORD dwFlags, DWORD_PTR* lParam) { if (*lParam == 0) return MMSYSTEM_MAP_OK; @@ -163,7 +174,6 @@ static MMSYSTEM_MapType MCI_MapMsg16To32W(WORD wMsg, DWORD dwFlags, DWORD_PTR* l /* case MCI_SETTIMECODE:*/ /* case MCI_SIGNAL:*/ case MCI_SPIN: - case MCI_STATUS: /* FIXME: is wrong for digital video */ case MCI_STEP: case MCI_STOP: /* case MCI_UNDO: */ @@ -192,6 +202,31 @@ static MMSYSTEM_MapType MCI_MapMsg16To32W(WORD wMsg, DWORD dwFlags, DWORD_PTR* l *lParam = (DWORD)mdrp32; } return MMSYSTEM_MAP_OKMEM; + case MCI_STATUS: + { + if (MCI_get_device_type(wDevID) == MCI_DEVTYPE_DIGITAL_VIDEO) { + LPMCI_DGV_STATUS_PARMSW mdsp32w = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + sizeof(LPMCI_DGV_STATUS_PARMS16) + sizeof(MCI_DGV_STATUS_PARMSW)); + LPMCI_DGV_STATUS_PARMS16 mdsp16 = MapSL(*lParam); + if (mdsp32w) { + *(LPMCI_DGV_STATUS_PARMS16*)(mdsp32w) = mdsp16; + mdsp32w = (LPMCI_DGV_STATUS_PARMSW)((char*)mdsp32w + sizeof(LPMCI_DGV_STATUS_PARMS16)); + mdsp32w->dwCallback = mdsp16->dwCallback; + mdsp32w->dwReturn = mdsp16->dwReturn; + mdsp32w->dwItem = mdsp16->dwItem; + mdsp32w->dwTrack = mdsp16->dwTrack; + if (dwFlags & MCI_DGV_STATUS_DISKSPACE) + mdsp32w->lpstrDrive = MCI_strdupAtoW(MapSL(mdsp16->lpstrDrive)); + mdsp32w->dwReference = mdsp16->dwReference; + *lParam = (DWORD)mdsp32w; + } else { + return MMSYSTEM_MAP_NOMEM; + } + } else { + *lParam = (DWORD)MapSL(*lParam); + } + } + return MMSYSTEM_MAP_OKMEM; case MCI_WINDOW: { LPMCI_OVLY_WINDOW_PARMSW mowp32w = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(MCI_OVLY_WINDOW_PARMSW)); @@ -359,7 +394,7 @@ static MMSYSTEM_MapType MCI_MapMsg16To32W(WORD wMsg, DWORD dwFlags, DWORD_PTR* l /************************************************************************** * MCI_UnMapMsg16To32W [internal] */ -static MMSYSTEM_MapType MCI_UnMapMsg16To32W(WORD wMsg, DWORD dwFlags, DWORD_PTR lParam) +static MMSYSTEM_MapType MCI_UnMapMsg16To32W(UINT16 wDevID, WORD wMsg, DWORD dwFlags, DWORD_PTR lParam) { switch (wMsg) { /* case MCI_CAPTURE */ @@ -385,7 +420,6 @@ static MMSYSTEM_MapType MCI_UnMapMsg16To32W(WORD wMsg, DWORD dwFlags, DWORD_PTR /* case MCI_SETTIMECODE:*/ /* case MCI_SIGNAL:*/ case MCI_SPIN: - case MCI_STATUS: case MCI_STEP: case MCI_STOP: /* case MCI_UNDO: */ @@ -407,6 +441,20 @@ static MMSYSTEM_MapType MCI_UnMapMsg16To32W(WORD wMsg, DWORD dwFlags, DWORD_PTR HeapFree(GetProcessHeap(), 0, (LPVOID)lParam); } return MMSYSTEM_MAP_OK; + case MCI_STATUS: + if (lParam && MCI_get_device_type(wDevID) == MCI_DEVTYPE_DIGITAL_VIDEO) { + LPMCI_DGV_STATUS_PARMSW mdsp32w = (LPMCI_DGV_STATUS_PARMSW)lParam; + char *base = (char*)lParam - sizeof(LPMCI_DGV_STATUS_PARMS16); + LPMCI_DGV_STATUS_PARMS16 mdsp16 = *(LPMCI_DGV_STATUS_PARMS16*)base; + mdsp16->dwCallback = mdsp32w->dwCallback; + mdsp16->dwReturn = mdsp32w->dwReturn; + mdsp16->dwItem = mdsp32w->dwItem; + mdsp16->dwTrack = mdsp32w->dwTrack; + mdsp16->dwReference = mdsp32w->dwReference; + HeapFree(GetProcessHeap(), 0, (LPVOID)mdsp32w->lpstrDrive); + HeapFree(GetProcessHeap(), 0, base); + } + return MMSYSTEM_MAP_OK; case MCI_WINDOW: if (lParam) { LPMCI_OVLY_WINDOW_PARMSW mowp32w = (LPMCI_OVLY_WINDOW_PARMSW)lParam; @@ -707,7 +755,7 @@ DWORD WINAPI mciSendCommand16(UINT16 wDevID, UINT16 wMsg, DWORD dwParam1, DWORD dwRet = MCIERR_INVALID_DEVICE_ID; - switch (res = MCI_MapMsg16To32W(wMsg, dwParam1, &dwParam2)) { + switch (res = MCI_MapMsg16To32W(wDevID, wMsg, dwParam1, &dwParam2)) { case MMSYSTEM_MAP_MSGERROR: TRACE("%s not handled yet\n", MCI_MessageToString(wMsg)); dwRet = MCIERR_DRIVER_INTERNAL; @@ -720,7 +768,7 @@ DWORD WINAPI mciSendCommand16(UINT16 wDevID, UINT16 wMsg, DWORD dwParam1, DWORD case MMSYSTEM_MAP_OKMEM: dwRet = mciSendCommandW(wDevID, wMsg, dwParam1, dwParam2); if (res == MMSYSTEM_MAP_OKMEM) - MCI_UnMapMsg16To32W(wMsg, dwParam1, dwParam2); + MCI_UnMapMsg16To32W(wDevID, wMsg, dwParam1, dwParam2); break; } }

1 0

Damjan Jovanovic : mmsystem.dll16: Fix the pointer arithmetic and memory leak issues when unmapping.
by Alexandre Julliard 05 May '11

05 May '11

Module: wine Branch: master Commit: 821adcfac33528bbb2576d54d467aab69ec36e12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=821adcfac33528bbb2576d54d… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu May 5 15:18:04 2011 +0200 mmsystem.dll16: Fix the pointer arithmetic and memory leak issues when unmapping. --- dlls/mmsystem.dll16/mci16.c | 22 +++++++++++++--------- 1 files changed, 13 insertions(+), 9 deletions(-) diff --git a/dlls/mmsystem.dll16/mci16.c b/dlls/mmsystem.dll16/mci16.c index adc4469..27ae01d 100644 --- a/dlls/mmsystem.dll16/mci16.c +++ b/dlls/mmsystem.dll16/mci16.c @@ -431,14 +431,15 @@ static MMSYSTEM_MapType MCI_UnMapMsg16To32W(UINT16 wDevID, WORD wMsg, DWORD dwF case MCI_UNFREEZE: case MCI_PUT: if (lParam) { - LPMCI_DGV_RECT_PARMS16 mdrp16 = (LPMCI_DGV_RECT_PARMS16)lParam; - LPMCI_DGV_RECT_PARMS mdrp32 = (LPMCI_DGV_RECT_PARMS)((char*)lParam + sizeof(LPMCI_DGV_RECT_PARMS16)); + LPMCI_DGV_RECT_PARMS mdrp32 = (LPMCI_DGV_RECT_PARMS)lParam; + char *base = (char*)lParam - sizeof(LPMCI_DGV_RECT_PARMS16); + LPMCI_DGV_RECT_PARMS16 mdrp16 = *(LPMCI_DGV_RECT_PARMS16*)base; mdrp16->dwCallback = mdrp32->dwCallback; mdrp16->rc.left = mdrp32->rc.left; mdrp16->rc.top = mdrp32->rc.top; mdrp16->rc.right = mdrp32->rc.right; mdrp16->rc.bottom = mdrp32->rc.bottom; - HeapFree(GetProcessHeap(), 0, (LPVOID)lParam); + HeapFree(GetProcessHeap(), 0, base); } return MMSYSTEM_MAP_OK; case MCI_STATUS: @@ -476,20 +477,22 @@ static MMSYSTEM_MapType MCI_UnMapMsg16To32W(UINT16 wDevID, WORD wMsg, DWORD dwF case MCI_INFO: if (lParam) { LPMCI_INFO_PARMSW mip32w = (LPMCI_INFO_PARMSW)lParam; - LPMCI_INFO_PARMS16 mip16 = *(LPMCI_INFO_PARMS16*)((char*)mip32w - sizeof(LPMCI_INFO_PARMS16)); + char *base = (char*)lParam - sizeof(LPMCI_INFO_PARMS16); + LPMCI_INFO_PARMS16 mip16 = *(LPMCI_INFO_PARMS16*)base; WideCharToMultiByte(CP_ACP, 0, mip32w->lpstrReturn, mip32w->dwRetSize / sizeof(WCHAR), MapSL(mip16->lpstrReturn), mip16->dwRetSize, NULL, NULL); HeapFree(GetProcessHeap(), 0, mip32w->lpstrReturn); - HeapFree(GetProcessHeap(), 0, (LPVOID)lParam); + HeapFree(GetProcessHeap(), 0, base); } return MMSYSTEM_MAP_OK; case MCI_SYSINFO: if (lParam) { MCI_SYSINFO_PARMSW *msip32w = (MCI_SYSINFO_PARMSW *)lParam; - MCI_SYSINFO_PARMS16 *msip16 = *(MCI_SYSINFO_PARMS16 **)((char *)msip32w - sizeof(MCI_SYSINFO_PARMS16 *)); + char *base = (char*)lParam - sizeof(MCI_SYSINFO_PARMS16 *); + MCI_SYSINFO_PARMS16 *msip16 = *(MCI_SYSINFO_PARMS16 **)base; if (dwFlags & MCI_SYSINFO_QUANTITY) { DWORD *quantity = MapSL(msip16->lpstrReturn); @@ -504,7 +507,7 @@ static MMSYSTEM_MapType MCI_UnMapMsg16To32W(UINT16 wDevID, WORD wMsg, DWORD dwF } HeapFree(GetProcessHeap(), 0, msip32w->lpstrReturn); - HeapFree(GetProcessHeap(), 0, (LPVOID)lParam); + HeapFree(GetProcessHeap(), 0, base); } return MMSYSTEM_MAP_OK; case MCI_SOUND: @@ -518,7 +521,8 @@ static MMSYSTEM_MapType MCI_UnMapMsg16To32W(UINT16 wDevID, WORD wMsg, DWORD dwF case MCI_OPEN_DRIVER: if (lParam) { LPMCI_OPEN_PARMSW mop32w = (LPMCI_OPEN_PARMSW)lParam; - LPMCI_OPEN_PARMS16 mop16 = *(LPMCI_OPEN_PARMS16*)((char*)mop32w - sizeof(LPMCI_OPEN_PARMS16)); + char *base = (char*)lParam - sizeof(LPMCI_OPEN_PARMS16); + LPMCI_OPEN_PARMS16 mop16 = *(LPMCI_OPEN_PARMS16*)base; mop16->wDeviceID = mop32w->wDeviceID; if( ( dwFlags & ( MCI_OPEN_TYPE | MCI_OPEN_TYPE_ID)) == MCI_OPEN_TYPE) @@ -527,7 +531,7 @@ static MMSYSTEM_MapType MCI_UnMapMsg16To32W(UINT16 wDevID, WORD wMsg, DWORD dwF HeapFree(GetProcessHeap(), 0, (LPWSTR)mop32w->lpstrElementName); if( ( dwFlags & MCI_OPEN_ALIAS)) HeapFree(GetProcessHeap(), 0, (LPWSTR)mop32w->lpstrAlias); - if (!HeapFree(GetProcessHeap(), 0, (LPVOID)(lParam - sizeof(LPMCI_OPEN_PARMS16)))) + if (!HeapFree(GetProcessHeap(), 0, base)) FIXME("bad free line=%d\n", __LINE__); } return MMSYSTEM_MAP_OK;

1 0

Alexandre Julliard : dinput: Reset the clipped flag when the cursor is released.
by Alexandre Julliard 05 May '11

05 May '11

Module: wine Branch: master Commit: 86b682154b440ee5d2d9bf102704644a11cf01cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=86b682154b440ee5d2d9bf102… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 5 16:31:51 2011 +0200 dinput: Reset the clipped flag when the cursor is released. --- dlls/dinput/mouse.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index b890c73..02813ff 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -491,6 +491,11 @@ static HRESULT WINAPI SysMouseWImpl_Acquire(LPDIRECTINPUTDEVICE8W iface) if (!This->base.win) This->base.win = GetDesktopWindow(); warp_check( This, TRUE ); } + else if (This->clipped) + { + ClipCursor( NULL ); + This->clipped = FALSE; + } return DI_OK; } @@ -517,6 +522,7 @@ static HRESULT WINAPI SysMouseWImpl_Unacquire(LPDIRECTINPUTDEVICE8W iface) { ClipCursor(NULL); ShowCursor(TRUE); /* show cursor */ + This->clipped = FALSE; } /* And put the mouse cursor back where it was at acquire time */

1 0

Matteo Bruni : d3dcompiler: Improve some parameter names and fix code style .
by Alexandre Julliard 05 May '11

05 May '11

Module: wine Branch: master Commit: 1d160beda04946df465e9e51b6838f8d684f01e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d160beda04946df465e9e51b… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jan 12 23:06:44 2011 +0100 d3dcompiler: Improve some parameter names and fix code style. --- dlls/d3dcompiler_43/compiler.c | 45 +++++++++++++++++++-------------------- 1 files changed, 22 insertions(+), 23 deletions(-) diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index 8527870..d925f95 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -390,8 +390,8 @@ cleanup: return hr; } -static HRESULT assemble_shader(const char *preprocShader, const char *preprocMessages, - LPD3DBLOB* ppShader, LPD3DBLOB* ppErrorMsgs) +static HRESULT assemble_shader(const char *preproc_shader, const char *preproc_messages, + ID3DBlob **shader_blob, ID3DBlob **error_messages) { struct bwriter_shader *shader; char *messages = NULL; @@ -401,51 +401,50 @@ static HRESULT assemble_shader(const char *preprocShader, const char *preprocMes int size; char *pos; - shader = SlAssembleShader(preprocShader, &messages); + shader = SlAssembleShader(preproc_shader, &messages); - if(messages || preprocMessages) + if (messages || preproc_messages) { - if(preprocMessages) + if (preproc_messages) { TRACE("Preprocessor messages:\n"); - TRACE("%s", preprocMessages); + TRACE("%s", preproc_messages); } - if(messages) + if (messages) { TRACE("Assembler messages:\n"); TRACE("%s", messages); } TRACE("Shader source:\n"); - TRACE("%s\n", debugstr_a(preprocShader)); + TRACE("%s\n", debugstr_a(preproc_shader)); - if(ppErrorMsgs) + if (error_messages) { size = (messages ? strlen(messages) : 0) + - (preprocMessages ? strlen(preprocMessages) : 0) + 1; + (preproc_messages ? strlen(preproc_messages) : 0) + 1; hr = D3DCreateBlob(size, &buffer); - if(FAILED(hr)) + if (FAILED(hr)) { HeapFree(GetProcessHeap(), 0, messages); - if(shader) SlDeleteShader(shader); + if (shader) SlDeleteShader(shader); return hr; } pos = ID3D10Blob_GetBufferPointer(buffer); - if(preprocMessages) + if (preproc_messages) { - CopyMemory(pos, preprocMessages, strlen(preprocMessages) + 1); - pos += strlen(preprocMessages); + CopyMemory(pos, preproc_messages, strlen(preproc_messages) + 1); + pos += strlen(preproc_messages); } - if(messages) + if (messages) CopyMemory(pos, messages, strlen(messages) + 1); - *ppErrorMsgs = buffer; + *error_messages = buffer; } - HeapFree(GetProcessHeap(), 0, messages); } - if(shader == NULL) + if (shader == NULL) { ERR("Asm reading failed\n"); return D3DXERR_INVALIDDATA; @@ -453,23 +452,23 @@ static HRESULT assemble_shader(const char *preprocShader, const char *preprocMes hr = SlWriteBytecode(shader, 9, &res); SlDeleteShader(shader); - if(FAILED(hr)) + if (FAILED(hr)) { ERR("SlWriteBytecode failed with 0x%08x\n", hr); return D3DXERR_INVALIDDATA; } - if(ppShader) + if (shader_blob) { size = HeapSize(GetProcessHeap(), 0, res); hr = D3DCreateBlob(size, &buffer); - if(FAILED(hr)) + if (FAILED(hr)) { HeapFree(GetProcessHeap(), 0, res); return hr; } CopyMemory(ID3D10Blob_GetBufferPointer(buffer), res, size); - *ppShader = buffer; + *shader_blob = buffer; } HeapFree(GetProcessHeap(), 0, res);

1 0