December 2011 - Wine-commits

Alexandre Julliard : gdi32: Pass a brush_pattern structure to the SelectBrush entry point.
by Alexandre Julliard 30 Dec '11

30 Dec '11

Module: wine Branch: master Commit: f85bb3528047fc3a5fd2291dea9e21ed72b8a843 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f85bb3528047fc3a5fd2291de… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 29 19:49:41 2011 +0100 gdi32: Pass a brush_pattern structure to the SelectBrush entry point. --- dlls/gdi32/brush.c | 19 +++++++------------ dlls/gdi32/dibdrv/dibdrv.h | 8 ++------ dlls/gdi32/dibdrv/objects.c | 28 ++++++++++++---------------- dlls/gdi32/driver.c | 3 +-- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 3 +-- dlls/gdi32/enhmfdrv/objects.c | 3 +-- dlls/gdi32/gdi_private.h | 8 -------- dlls/gdi32/mfdrv/metafiledrv.h | 3 +-- dlls/gdi32/mfdrv/objects.c | 3 +-- dlls/wineps.drv/brush.c | 11 ++++------- dlls/wineps.drv/psdrv.h | 11 ++++------- dlls/winex11.drv/brush.c | 14 ++++++++------ dlls/winex11.drv/x11drv.h | 5 ++--- dlls/winex11.drv/xrender.c | 11 ++++++----- include/wine/gdi_driver.h | 12 ++++++++++-- 15 files changed, 60 insertions(+), 82 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f85bb3528047fc3a5fd22…

1 0

Alexandre Julliard : gdi32: Pass a brush_pattern structure to the SelectPen entry point for brushed pens .
by Alexandre Julliard 30 Dec '11

30 Dec '11

Module: wine Branch: master Commit: cc9836bda02798ba48383acae7acb1e9899cd4b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc9836bda02798ba48383acae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 29 20:16:46 2011 +0100 gdi32: Pass a brush_pattern structure to the SelectPen entry point for brushed pens. --- dlls/gdi32/brush.c | 48 +++++++++++++++---------------- dlls/gdi32/dibdrv/dibdrv.h | 2 +- dlls/gdi32/dibdrv/objects.c | 4 +- dlls/gdi32/driver.c | 2 +- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 2 +- dlls/gdi32/enhmfdrv/objects.c | 2 +- dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/mfdrv/metafiledrv.h | 2 +- dlls/gdi32/mfdrv/objects.c | 2 +- dlls/gdi32/pen.c | 51 ++++++++++++++++++++++++---------- dlls/wineps.drv/pen.c | 2 +- dlls/wineps.drv/psdrv.h | 2 +- dlls/winex11.drv/pen.c | 2 +- dlls/winex11.drv/x11drv.h | 2 +- include/wine/gdi_driver.h | 4 +- 15 files changed, 74 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cc9836bda02798ba48383…

1 0

Stefan Leichter : ntoskrnl.exe: Add stub for IoInitializeRemoveLockEx.
by Alexandre Julliard 29 Dec '11

29 Dec '11

Module: wine Branch: master Commit: 34c49777a3180cd82676f9b79077f8fe8714fc80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34c49777a3180cd82676f9b79… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Thu Dec 29 16:10:23 2011 +0100 ntoskrnl.exe: Add stub for IoInitializeRemoveLockEx. --- dlls/ntoskrnl.exe/ntoskrnl.c | 10 ++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 28 ++++++++++++++++++++++++++++ 3 files changed, 39 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index e6706d8..4f6f493 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1700,6 +1700,16 @@ BOOLEAN WINAPI IoSetThreadHardErrorMode(BOOLEAN EnableHardErrors) return FALSE; } + +/***************************************************** + * IoInitializeRemoveLockEx (NTOSKRNL.EXE.@) + */ +VOID WINAPI IoInitializeRemoveLockEx(PIO_REMOVE_LOCK lock, ULONG tag, + ULONG maxmin, ULONG high, ULONG size) +{ + FIXME("(%p %u %u %u %u) stub\n", lock, tag, maxmin, high, size); +} + /***************************************************** * DllMain */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index a391c81..187439f 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -398,7 +398,7 @@ @ stub IoGetStackLimits @ stub IoGetTopLevelIrp @ stdcall IoInitializeIrp(ptr long long) -@ stub IoInitializeRemoveLockEx +@ stdcall IoInitializeRemoveLockEx(ptr long long long long) @ stdcall IoInitializeTimer(ptr ptr ptr) @ stub IoInvalidateDeviceRelations @ stub IoInvalidateDeviceState diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 356b1f7..3865f7f 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1065,6 +1065,33 @@ typedef enum _MM_SYSTEM_SIZE MmLargeSystem } MM_SYSTEMSIZE; +typedef struct _IO_REMOVE_LOCK_COMMON_BLOCK { + BOOLEAN Removed; + BOOLEAN Reserved[3]; + LONG IoCount; + KEVENT RemoveEvent; +} IO_REMOVE_LOCK_COMMON_BLOCK; + +typedef struct _IO_REMOVE_LOCK_TRACKING_BLOCK *PIO_REMOVE_LOCK_TRACKING_BLOCK; + +typedef struct _IO_REMOVE_LOCK_DBG_BLOCK { + LONG Signature; + LONG HighWatermark; + LONGLONG MaxLockedTicks; + LONG AllocateTag; + LIST_ENTRY LockList; + KSPIN_LOCK Spin; + LONG LowMemoryCount; + ULONG Reserved1[4]; + PVOID Reserved2; + PIO_REMOVE_LOCK_TRACKING_BLOCK Blocks; +} IO_REMOVE_LOCK_DBG_BLOCK; + +typedef struct _IO_REMOVE_LOCK { + IO_REMOVE_LOCK_COMMON_BLOCK Common; + IO_REMOVE_LOCK_DBG_BLOCK Dbg; +} IO_REMOVE_LOCK, *PIO_REMOVE_LOCK; + NTSTATUS WINAPI ObCloseHandle(IN HANDLE handle); #ifdef NONAMELESSUNION @@ -1125,6 +1152,7 @@ NTSTATUS WINAPI IoGetDeviceProperty(PDEVICE_OBJECT,DEVICE_REGISTRY_PROPERTY,ULO PVOID WINAPI IoGetDriverObjectExtension(PDRIVER_OBJECT,PVOID); PDEVICE_OBJECT WINAPI IoGetRelatedDeviceObject(PFILE_OBJECT); void WINAPI IoInitializeIrp(IRP*,USHORT,CCHAR); +VOID WINAPI IoInitializeRemoveLockEx(PIO_REMOVE_LOCK,ULONG,ULONG,ULONG,ULONG); NTSTATUS WINAPI IoWMIRegistrationControl(PDEVICE_OBJECT,ULONG); PKTHREAD WINAPI KeGetCurrentThread(void);

1 0

Alexander E. Patrakov : dsound: Always resample buffers in mixer thread.
by Alexandre Julliard 29 Dec '11

29 Dec '11

Module: wine Branch: master Commit: 663bc476029a3f867c698677f888d778246f4718 URL: http://source.winehq.org/git/wine.git/?a=commit;h=663bc476029a3f867c698677f… Author: Alexander E. Patrakov <patrakov(a)gmail.com> Date: Fri Nov 4 12:02:23 2011 +0600 dsound: Always resample buffers in mixer thread. --- dlls/dsound/buffer.c | 10 ------ dlls/dsound/dsound_main.c | 4 -- dlls/dsound/dsound_private.h | 6 +-- dlls/dsound/mixer.c | 67 +++++++++--------------------------------- dlls/dsound/primary.c | 1 - dlls/dsound/sound3d.c | 1 - 6 files changed, 16 insertions(+), 73 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=663bc476029a3f867c698…

1 0

André Hentschel : comctl32: Also free pszHeaderTitle and pszHeaderSubTitle in DestroyPropertySheetPage .
by Alexandre Julliard 29 Dec '11

29 Dec '11

Module: wine Branch: master Commit: 9e0517ac6dea9e171564a2d4ae4cb868bdf76e3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e0517ac6dea9e171564a2d4a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Dec 29 02:51:18 2011 +0100 comctl32: Also free pszHeaderTitle and pszHeaderSubTitle in DestroyPropertySheetPage. --- dlls/comctl32/propsheet.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index e6d2d30..6f620c6 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -3063,6 +3063,12 @@ BOOL WINAPI DestroyPropertySheetPage(HPROPSHEETPAGE hPropPage) if ((psp->dwFlags & PSP_USETITLE) && !IS_INTRESOURCE( psp->pszTitle )) Free ((LPVOID)psp->pszTitle); + if ((psp->dwFlags & PSP_USEHEADERTITLE) && !IS_INTRESOURCE( psp->pszHeaderTitle )) + Free ((LPVOID)psp->pszHeaderTitle); + + if ((psp->dwFlags & PSP_USEHEADERSUBTITLE) && !IS_INTRESOURCE( psp->pszHeaderSubTitle )) + Free ((LPVOID)psp->pszHeaderSubTitle); + Free(hPropPage); return TRUE;

1 0

André Hentschel : cscript: Add forwarder to wscript.
by Alexandre Julliard 29 Dec '11

29 Dec '11

Module: wine Branch: master Commit: 07ed25c2f038ec9e1b09e8a24a0a291047cc5079 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07ed25c2f038ec9e1b09e8a24… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Dec 28 16:08:26 2011 +0100 cscript: Add forwarder to wscript. --- configure | 1 + configure.ac | 1 + programs/cscript/Makefile.in | 8 +++++ programs/cscript/main.c | 61 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 71 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 804487f..bcc8105 100755 --- a/configure +++ b/configure @@ -15430,6 +15430,7 @@ wine_fn_config_program clock enable_clock install,po wine_fn_config_program cmd enable_cmd install,po wine_fn_config_test programs/cmd/tests cmd.exe_test wine_fn_config_program control enable_control install +wine_fn_config_program cscript enable_cscript install wine_fn_config_program dxdiag enable_dxdiag install,po wine_fn_config_program eject enable_eject install wine_fn_config_program expand enable_expand install diff --git a/configure.ac b/configure.ac index 1a7b56f..279339c 100644 --- a/configure.ac +++ b/configure.ac @@ -2939,6 +2939,7 @@ WINE_CONFIG_PROGRAM(clock,,[install,po]) WINE_CONFIG_PROGRAM(cmd,,[install,po]) WINE_CONFIG_TEST(programs/cmd/tests) WINE_CONFIG_PROGRAM(control,,[install]) +WINE_CONFIG_PROGRAM(cscript,,[install]) WINE_CONFIG_PROGRAM(dxdiag,,[install,po]) WINE_CONFIG_PROGRAM(eject,,[install]) WINE_CONFIG_PROGRAM(expand,,[install]) diff --git a/programs/cscript/Makefile.in b/programs/cscript/Makefile.in new file mode 100644 index 0000000..b738a30 --- /dev/null +++ b/programs/cscript/Makefile.in @@ -0,0 +1,8 @@ +EXTRADEFS = -DWINE_NO_UNICODE_MACROS +MODULE = cscript.exe +APPMODE = -mwindows -municode + +C_SRCS = \ + main.c + +(a)MAKE_PROG_RULES@ diff --git a/programs/cscript/main.c b/programs/cscript/main.c new file mode 100644 index 0000000..f326260 --- /dev/null +++ b/programs/cscript/main.c @@ -0,0 +1,61 @@ +/* + * CSCRIPT Implementation + * + * Copyright 2011 André Hentschel + * + * 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 + */ + +#define WIN32_LEAN_AND_MEAN +#include <stdio.h> +#include <windows.h> +#include <winbase.h> + +#include <wine/debug.h> +#include <wine/unicode.h> + +WINE_DEFAULT_DEBUG_CHANNEL(cscript); + +int WINAPI wWinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPWSTR cmdline, int cmdshow) +{ + static const WCHAR wscriptW[] = {'\\','w','s','c','r','i','p','t','.','e','x','e',0}; + static const WCHAR parbW[] = {' ','/','B',' ',0}; + WCHAR app[MAX_PATH]; + WCHAR cmd[MAX_PATH]; + PROCESS_INFORMATION pi; + BOOL ret; + DWORD exitcode; + STARTUPINFOW si = { sizeof(si) }; + + WINE_FIXME("(%p %p %s %x) forwarding to wscript\n", hInst, hPrevInst, wine_dbgstr_w(cmdline), cmdshow); + + GetSystemDirectoryW(app, MAX_PATH); + strcatW(app, wscriptW); + strcpyW(cmd, app); + strcatW(app, parbW); + strcatW(app, cmdline); + + if (!CreateProcessW(app, cmd, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) return 1; + WaitForSingleObject( pi.hProcess, INFINITE ); + + ret = GetExitCodeProcess(pi.hProcess, &exitcode); + CloseHandle( pi.hProcess ); + CloseHandle( pi.hThread ); + + if (ret) + return exitcode; + else + return 1; +}

1 0

André Hentschel : po: Update German translation.
by Alexandre Julliard 29 Dec '11

29 Dec '11

Module: wine Branch: master Commit: eaa8801d16b135b0cee14d0f5bd7f0909a1a7c18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eaa8801d16b135b0cee14d0f5… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Dec 29 17:19:43 2011 +0100 po: Update German translation. --- po/de.po | 145 ++++++++++++++++++++++++++++++------------------------------- 1 files changed, 71 insertions(+), 74 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eaa8801d16b135b0cee14…

1 0

Francois Gouget : notepad: Don' t assign access keys to group box labels or give them trailing punctuation.
by Alexandre Julliard 29 Dec '11

29 Dec '11

1 0

Francois Gouget : taskmgr: Use sentence capitalization for group box labels .
by Alexandre Julliard 29 Dec '11

29 Dec '11

1 0

Piotr Caban : msvcp90: Fix class functions invocation on 64bit systems.
by Alexandre Julliard 29 Dec '11

29 Dec '11

Module: wine Branch: master Commit: c4b8793996bd7c8497ecabffd4eed0849404170a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4b8793996bd7c8497ecabffd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 29 12:44:39 2011 +0100 msvcp90: Fix class functions invocation on 64bit systems. --- dlls/msvcp90/ios.c | 41 ++++---- dlls/msvcp90/locale.c | 142 +++++++++++++---------------- dlls/msvcp90/msvcp90.h | 11 -- dlls/msvcp90/string.c | 237 +++++++++++++++++++++++++----------------------- 4 files changed, 205 insertions(+), 226 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c4b8793996bd7c8497eca…

1 0