wine-commits December 2009

wine-commits@winehq.org

3 participants
1233 discussions

Alexandre Julliard : makefiles: Get rid of all the rules for building old style 16-bit files.
by Alexandre Julliard 31 Dec '09

31 Dec '09

Module: wine Branch: master Commit: c6ae9a3c5a3110319b32a0020047462ccf0ce336 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6ae9a3c5a3110319b32a0020… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 29 12:45:37 2009 +0100 makefiles: Get rid of all the rules for building old style 16-bit files. --- Make.rules.in | 7 +---- configure | 8 ------- configure.ac | 4 --- dlls/Makedll.rules.in | 17 +++++--------- dlls/Makefile.in | 21 +----------------- tools/make_makefiles | 55 ++++++------------------------------------------ 6 files changed, 17 insertions(+), 95 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c6ae9a3c5a3110319b32a…

1 0

Alexandre Julliard : winedos: Move 16-bit VxD support back into kernel.
by Alexandre Julliard 31 Dec '09

31 Dec '09

Module: wine Branch: master Commit: e7715126eb8ab561c592af0c160ca199c6d7f61a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7715126eb8ab561c592af0c1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 29 12:32:36 2009 +0100 winedos: Move 16-bit VxD support back into kernel. --- .gitignore | 1 - dlls/Makefile.in | 5 +- dlls/krnl386.exe16/kernel16_private.h | 39 + dlls/krnl386.exe16/krnl386.exe16.spec | 20 +- dlls/krnl386.exe16/vxd.c | 1636 ++++++++++++++++++++++++++++++++ dlls/winedos/Makefile.in | 3 - dlls/winedos/int2f.c | 7 +- dlls/winedos/vxd.c | 1682 --------------------------------- 8 files changed, 1698 insertions(+), 1695 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e7715126eb8ab561c592a…

1 0

Alexandre Julliard : kernel32: Make krnl386. exe into a stand-alone 16-bit module.
by Alexandre Julliard 31 Dec '09

31 Dec '09

Module: wine Branch: master Commit: 475b7d226cc062524495268825c3028c2797174d URL: http://source.winehq.org/git/wine.git/?a=commit;h=475b7d226cc06252449526882… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 29 16:24:00 2009 +0100 kernel32: Make krnl386.exe into a stand-alone 16-bit module. --- .gitignore | 1 - configure | 9 + configure.ac | 1 + dlls/Makefile.in | 4 - dlls/kernel32/Makefile.in | 42 +-- dlls/kernel32/file.c | 17 +- dlls/kernel32/kernel32.spec | 462 ++++++++++---------- dlls/kernel32/kernel_main.c | 42 +-- dlls/kernel32/kernel_private.h | 5 - dlls/kernel32/module.c | 25 + dlls/krnl386.exe16/Makefile.in | 42 ++ dlls/{kernel32/atom16.c => krnl386.exe16/atom.c} | 0 dlls/{kernel32 => krnl386.exe16}/dosmem.c | 0 dlls/{kernel32/error16.c => krnl386.exe16/error.c} | 0 dlls/{kernel32/file16.c => krnl386.exe16/file.c} | 0 .../global16.c => krnl386.exe16/global.c} | 0 dlls/{kernel32 => krnl386.exe16}/instr.c | 4 - .../kernel16.c => krnl386.exe16/kernel.c} | 51 +++ .../{kernel32 => krnl386.exe16}/kernel16_private.h | 2 - .../krnl386.exe16.spec} | 204 +++++++++ dlls/{kernel32/local16.c => krnl386.exe16/local.c} | 0 dlls/{kernel32 => krnl386.exe16}/ne_module.c | 6 - dlls/{kernel32 => krnl386.exe16}/ne_segment.c | 0 .../registry16.c => krnl386.exe16/registry.c} | 0 dlls/{kernel32/relay16.c => krnl386.exe16/relay.c} | 0 .../resource16.c => krnl386.exe16/resource.c} | 0 dlls/{kernel32 => krnl386.exe16}/selector.c | 5 - dlls/{kernel32/snoop16.c => krnl386.exe16/snoop.c} | 12 - dlls/{kernel32 => krnl386.exe16}/syslevel.c | 2 - dlls/{kernel32 => krnl386.exe16}/task.c | 0 dlls/{kernel32 => krnl386.exe16}/thunk.c | 4 - dlls/{kernel32 => krnl386.exe16}/utthunk.c | 4 - .../version16.rc => krnl386.exe16/version.rc} | 0 dlls/{kernel32 => krnl386.exe16}/vxd.c | 10 +- dlls/{kernel32 => krnl386.exe16}/wowthunk.c | 17 - 35 files changed, 582 insertions(+), 389 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=475b7d226cc0625244952…

1 0

Alexandre Julliard : shell32: Move the RunDLL_CallEntry16 implementation to shell.dll.
by Alexandre Julliard 31 Dec '09

31 Dec '09

Module: wine Branch: master Commit: 89df78e2c00e4b6964c15611d7fa80c2797f3e43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89df78e2c00e4b6964c15611d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 30 17:29:06 2009 +0100 shell32: Move the RunDLL_CallEntry16 implementation to shell.dll. --- dlls/shell.dll16/shell.c | 25 +++++++++++++++++++++++++ dlls/shell.dll16/shell.dll16.spec | 4 ++++ dlls/shell32/control.c | 28 ---------------------------- dlls/shell32/shell32.spec | 2 +- 4 files changed, 30 insertions(+), 29 deletions(-) diff --git a/dlls/shell.dll16/shell.c b/dlls/shell.dll16/shell.c index 9964b60..b33d3cc 100644 --- a/dlls/shell.dll16/shell.c +++ b/dlls/shell.dll16/shell.c @@ -612,3 +612,28 @@ HINSTANCE16 WINAPI ShellExecute16( HWND16 hWnd, LPCSTR lpOperation, return HINSTANCE_16( WOWShellExecute( HWND_32(hWnd), lpOperation, lpFile, lpParameters, lpDirectory, iShowCmd, SHELL_Execute16 )); } + + +/************************************************************************* + * RunDLL_CallEntry16 + * + * Only exported from shell32 on Windows, probably imported + * from shell through the 16/32 thunks. + */ +void WINAPI RunDLL_CallEntry16( DWORD proc, HWND hwnd, HINSTANCE inst, LPCSTR cmdline, INT cmdshow ) +{ + WORD args[5]; + SEGPTR cmdline_seg; + + TRACE( "proc %x hwnd %p inst %p cmdline %s cmdshow %d\n", + proc, hwnd, inst, debugstr_a(cmdline), cmdshow ); + + cmdline_seg = MapLS( cmdline ); + args[4] = HWND_16(hwnd); + args[3] = MapHModuleLS(inst); + args[2] = SELECTOROF(cmdline_seg); + args[1] = OFFSETOF(cmdline_seg); + args[0] = cmdshow; + WOWCallback16Ex( proc, WCB16_PASCAL, sizeof(args), args, NULL ); + UnMapLS( cmdline_seg ); +} diff --git a/dlls/shell.dll16/shell.dll16.spec b/dlls/shell.dll16/shell.dll16.spec index ac36ec7..df03ace 100644 --- a/dlls/shell.dll16/shell.dll16.spec +++ b/dlls/shell.dll16/shell.dll16.spec @@ -43,3 +43,7 @@ # 402 _RUNDLLCHECKDRIVE #32 WCI + +################################################################ +# Wine extensions: functions needed by shell32 +@ stdcall -arch=win32 RunDLL_CallEntry16(long long ptr str long) diff --git a/dlls/shell32/control.c b/dlls/shell32/control.c index cfea201..730f8a6 100644 --- a/dlls/shell32/control.c +++ b/dlls/shell32/control.c @@ -29,8 +29,6 @@ #include "wingdi.h" #include "winuser.h" #include "winreg.h" -#include "wine/winbase16.h" -#include "wownt32.h" #include "wine/debug.h" #include "cpl.h" #include "wine/unicode.h" @@ -878,32 +876,6 @@ HRESULT WINAPI Control_FillCache_RunDLLA(HWND hWnd, HANDLE hModule, DWORD w, DWO return Control_FillCache_RunDLLW(hWnd, hModule, w, x); } - -/************************************************************************* - * RunDLL_CallEntry16 [SHELL32.122] - * the name is probably wrong - */ -void WINAPI RunDLL_CallEntry16( DWORD proc, HWND hwnd, HINSTANCE inst, - LPCSTR cmdline, INT cmdshow ) -{ -#ifdef __i386__ - WORD args[5]; - SEGPTR cmdline_seg; - - TRACE( "proc %x hwnd %p inst %p cmdline %s cmdshow %d\n", - proc, hwnd, inst, debugstr_a(cmdline), cmdshow ); - - cmdline_seg = MapLS( cmdline ); - args[4] = HWND_16(hwnd); - args[3] = MapHModuleLS(inst); - args[2] = SELECTOROF(cmdline_seg); - args[1] = OFFSETOF(cmdline_seg); - args[0] = cmdshow; - WOWCallback16Ex( proc, WCB16_PASCAL, sizeof(args), args, NULL ); - UnMapLS( cmdline_seg ); -#endif -} - /************************************************************************* * CallCPLEntry16 [SHELL32.166] * diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index f95690c..fc1347e 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -114,7 +114,7 @@ 119 stdcall -noname IsLFNDrive(ptr) IsLFNDriveAW 120 stdcall -noname FileMenu_AbortInitMenu() 121 stdcall -noname SHFlushClipboard() - 122 stdcall -noname RunDLL_CallEntry16(long long long str long) #name wrong? + 122 stdcall -private @(long long long str long) shell.dll16.RunDLL_CallEntry16 123 stdcall -noname SHFreeUnusedLibraries() 124 stdcall -noname FileMenu_AppendFilesForPidl(long ptr long) 125 stdcall -noname FileMenu_AddFilesForPidl(long long long ptr long long ptr)

1 0

Andrew Nguyen : gdi32: Fix a typo in ScaleViewportExtEx.
by Alexandre Julliard 30 Dec '09

30 Dec '09

Module: wine Branch: master Commit: c3e9de0b4c60460daca19eda6de75bc2a15bc93c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3e9de0b4c60460daca19eda6… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Wed Dec 30 09:42:33 2009 -0600 gdi32: Fix a typo in ScaleViewportExtEx. Spotted by Gregor Schneider. --- dlls/gdi32/mapping.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/mapping.c b/dlls/gdi32/mapping.c index e199dd3..35bb1ea 100644 --- a/dlls/gdi32/mapping.c +++ b/dlls/gdi32/mapping.c @@ -424,7 +424,7 @@ BOOL WINAPI ScaleViewportExtEx( HDC hdc, INT xNum, INT xDenom, } if ((dc->MapMode != MM_ISOTROPIC) && (dc->MapMode != MM_ANISOTROPIC)) goto done; - if (!xNum || !xDenom || !xNum || !yDenom) + if (!xNum || !xDenom || !yNum || !yDenom) { ret = FALSE; goto done;

1 0

Steven Edwards : winefile: Replace builtin execute dialog with standard RunFile dialog.
by Alexandre Julliard 30 Dec '09

30 Dec '09

Module: wine Branch: master Commit: d6055a4165491af6ca4c1b4b1f1bfea0e8699cdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6055a4165491af6ca4c1b4b1… Author: Steven Edwards <sedwards(a)bordeauxgroup.com> Date: Mon Dec 28 11:44:20 2009 -0500 winefile: Replace builtin execute dialog with standard RunFile dialog. --- programs/winefile/Cs.rc | 17 +------------- programs/winefile/Da.rc | 17 +------------- programs/winefile/De.rc | 17 +------------- programs/winefile/En.rc | 17 +------------- programs/winefile/Es.rc | 17 +------------- programs/winefile/Fr.rc | 17 +------------- programs/winefile/Hu.rc | 17 +------------- programs/winefile/It.rc | 17 +------------- programs/winefile/Ja.rc | 17 +------------- programs/winefile/Ko.rc | 17 +------------- programs/winefile/Lt.rc | 17 +------------- programs/winefile/Nl.rc | 17 +------------- programs/winefile/No.rc | 17 +------------- programs/winefile/Pl.rc | 17 +------------- programs/winefile/Pt.rc | 22 +----------------- programs/winefile/Ru.rc | 16 +------------ programs/winefile/Si.rc | 17 +------------- programs/winefile/Sv.rc | 17 +------------- programs/winefile/Tr.rc | 17 +------------- programs/winefile/Zh.rc | 34 +--------------------------- programs/winefile/resource.h | 3 +- programs/winefile/winefile.c | 49 ++++++++--------------------------------- 22 files changed, 33 insertions(+), 380 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d6055a4165491af6ca4c1…

1 0

Alexandre Julliard : kernel32: Do not include 16-bit headers in 32-bit files.
by Alexandre Julliard 30 Dec '09

30 Dec '09

Module: wine Branch: master Commit: 8268ed978389662c7b43212e008037cae3ce900e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8268ed978389662c7b43212e0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 28 22:19:31 2009 +0100 kernel32: Do not include 16-bit headers in 32-bit files. --- dlls/kernel32/console.c | 1 - dlls/kernel32/module.c | 3 ++- dlls/kernel32/process.c | 3 +-- dlls/kernel32/resource.c | 7 ------- dlls/kernel32/thread.c | 1 - 5 files changed, 3 insertions(+), 12 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 48bcfa4..42344af 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -44,7 +44,6 @@ #include "winnls.h" #include "winerror.h" #include "wincon.h" -#include "wine/winbase16.h" #include "wine/server.h" #include "wine/exception.h" #include "wine/unicode.h" diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index 2308a10..76e1b0f 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -31,7 +31,6 @@ #endif #include "ntstatus.h" #define WIN32_NO_STATUS -#include "wine/winbase16.h" #include "winerror.h" #include "windef.h" #include "winbase.h" @@ -44,6 +43,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(module); +#define NE_FFLAGS_LIBMODULE 0x8000 + static WCHAR *dll_directory; /* extra path for SetDllDirectoryW */ static CRITICAL_SECTION dlldir_section; diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index eb39f5c..e481e0c 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -43,10 +43,9 @@ #include "ntstatus.h" #define WIN32_NO_STATUS -#include "wine/winbase16.h" -#include "wine/winuser16.h" #include "winternl.h" #include "kernel_private.h" +#include "wine/library.h" #include "wine/server.h" #include "wine/unicode.h" #include "wine/debug.h" diff --git a/dlls/kernel32/resource.c b/dlls/kernel32/resource.c index 8d52397..d364739 100644 --- a/dlls/kernel32/resource.c +++ b/dlls/kernel32/resource.c @@ -39,13 +39,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(resource); -/* handle conversions */ -#define HRSRC_32(h16) ((HRSRC)(ULONG_PTR)(h16)) -#define HRSRC_16(h32) (LOWORD(h32)) -#define HGLOBAL_32(h16) ((HGLOBAL)(ULONG_PTR)(h16)) -#define HGLOBAL_16(h32) (LOWORD(h32)) -#define HMODULE_16(h32) (LOWORD(h32)) - /* retrieve the resource name to pass to the ntdll functions */ static NTSTATUS get_res_nameA( LPCSTR name, UNICODE_STRING *str ) { diff --git a/dlls/kernel32/thread.c b/dlls/kernel32/thread.c index 17339ca..6979c36 100644 --- a/dlls/kernel32/thread.c +++ b/dlls/kernel32/thread.c @@ -35,7 +35,6 @@ #include "winbase.h" #include "winerror.h" #include "winternl.h" -#include "wine/winbase16.h" #include "wine/exception.h" #include "wine/library.h" #include "wine/server.h"

1 0

Christian Costa : mciqtz: Improve MCIQTZ_mciSet traces.
by Alexandre Julliard 30 Dec '09

30 Dec '09

Module: wine Branch: master Commit: 4e3b5b872e472e4f398ef81818fcb1f6e4c165a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e3b5b872e472e4f398ef8181… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Wed Dec 30 11:38:30 2009 +0100 mciqtz: Improve MCIQTZ_mciSet traces. --- dlls/mciqtz32/mciqtz.c | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index 1625a8d..a34caf8 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -436,8 +436,25 @@ static DWORD MCIQTZ_mciSet(UINT wDevID, DWORD dwFlags, LPMCI_DGV_SET_PARMS lpPar } } - if (dwFlags & ~MCI_SET_TIME_FORMAT) - FIXME("Flags not supported yet %08lX\n", dwFlags & ~MCI_SET_TIME_FORMAT); + if (dwFlags & MCI_SET_DOOR_OPEN) + FIXME("MCI_SET_DOOR_OPEN not implemented yet\n"); + if (dwFlags & MCI_SET_DOOR_CLOSED) + FIXME("MCI_SET_DOOR_CLOSED not implemented yet\n"); + if (dwFlags & MCI_SET_AUDIO) + FIXME("MCI_SET_AUDIO not implemented yet\n"); + if (dwFlags & MCI_SET_VIDEO) + FIXME("MCI_SET_VIDEO not implemented yet\n"); + if (dwFlags & MCI_SET_ON) + FIXME("MCI_SET_ON not implemented yet\n"); + if (dwFlags & MCI_SET_OFF) + FIXME("MCI_SET_OFF not implemented yet\n"); + if (dwFlags & MCI_SET_AUDIO_LEFT) + FIXME("MCI_SET_AUDIO_LEFT not implemented yet\n"); + if (dwFlags & MCI_SET_AUDIO_RIGHT) + FIXME("MCI_SET_AUDIO_RIGHT not implemented yet\n"); + + if (dwFlags & ~0x7f03 /* All MCI_SET flags mask */) + ERR("Unknown flags %08x\n", dwFlags & ~0x7f03); return 0; }

1 0

Rob Shearman : shlwapi: Initialise id field of ConPt object in connection point tests.
by Alexandre Julliard 30 Dec '09

30 Dec '09

Module: wine Branch: master Commit: 7da10bca338049857eefa5af3cae7bf43419f105 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7da10bca338049857eefa5af3… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Wed Dec 30 13:15:08 2009 +0000 shlwapi: Initialise id field of ConPt object in connection point tests. --- dlls/shlwapi/tests/ordinal.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 5227ea7..31fced9 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -1095,6 +1095,7 @@ static HRESULT WINAPI Contain_FindConnectionPoint( pt->sinkCount = 0; pt->sink = NULL; pt->container = iface; + pt->id = IID_IDispatch; if (iface->ptCount == 0) iface->pt =HeapAlloc(GetProcessHeap(),0,sizeof(IUnknown*));

1 0

Rob Shearman : ntdll: Fix typo in RTL_ReportRegistryValue which caused a counted string to be passed into QueryFunction which expects a nul-terminated string .
by Alexandre Julliard 30 Dec '09

30 Dec '09

Module: wine Branch: master Commit: 3d0f56fb371f3c983ea0c9ab43fb55274b30015d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d0f56fb371f3c983ea0c9ab4… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Wed Dec 30 13:14:56 2009 +0000 ntdll: Fix typo in RTL_ReportRegistryValue which caused a counted string to be passed into QueryFunction which expects a nul-terminated string. --- dlls/ntdll/reg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index 286dbdb..cb214a7 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -991,7 +991,7 @@ static NTSTATUS RTL_ReportRegistryValue(PKEY_VALUE_FULL_INFORMATION pInfo, if((pQuery->Flags & RTL_QUERY_REGISTRY_NOEXPAND) || (pInfo->Type != REG_EXPAND_SZ && pInfo->Type != REG_MULTI_SZ)) { - status = pQuery->QueryRoutine(pInfo->Name, pInfo->Type, + status = pQuery->QueryRoutine(pQuery->Name, pInfo->Type, ((CHAR*)pInfo) + pInfo->DataOffset, pInfo->DataLength, pContext, pQuery->EntryContext); }

1 0

← Newer
1
2
3
4
5
6
7
...
124
Older →

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 December 2009