November 2005 - Wine-commits

wine/dlls/kernel heap.c
by Alexandre Julliard 11 Nov '05

11 Nov '05

ChangeSet ID: 21220 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/11 04:53:30 Modified files: dlls/kernel : heap.c Log message: Vincent Béron <vberon(a)mecano.gme.usherb.ca> Protect sys/stat.h with a conditional. Patch: http://cvs.winehq.org/patch.py?id=21220 Old revision New revision Changes Path 1.21 1.22 +3 -1 wine/dlls/kernel/heap.c Index: wine/dlls/kernel/heap.c diff -u -p wine/dlls/kernel/heap.c:1.21 wine/dlls/kernel/heap.c:1.22 --- wine/dlls/kernel/heap.c:1.21 11 Nov 2005 10:53:30 -0000 +++ wine/dlls/kernel/heap.c 11 Nov 2005 10:53:30 -0000 @@ -45,7 +45,9 @@ # undef _FILE_OFFSET_BITS # define _FILE_OFFSET_BITS 32 # include <sys/resource.h> -# include <sys/stat.h> +# ifdef HAVE_SYS_STAT_H +# include <sys/stat.h> +# endif # include <sys/swap.h> #endif

1 0

wine/dlls/msi msi.c
by Alexandre Julliard 11 Nov '05

11 Nov '05

ChangeSet ID: 21219 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/11 04:52:53 Modified files: dlls/msi : msi.c Log message: Steven Edwards <winehacker(a)gmail.com> Partly implement MsiMessageBox[A/W] on top of MessageBoxEx[A/W] Patch: http://cvs.winehq.org/patch.py?id=21219 Old revision New revision Changes Path 1.116 1.117 +2 -2 wine/dlls/msi/msi.c Index: wine/dlls/msi/msi.c diff -u -p wine/dlls/msi/msi.c:1.116 wine/dlls/msi/msi.c:1.117 --- wine/dlls/msi/msi.c:1.116 11 Nov 2005 10:52:53 -0000 +++ wine/dlls/msi/msi.c 11 Nov 2005 10:52:53 -0000 @@ -832,7 +832,7 @@ UINT WINAPI MsiMessageBoxA(HWND hWnd, LP { FIXME("%p %s %s %u %08x %08lx\n",hWnd,debugstr_a(lpText),debugstr_a(lpCaption), uType,wLanguageId,f); - return ERROR_CALL_NOT_IMPLEMENTED; + return MessageBoxExA(hWnd,lpText,lpCaption,uType,wLanguageId); } UINT WINAPI MsiMessageBoxW(HWND hWnd, LPCWSTR lpText, LPCWSTR lpCaption, UINT uType, @@ -840,7 +840,7 @@ UINT WINAPI MsiMessageBoxW(HWND hWnd, LP { FIXME("%p %s %s %u %08x %08lx\n",hWnd,debugstr_w(lpText),debugstr_w(lpCaption), uType,wLanguageId,f); - return ERROR_CALL_NOT_IMPLEMENTED; + return MessageBoxExW(hWnd,lpText,lpCaption,uType,wLanguageId); } UINT WINAPI MsiProvideAssemblyA( LPCSTR szAssemblyName, LPCSTR szAppContext,

1 0

wine/dlls/dinput joystick_linuxinput.c
by Alexandre Julliard 11 Nov '05

11 Nov '05

ChangeSet ID: 21218 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/11 04:52:27 Modified files: dlls/dinput : joystick_linuxinput.c Log message: Christoph Frick <frick(a)sc-networks.de> Moved and adopted joystick_linux.c code into the joystick_linuxinput.c. Patch: http://cvs.winehq.org/patch.py?id=21218 Old revision New revision Changes Path 1.32 1.33 +166 -31 wine/dlls/dinput/joystick_linuxinput.c

1 0

wine/dlls x11drv/opengl.c opengl32/wgl_ext.c o ...
by Alexandre Julliard 11 Nov '05

11 Nov '05

ChangeSet ID: 21217 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/11 04:52:15 Modified files: dlls/x11drv : opengl.c dlls/opengl32 : wgl_ext.c wgl.c opengl_norm.c opengl_ext.h make_opengl Log message: Raphael Junqueira <fenix(a)club-internet.fr> Add GLXFBConfig on Wine_GLContext (we should remove XVisualInfo references on code). Hook glGetIntegerv on GL_ALPHA_BITS to query on GLXFBConfig instead of glGetInteger (as it returns bad value). Patch: http://cvs.winehq.org/patch.py?id=21217 Old revision New revision Changes Path 1.16 1.17 +27 -3 wine/dlls/x11drv/opengl.c 1.11 1.12 +7 -4 wine/dlls/opengl32/wgl_ext.c 1.66 1.67 +36 -2 wine/dlls/opengl32/wgl.c 1.13 1.14 +1 -1 wine/dlls/opengl32/opengl_norm.c 1.9 1.10 +1 -0 wine/dlls/opengl32/opengl_ext.h 1.28 1.29 +3 -0 wine/dlls/opengl32/make_opengl

1 0

wine/ programs/winevdm/winevdm.c dlls/x11drv/x ...
by Alexandre Julliard 10 Nov '05

10 Nov '05

ChangeSet ID: 21216 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/10 06:15:00 Modified files: programs/winevdm: winevdm.c dlls/x11drv : xrandr.c xfont.c palette.c keyboard.c event.c dlls/wsock32 : socket.c dlls/wintab32 : context.c dlls/winsock/tests: sock.c dlls/winsock : socket16.c dlls/winmm/wineesd: audio.c dlls/winmm/winearts: audio.c dlls/winmm/winealsa: audio.c dlls/winmm/tests: mixer.c dlls/winmm/mciwave: mciwave.c dlls/winmm : playsound.c mmsystem.c mci.c dlls/wininet : internet.c http.c ftp.c dlls/winedos : int15.c int10.c dlls/wined3d : wined3d_main.c volumetexture.c texture.c swapchain.c surface.c stateblock.c query.c drawprim.c directx.c device.c cubetexture.c basetexture.c dlls/vwin32.vxd: vwin32.c dlls/user/tests: menu.c dlls/user : dde_misc.c comm16.c dlls/tapi32 : line.c dlls/shlwapi/tests: ordinal.c dlls/shell32/tests: shlfileop.c dlls/shell32 : shfldr_mycomp.c shfldr_desktop.c shellord.c shelllink.c pidl.c enumidlist.c cpanelfolder.c dlls/opengl32 : wgl_ext.c wgl.c dlls/olepro32 : olepro32stubs.c dlls/oleaut32 : varformat.c typelib.c dlls/ole32 : ole2.c bindctx.c antimoniker.c dlls/odbc32 : proxyodbc.c dlls/ntdll : misc.c dlls/msvcrt/tests: cpp.c dlls/msi : table.c package.c format.c files.c custom.c action.c dlls/mciseq : mcimidi.c dlls/mcicda : mcicda.c dlls/kernel : comm.c dlls/gdi/mfdrv : bitblt.c dlls/gdi : bitmap.c dlls/dxdiagn : provider.c dlls/dsound : dsound_main.c dlls/dpnet : address.c dlls/dplayx : dplay.c dlls/dmstyle : styletrack.c dlls/dmscript : script.c dlls/dmime : segtriggertrack.c dlls/dinput : mouse.c device.c dlls/ddraw : vertexbuffer.c surface_main.c opengl_utils.c light.c executebuffer.c device_opengl.c device_main.c ddraw_main.c dlls/d3d9 : vertexshader.c directx.c device.c dlls/d3d8 : texture.c stateblock.c shader.c directx.c device.c cubetexture.c dlls/commdlg : filetitle.c dlls/comctl32 : treeview.c listview.c comboex.c dlls/advapi32 : security.c Log message: Francois Gouget <fgouget(a)free.fr> Remove spaces before '\n' in traces. Patch: http://cvs.winehq.org/patch.py?id=21216 Old revision New revision Changes Path 1.9 1.10 +1 -1 wine/programs/winevdm/winevdm.c 1.11 1.12 +1 -1 wine/dlls/x11drv/xrandr.c 1.25 1.26 +2 -2 wine/dlls/x11drv/xfont.c 1.17 1.18 +1 -1 wine/dlls/x11drv/palette.c 1.78 1.79 +2 -2 wine/dlls/x11drv/keyboard.c 1.59 1.60 +2 -2 wine/dlls/x11drv/event.c 1.33 1.34 +2 -2 wine/dlls/wsock32/socket.c 1.13 1.14 +1 -1 wine/dlls/wintab32/context.c 1.28 1.29 +3 -3 wine/dlls/winsock/tests/sock.c 1.3 1.4 +1 -1 wine/dlls/winsock/socket16.c 1.3 1.4 +1 -1 wine/dlls/winmm/wineesd/audio.c 1.31 1.32 +1 -1 wine/dlls/winmm/winearts/audio.c 1.98 1.99 +1 -1 wine/dlls/winmm/winealsa/audio.c 1.11 1.12 +4 -4 wine/dlls/winmm/tests/mixer.c 1.37 1.38 +6 -6 wine/dlls/winmm/mciwave/mciwave.c 1.18 1.19 +4 -4 wine/dlls/winmm/playsound.c 1.120 1.121 +1 -1 wine/dlls/winmm/mmsystem.c 1.65 1.66 +2 -2 wine/dlls/winmm/mci.c 1.137 1.138 +1 -1 wine/dlls/wininet/internet.c 1.107 1.108 +1 -1 wine/dlls/wininet/http.c 1.56 1.57 +1 -1 wine/dlls/wininet/ftp.c 1.4 1.5 +1 -1 wine/dlls/winedos/int15.c 1.38 1.39 +2 -2 wine/dlls/winedos/int10.c 1.14 1.15 +1 -1 wine/dlls/wined3d/wined3d_main.c 1.9 1.10 +3 -3 wine/dlls/wined3d/volumetexture.c 1.12 1.13 +4 -4 wine/dlls/wined3d/texture.c 1.10 1.11 +4 -4 wine/dlls/wined3d/swapchain.c 1.29 1.30 +2 -2 wine/dlls/wined3d/surface.c 1.25 1.26 +2 -2 wine/dlls/wined3d/stateblock.c 1.2 1.3 +3 -3 wine/dlls/wined3d/query.c 1.32 1.33 +5 -5 wine/dlls/wined3d/drawprim.c 1.61 1.62 +2 -2 wine/dlls/wined3d/directx.c 1.94 1.95 +20 -20 wine/dlls/wined3d/device.c 1.11 1.12 +4 -4 wine/dlls/wined3d/cubetexture.c 1.19 1.20 +4 -4 wine/dlls/wined3d/basetexture.c 1.2 1.3 +1 -1 wine/dlls/vwin32.vxd/vwin32.c 1.7 1.8 +1 -1 wine/dlls/user/tests/menu.c 1.7 1.8 +5 -5 wine/dlls/user/dde_misc.c 1.26 1.27 +1 -1 wine/dlls/user/comm16.c 1.21 1.22 +1 -1 wine/dlls/tapi32/line.c 1.18 1.19 +5 -5 wine/dlls/shlwapi/tests/ordinal.c 1.22 1.23 +1 -1 wine/dlls/shell32/tests/shlfileop.c 1.42 1.43 +1 -1 wine/dlls/shell32/shfldr_mycomp.c 1.48 1.49 +1 -1 wine/dlls/shell32/shfldr_desktop.c 1.137 1.138 +2 -2 wine/dlls/shell32/shellord.c 1.113 1.114 +1 -1 wine/dlls/shell32/shelllink.c 1.137 1.138 +1 -1 wine/dlls/shell32/pidl.c 1.47 1.48 +1 -1 wine/dlls/shell32/enumidlist.c 1.21 1.22 +1 -1 wine/dlls/shell32/cpanelfolder.c 1.10 1.11 +1 -1 wine/dlls/opengl32/wgl_ext.c 1.65 1.66 +1 -1 wine/dlls/opengl32/wgl.c 1.13 1.14 +4 -4 wine/dlls/olepro32/olepro32stubs.c 1.15 1.16 +1 -1 wine/dlls/oleaut32/varformat.c 1.175 1.176 +8 -8 wine/dlls/oleaut32/typelib.c 1.79 1.80 +1 -1 wine/dlls/ole32/ole2.c 1.36 1.37 +2 -2 wine/dlls/ole32/bindctx.c 1.27 1.28 +1 -1 wine/dlls/ole32/antimoniker.c 1.30 1.31 +1 -1 wine/dlls/odbc32/proxyodbc.c 1.18 1.19 +1 -1 wine/dlls/ntdll/misc.c 1.5 1.6 +1 -1 wine/dlls/msvcrt/tests/cpp.c 1.50 1.51 +1 -1 wine/dlls/msi/table.c 1.65 1.66 +1 -1 wine/dlls/msi/package.c 1.24 1.25 +1 -1 wine/dlls/msi/format.c 1.30 1.31 +1 -1 wine/dlls/msi/files.c 1.30 1.31 +5 -5 wine/dlls/msi/custom.c 1.230 1.231 +5 -5 wine/dlls/msi/action.c 1.2 1.3 +13 -13 wine/dlls/mciseq/mcimidi.c 1.1 1.2 +2 -2 wine/dlls/mcicda/mcicda.c 1.99 1.100 +9 -9 wine/dlls/kernel/comm.c 1.8 1.9 +1 -1 wine/dlls/gdi/mfdrv/bitblt.c 1.7 1.8 +1 -1 wine/dlls/gdi/bitmap.c 1.12 1.13 +1 -1 wine/dlls/dxdiagn/provider.c 1.129 1.130 +1 -1 wine/dlls/dsound/dsound_main.c 1.8 1.9 +3 -3 wine/dlls/dpnet/address.c 1.63 1.64 +1 -1 wine/dlls/dplayx/dplay.c 1.13 1.14 +1 -1 wine/dlls/dmstyle/styletrack.c 1.21 1.22 +2 -2 wine/dlls/dmscript/script.c 1.18 1.19 +1 -1 wine/dlls/dmime/segtriggertrack.c 1.28 1.29 +1 -1 wine/dlls/dinput/mouse.c 1.30 1.31 +3 -3 wine/dlls/dinput/device.c 1.3 1.4 +1 -1 wine/dlls/ddraw/vertexbuffer.c 1.7 1.8 +3 -3 wine/dlls/ddraw/surface_main.c 1.1 1.2 +1 -1 wine/dlls/ddraw/opengl_utils.c 1.3 1.4 +2 -2 wine/dlls/ddraw/light.c 1.2 1.3 +3 -3 wine/dlls/ddraw/executebuffer.c 1.10 1.11 +4 -4 wine/dlls/ddraw/device_opengl.c 1.3 1.4 +3 -3 wine/dlls/ddraw/device_main.c 1.11 1.12 +2 -2 wine/dlls/ddraw/ddraw_main.c 1.12 1.13 +3 -3 wine/dlls/d3d9/vertexshader.c 1.23 1.24 +2 -2 wine/dlls/d3d9/directx.c 1.32 1.33 +4 -4 wine/dlls/d3d9/device.c 1.21 1.22 +1 -1 wine/dlls/d3d8/texture.c 1.18 1.19 +1 -1 wine/dlls/d3d8/stateblock.c 1.35 1.36 +8 -8 wine/dlls/d3d8/shader.c 1.94 1.95 +1 -1 wine/dlls/d3d8/directx.c 1.132 1.133 +1 -1 wine/dlls/d3d8/device.c 1.20 1.21 +1 -1 wine/dlls/d3d8/cubetexture.c 1.17 1.18 +2 -2 wine/dlls/commdlg/filetitle.c 1.177 1.178 +1 -1 wine/dlls/comctl32/treeview.c 1.436 1.437 +1 -1 wine/dlls/comctl32/listview.c 1.85 1.86 +1 -1 wine/dlls/comctl32/comboex.c 1.115 1.116 +1 -1 wine/dlls/advapi32/security.c

1 0

wine/ tools/sfnt2fnt.c dlls/winmm/wineoss/mmau ...
by Alexandre Julliard 10 Nov '05

10 Nov '05

ChangeSet ID: 21215 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/10 05:39:08 Modified files: tools : sfnt2fnt.c dlls/winmm/wineoss: mmaux.c dlls/wined3d : vertexshader.c surface.c directx.c dlls/user : exticon.c dlls/secur32 : dispatcher.c dlls/oleaut32 : olepicture.c dlls/msxml3/tests: domdoc.c dlls/msi/tests : package.c dlls/msi : package.c dlls/dxerr9 : errors.awk dlls/dxerr8 : errors.awk dlls/comctl32 : listview.c Log message: Francois Gouget <fgouget(a)free.fr> Assorted spelling and case fixes. Patch: http://cvs.winehq.org/patch.py?id=21215 Old revision New revision Changes Path 1.12 1.13 +1 -1 wine/tools/sfnt2fnt.c 1.13 1.14 +1 -1 wine/dlls/winmm/wineoss/mmaux.c 1.14 1.15 +1 -1 wine/dlls/wined3d/vertexshader.c 1.28 1.29 +3 -3 wine/dlls/wined3d/surface.c 1.60 1.61 +2 -2 wine/dlls/wined3d/directx.c 1.38 1.39 +1 -1 wine/dlls/user/exticon.c 1.1 1.2 +1 -1 wine/dlls/secur32/dispatcher.c 1.69 1.70 +1 -1 wine/dlls/oleaut32/olepicture.c 1.10 1.11 +1 -1 wine/dlls/msxml3/tests/domdoc.c 1.9 1.10 +1 -1 wine/dlls/msi/tests/package.c 1.64 1.65 +1 -1 wine/dlls/msi/package.c 1.4 1.5 +1 -1 wine/dlls/dxerr9/errors.awk 1.4 1.5 +1 -1 wine/dlls/dxerr8/errors.awk 1.435 1.436 +1 -1 wine/dlls/comctl32/listview.c

1 0

wine/dlls/advpack/tests advpack.c
by Alexandre Julliard 10 Nov '05

10 Nov '05

ChangeSet ID: 21214 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/10 05:37:03 Modified files: dlls/advpack/tests: advpack.c Log message: Saulius Krasuckas <saulius.krasuckas(a)ieee.org> WinME fixes: - don't fail on WriteFile(), - add valid error codes, - empty buffer to avoid printing garbage, - remove bogus inf-file which TranslateInfString() creates here. Patch: http://cvs.winehq.org/patch.py?id=21214 Old revision New revision Changes Path 1.6 1.7 +17 -5 wine/dlls/advpack/tests/advpack.c Index: wine/dlls/advpack/tests/advpack.c diff -u -p wine/dlls/advpack/tests/advpack.c:1.6 wine/dlls/advpack/tests/advpack.c:1.7 --- wine/dlls/advpack/tests/advpack.c:1.6 10 Nov 2005 11:37: 3 -0000 +++ wine/dlls/advpack/tests/advpack.c 10 Nov 2005 11:37: 3 -0000 @@ -129,6 +129,7 @@ static void create_inf_file() { char data[1024]; char *ptr = data; + DWORD dwNumberOfBytesWritten; HANDLE hf = CreateFile("c:\\test.inf", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); @@ -150,7 +151,7 @@ static void create_inf_file() append_str(&ptr, "DefaultAppPath=\"Application Name\"\n"); append_str(&ptr, "LProgramF=\"Program Files\"\n"); - WriteFile(hf, data, ptr - data, NULL, NULL); + WriteFile(hf, data, ptr - data, &dwNumberOfBytesWritten, NULL); CloseHandle(hf); } @@ -169,36 +170,46 @@ static void translateinfstring_test() /* try to open an inf file that doesn't exist */ hr = pTranslateInfString("c:\\a.inf", "Options.NTx86", "Options.NTx86", "InstallDir", buffer, MAX_PATH, &dwSize, NULL); - ok(hr == 0x80070002, "Expected 0x80070002, got 0x%08x\n", (UINT)hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || hr == E_INVALIDARG, + "Expected 0x80070002 or E_INVALIDARG, got 0x%08x\n", (UINT)hr); /* try a nonexistent section */ + buffer[0] = 0; hr = pTranslateInfString("c:\\test.inf", "idontexist", "Options.NTx86", "InstallDir", buffer, MAX_PATH, &dwSize, NULL); ok(hr == S_OK, "Expected S_OK, got 0x%08x\n", (UINT)hr); ok(!strcmp(buffer, TEST_STRING2), "Expected %s, got %s\n", TEST_STRING2, buffer); ok(dwSize == 25, "Expected size 25, got %ld\n", dwSize); + buffer[0] = 0; /* try other nonexistent section */ hr = pTranslateInfString("c:\\test.inf", "Options.NTx86", "idontexist", "InstallDir", buffer, MAX_PATH, &dwSize, NULL); - ok(hr == SPAPI_E_LINE_NOT_FOUND, "Expected SPAPI_E_LINE_NOT_FOUND, got 0x%08x\n", (UINT)hr); + ok(hr == SPAPI_E_LINE_NOT_FOUND || hr == E_INVALIDARG, + "Expected SPAPI_E_LINE_NOT_FOUND or E_INVALIDARG, got 0x%08x\n", (UINT)hr); + buffer[0] = 0; /* try nonexistent key */ hr = pTranslateInfString("c:\\test.inf", "Options.NTx86", "Options.NTx86", "notvalid", buffer, MAX_PATH, &dwSize, NULL); - ok(hr == SPAPI_E_LINE_NOT_FOUND, "Expected SPAPI_E_LINE_NOT_FOUND, got 0x%08x\n", (UINT)hr); + ok(hr == SPAPI_E_LINE_NOT_FOUND || hr == E_INVALIDARG, + "Expected SPAPI_E_LINE_NOT_FOUND or E_INVALIDARG, got 0x%08x\n", (UINT)hr); + buffer[0] = 0; /* test the behavior of pszInstallSection */ hr = pTranslateInfString("c:\\test.inf", "section", "Options.NTx86", "InstallDir", buffer, MAX_PATH, &dwSize, NULL); - ok(hr == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got 0x%08x\n", (UINT)hr); + ok(hr == ERROR_SUCCESS || hr == E_FAIL, + "Expected ERROR_SUCCESS or E_FAIL, got 0x%08x\n", (UINT)hr); + if(hr == ERROR_SUCCESS) todo_wine { ok(!strcmp(buffer, TEST_STRING1), "Expected %s, got %s\n", TEST_STRING1, buffer); ok(dwSize == 34, "Expected size 34, got %ld\n", dwSize); } + buffer[0] = 0; /* try without a pszInstallSection */ hr = pTranslateInfString("c:\\test.inf", NULL, "Options.NTx86", "InstallDir", buffer, MAX_PATH, &dwSize, NULL); @@ -206,6 +217,7 @@ static void translateinfstring_test() ok(!strcmp(buffer, TEST_STRING2), "Expected %s, got %s\n", TEST_STRING2, buffer); ok(dwSize == 25, "Expected size 25, got %ld\n", dwSize); + DeleteFile("c:\\a.inf"); DeleteFile("c:\\test.inf"); }

1 0

wine/tools c2man.pl
by Alexandre Julliard 10 Nov '05

10 Nov '05

ChangeSet ID: 21213 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/10 05:36:44 Modified files: tools : c2man.pl Log message: Markus Amsler <markus.amsler(a)oribi.org> Make parameter higlighting regex less "hungry". Patch: http://cvs.winehq.org/patch.py?id=21213 Old revision New revision Changes Path 1.22 1.23 +1 -1 wine/tools/c2man.pl Index: wine/tools/c2man.pl diff -u -p wine/tools/c2man.pl:1.22 wine/tools/c2man.pl:1.23 --- wine/tools/c2man.pl:1.22 10 Nov 2005 11:36:44 -0000 +++ wine/tools/c2man.pl 10 Nov 2005 11:36:44 -0000 @@ -1721,7 +1721,7 @@ sub output_api_comment($) # Format parameter names where they appear in the comment for my $parameter_name (@parameter_names) { - s/(^|[ \.\,$\-\*])($parameter_name)($|[ \.$\,\-\=\/])/$1$fmt[8]$2$fmt[9]$3/g; + s/(^|[ \.\,$\-\*])($parameter_name)($|[ \.$\,\-\/]|(\=[^"]))/$1$fmt[8]$2$fmt[9]$3/g; } # Structure dereferences include the dereferenced member s/(\-\>[A-Za-z_]+)/$fmt[8]$1$fmt[9]/g;

1 0

wine/programs/winemenubuilder winemenubuilder.c
by Alexandre Julliard 10 Nov '05

10 Nov '05

ChangeSet ID: 21212 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/10 05:36:26 Modified files: programs/winemenubuilder: winemenubuilder.c Log message: Francois Gouget <fgouget(a)codeweavers.com> Parse the command line returned by CommandLineFromMsiDescriptor() to extract the application path. Otherwise winemenubuilder ignores the .lnk file entirely. Patch: http://cvs.winehq.org/patch.py?id=21212 Old revision New revision Changes Path 1.36 1.37 +91 -7 wine/programs/winemenubuilder/winemenubuilder.c Index: wine/programs/winemenubuilder/winemenubuilder.c diff -u -p wine/programs/winemenubuilder/winemenubuilder.c:1.36 wine/programs/winemenubuilder/winemenubuilder.c:1.37 --- wine/programs/winemenubuilder/winemenubuilder.c:1.36 10 Nov 2005 11:36:26 -0000 +++ wine/programs/winemenubuilder/winemenubuilder.c 10 Nov 2005 11:36:26 -0000 @@ -728,16 +728,22 @@ static BOOL GetLinkLocation( LPCWSTR lin } /* gets the target path directly or through MSI */ -static HRESULT get_path( IShellLinkW *sl, LPWSTR szPath, DWORD sz ) +static HRESULT get_cmdline( IShellLinkW *sl, LPWSTR szPath, DWORD pathSize, + LPWSTR szArgs, DWORD argsSize) { IShellLinkDataList *dl = NULL; EXP_DARWIN_LINK *dar = NULL; HRESULT hr; szPath[0] = 0; - hr = IShellLinkW_GetPath( sl, szPath, MAX_PATH, NULL, SLGP_RAWPATH ); + szArgs[0] = 0; + + hr = IShellLinkW_GetPath( sl, szPath, pathSize, NULL, SLGP_RAWPATH ); if (hr == S_OK && szPath[0]) + { + IShellLinkW_GetArguments( sl, szArgs, argsSize ); return hr; + } hr = IShellLinkW_QueryInterface( sl, &IID_IShellLinkDataList, (LPVOID*) &dl ); if (FAILED(hr)) @@ -746,7 +752,88 @@ static HRESULT get_path( IShellLinkW *sl hr = IShellLinkDataList_CopyDataBlock( dl, EXP_DARWIN_ID_SIG, (LPVOID*) &dar ); if (SUCCEEDED(hr)) { - CommandLineFromMsiDescriptor( dar->szwDarwinID, szPath, &sz ); + WCHAR* szCmdline; + DWORD cmdSize; + + cmdSize=0; + hr = CommandLineFromMsiDescriptor( dar->szwDarwinID, NULL, &cmdSize ); + if (hr == ERROR_SUCCESS) + { + cmdSize++; + szCmdline = HeapAlloc( GetProcessHeap(), 0, cmdSize*sizeof(WCHAR) ); + hr = CommandLineFromMsiDescriptor( dar->szwDarwinID, szCmdline, &cmdSize ); + WINE_TRACE(" command : %s\n", wine_dbgstr_w(szCmdline)); + if (hr == ERROR_SUCCESS) + { + WCHAR *s, *d; + int bcount, in_quotes; + + /* Extract the application path */ + bcount=0; + in_quotes=0; + s=szCmdline; + d=szPath; + while (*s) + { + if ((*s==0x0009 || *s==0x0020) && !in_quotes) + { + /* skip the remaining spaces */ + do { + s++; + } while (*s==0x0009 || *s==0x0020); + break; + } + else if (*s==0x005c) + { + /* '\\' */ + *d++=*s++; + bcount++; + } + else if (*s==0x0022) + { + /* '"' */ + if ((bcount & 1)==0) + { + /* Preceded by an even number of '\', this is + * half that number of '\', plus a quote which + * we erase. + */ + d-=bcount/2; + in_quotes=!in_quotes; + s++; + } + else + { + /* Preceded by an odd number of '\', this is + * half that number of '\' followed by a '"' + */ + d=d-bcount/2-1; + *d++='"'; + s++; + } + bcount=0; + } + else + { + /* a regular character */ + *d++=*s++; + bcount=0; + } + if ((d-szPath) == pathSize) + { + /* Keep processing the path till we get to the + * arguments, but 'stand still' + */ + d--; + } + } + /* Close the application path */ + *d=0; + + lstrcpynW(szArgs, s, argsSize); + } + HeapFree( GetProcessHeap(), 0, szCmdline ); + } LocalFree( dar ); } @@ -788,11 +875,8 @@ static BOOL InvokeShellLinker( IShellLin IShellLinkW_GetDescription( sl, szDescription, INFOTIPSIZE ); WINE_TRACE("description: %s\n", wine_dbgstr_w(szDescription)); - get_path( sl, szPath, MAX_PATH ); + get_cmdline( sl, szPath, MAX_PATH, szArgs, INFOTIPSIZE); WINE_TRACE("path : %s\n", wine_dbgstr_w(szPath)); - - szArgs[0] = 0; - IShellLinkW_GetArguments( sl, szArgs, INFOTIPSIZE ); WINE_TRACE("args : %s\n", wine_dbgstr_w(szArgs)); szIconPath[0] = 0;

1 0

wine/dlls user/tests/msg.c setupapi/tests/pars ...
by Alexandre Julliard 10 Nov '05

10 Nov '05

ChangeSet ID: 21211 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/10 05:17:38 Modified files: dlls/user/tests: msg.c dlls/setupapi/tests: parser.c dlls/msxml3/tests: domdoc.c dlls/kernel/tests: thread.c dlls/d3d9 : device.c dlls/comctl32/tests: toolbar.c Log message: Francois Gouget <fgouget(a)free.fr> Add trailing '\n's to ok() and TRACE() calls. Patch: http://cvs.winehq.org/patch.py?id=21211 Old revision New revision Changes Path 1.101 1.102 +2 -2 wine/dlls/user/tests/msg.c 1.1 1.2 +3 -3 wine/dlls/setupapi/tests/parser.c 1.9 1.10 +3 -3 wine/dlls/msxml3/tests/domdoc.c 1.28 1.29 +2 -2 wine/dlls/kernel/tests/thread.c 1.31 1.32 +1 -1 wine/dlls/d3d9/device.c 1.1 1.2 +1 -1 wine/dlls/comctl32/tests/toolbar.c Index: wine/dlls/user/tests/msg.c diff -u -p wine/dlls/user/tests/msg.c:1.101 wine/dlls/user/tests/msg.c:1.102 --- wine/dlls/user/tests/msg.c:1.101 10 Nov 2005 11:17:38 -0000 +++ wine/dlls/user/tests/msg.c 10 Nov 2005 11:17:38 -0000 @@ -3735,7 +3735,7 @@ static void test_paint_messages(void) */ trace("testing ValidateRect(0, NULL)\n"); SetRectEmpty( &rect ); - ok(ValidateRect(0, &rect), "ValidateRect(0, &rc) should not fail"); + ok(ValidateRect(0, &rect), "ValidateRect(0, &rc) should not fail\n"); check_update_rgn( hwnd, hrgn ); ok_sequence( WmInvalidateErase, "InvalidateErase", FALSE ); while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessage( &msg ); @@ -3753,7 +3753,7 @@ static void test_paint_messages(void) trace("testing ValidateRgn(0, NULL)\n"); SetLastError(0xdeadbeef); - ok(!ValidateRgn(0, NULL), "ValidateRgn(0, NULL) should fail"); + ok(!ValidateRgn(0, NULL), "ValidateRgn(0, NULL) should fail\n"); ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE, "wrong error code %ld\n", GetLastError()); check_update_rgn( hwnd, 0 ); while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessage( &msg ); Index: wine/dlls/setupapi/tests/parser.c diff -u -p wine/dlls/setupapi/tests/parser.c:1.1 wine/dlls/setupapi/tests/parser.c:1.2 --- wine/dlls/setupapi/tests/parser.c:1.1 10 Nov 2005 11:17:38 -0000 +++ wine/dlls/setupapi/tests/parser.c 10 Nov 2005 11:17:38 -0000 @@ -218,13 +218,13 @@ static void test_section_names(void) trace( "hinf=%p ret=%ld err=%lx\n", hinf, ret, err ); if (ret != -1) { - ok( !section_names[i].error, "line %u: section name %s found", + ok( !section_names[i].error, "line %u: section name %s found\n", i, section_names[i].section ); - ok( !err, "line %u: bad error code %lx", i, err ); + ok( !err, "line %u: bad error code %lx\n", i, err ); } else { - ok( section_names[i].error, "line %u: section name %s not found", + ok( section_names[i].error, "line %u: section name %s not found\n", i, section_names[i].section ); ok( err == section_names[i].error, "line %u: bad error %lx/%lx\n", i, err, section_names[i].error ); Index: wine/dlls/msxml3/tests/domdoc.c diff -u -p wine/dlls/msxml3/tests/domdoc.c:1.9 wine/dlls/msxml3/tests/domdoc.c:1.10 --- wine/dlls/msxml3/tests/domdoc.c:1.9 10 Nov 2005 11:17:39 -0000 +++ wine/dlls/msxml3/tests/domdoc.c 10 Nov 2005 11:17:39 -0000 @@ -157,7 +157,7 @@ void test_domdoc( void ) /* check if nodename is correct */ r = IXMLDOMDocument_get_nodeName( doc, NULL ); - ok ( r == E_INVALIDARG, "get_nodeName (NULL) wrong code"); + ok ( r == E_INVALIDARG, "get_nodeName (NULL) wrong code\n"); /* content doesn't matter here */ str = SysAllocString( szNonExistentFile ); @@ -307,7 +307,7 @@ void test_domnode( void ) /* check if nodename is correct */ r = IXMLDOMElement_get_nodeName( element, NULL ); - ok ( r == E_INVALIDARG, "get_nodeName (NULL) wrong code"); + ok ( r == E_INVALIDARG, "get_nodeName (NULL) wrong code\n"); /* content doesn't matter here */ str = SysAllocString( szNonExistentFile ); @@ -358,7 +358,7 @@ void test_domnode( void ) ok ( node != NULL, "should be attribute\n"); r = IXMLDOMNode_get_nodeName( node, NULL ); - ok ( r == E_INVALIDARG, "get_nodeName (NULL) wrong code"); + ok ( r == E_INVALIDARG, "get_nodeName (NULL) wrong code\n"); /* content doesn't matter here */ str = SysAllocString( szNonExistentFile ); Index: wine/dlls/kernel/tests/thread.c diff -u -p wine/dlls/kernel/tests/thread.c:1.28 wine/dlls/kernel/tests/thread.c:1.29 --- wine/dlls/kernel/tests/thread.c:1.28 10 Nov 2005 11:17:39 -0000 +++ wine/dlls/kernel/tests/thread.c 10 Nov 2005 11:17:39 -0000 @@ -236,7 +236,7 @@ static VOID test_CreateThread_basic(void thread[0] = CreateThread(NULL,0,threadFunc2,NULL,0,NULL); GLE = GetLastError(); if (thread[0]) { /* NT */ - ok(GLE==0xFACEaBAD, "CreateThread set last error to %ld, expected 4207848365", GLE); + ok(GLE==0xFACEaBAD, "CreateThread set last error to %ld, expected 4207848365\n", GLE); ret = WaitForSingleObject(thread[0],100); ok(ret==WAIT_OBJECT_0, "threadFunc2 did not exit during 100 ms\n"); ret = GetExitCodeThread(thread[0],&exitCode); @@ -245,7 +245,7 @@ static VOID test_CreateThread_basic(void ok(CloseHandle(thread[0])!=0,"Error closing thread handle\n"); } else { /* 9x */ - ok(GLE==ERROR_INVALID_PARAMETER, "CreateThread set last error to %ld, expected 87", GLE); + ok(GLE==ERROR_INVALID_PARAMETER, "CreateThread set last error to %ld, expected 87\n", GLE); } } Index: wine/dlls/d3d9/device.c diff -u -p wine/dlls/d3d9/device.c:1.31 wine/dlls/d3d9/device.c:1.32 --- wine/dlls/d3d9/device.c:1.31 10 Nov 2005 11:17:39 -0000 +++ wine/dlls/d3d9/device.c 10 Nov 2005 11:17:39 -0000 @@ -104,7 +104,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_Ge FIXME("Call to IWineD3DDevice_GetDirect3D failed\n"); *ppD3D9 = NULL; } - TRACE("(%p) returning %p\b",This , *ppD3D9); + TRACE("(%p) returning %p\n", This, *ppD3D9); return hr; } Index: wine/dlls/comctl32/tests/toolbar.c diff -u -p wine/dlls/comctl32/tests/toolbar.c:1.1 wine/dlls/comctl32/tests/toolbar.c:1.2 --- wine/dlls/comctl32/tests/toolbar.c:1.1 10 Nov 2005 11:17:39 -0000 +++ wine/dlls/comctl32/tests/toolbar.c 10 Nov 2005 11:17:39 -0000 @@ -59,7 +59,7 @@ static LRESULT CALLBACK MyWndProc(HWND h 0, NULL, (UINT)0, buttons, sizeof(buttons)/sizeof(buttons[0]), 0, 0, 20, 16, sizeof(TBBUTTON)); - ok(hToolbar != NULL, "Toolbar creation"); + ok(hToolbar != NULL, "Toolbar creation\n"); SendMessage(hToolbar, TB_ADDSTRINGA, 0, (LPARAM)"test\000");

1 0