September 2006 - Wine-commits

Detlef Riekenberg : localspl: Start implementation of InitializePrintMonitor.
by Alexandre Julliard 28 Sep '06

28 Sep '06

Module: wine Branch: master Commit: 26c5839d61de888882a6732c2f1fc41fd2a5aeff URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=26c5839d61de888882a6732… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Sep 27 23:22:33 2006 +0200 localspl: Start implementation of InitializePrintMonitor. --- dlls/localspl/Makefile.in | 1 + dlls/localspl/localmon.c | 70 +++++++++++++++++++++++++++++++++++++++++ dlls/localspl/localspl_main.c | 11 ------ 3 files changed, 71 insertions(+), 11 deletions(-) diff --git a/dlls/localspl/Makefile.in b/dlls/localspl/Makefile.in index 7d80fb7..0e74179 100644 --- a/dlls/localspl/Makefile.in +++ b/dlls/localspl/Makefile.in @@ -6,6 +6,7 @@ MODULE = localspl.dll IMPORTS = kernel32 C_SRCS = \ + localmon.c \ localspl_main.c @MAKE_DLL_RULES@ diff --git a/dlls/localspl/localmon.c b/dlls/localspl/localmon.c new file mode 100644 index 0000000..6665585 --- /dev/null +++ b/dlls/localspl/localmon.c @@ -0,0 +1,70 @@ +/* + * Implementation of the Local Printmonitor + * + * Copyright 2006 Detlef Riekenberg + * + * 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 + */ + +#include <stdarg.h> + +#define COBJMACROS +#define NONAMELESSUNION + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "winreg.h" +#include "winver.h" +#include "winnls.h" + +#include "winspool.h" +#include "ddk/winsplp.h" + +#include "wine/unicode.h" +#include "wine/debug.h" + + +WINE_DEFAULT_DEBUG_CHANNEL(localspl); + +/***************************************************** + * InitializePrintMonitor (LOCALSPL.@) + * + * Initialize the Monitor for the Local Ports + * + * PARAMS + * regroot [I] Registry-Path, where the settings are stored + * + * RETURNS + * Success: Pointer to a MONITOREX Structure + * Failure: NULL + * + * NOTES + * Native localspl.dll fails, when the Section "Ports" is missing in "win.ini". + * + */ + +LPMONITOREX WINAPI InitializePrintMonitor(LPWSTR regroot) +{ + FIXME("(%s) stub\n", debugstr_w(regroot)); + if (!regroot || !regroot[0]) { + SetLastError(ERROR_INVALID_PARAMETER); + return NULL; + } + + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return NULL; +} diff --git a/dlls/localspl/localspl_main.c b/dlls/localspl/localspl_main.c index 0bc94f6..48d1efb 100644 --- a/dlls/localspl/localspl_main.c +++ b/dlls/localspl/localspl_main.c @@ -58,14 +58,3 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, } return TRUE; } - - -/***************************************************** - * InitializePrintMonitor (LOCALSPL.@) - */ - -LPMONITOREX WINAPI InitializePrintMonitor(LPWSTR regroot) -{ - FIXME("(%s) stub\n", debugstr_w(regroot)); - return NULL; -}

1 0

Marcus Meissner : ntdll: Align stack to 4 bytes.
by Alexandre Julliard 28 Sep '06

28 Sep '06

Module: wine Branch: master Commit: 57a04062fee9a1939adc3955ba555830a533c4e7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=57a04062fee9a1939adc395… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Sep 27 22:10:16 2006 +0200 ntdll: Align stack to 4 bytes. --- dlls/ntdll/signal_i386.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 9a8f197..21d4d24 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -521,7 +521,7 @@ typedef void (WINAPI *raise_func)( EXCEP */ inline static void *init_handler( const SIGCONTEXT *sigcontext, WORD *fs, WORD *gs ) { - void *stack = (void *)ESP_sig(sigcontext); + void *stack = (void *)(ESP_sig(sigcontext) & ~3); TEB *teb = get_current_teb(); struct ntdll_thread_regs *thread_regs = (struct ntdll_thread_regs *)teb->SpareBytes1;

1 0

Andrew Talbot : shdocvw: Cast-qual warnings fix.
by Alexandre Julliard 28 Sep '06

28 Sep '06

Module: wine Branch: master Commit: 906e637748547b5157be51f1266aea29427d8764 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=906e637748547b5157be51f… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed Sep 27 22:46:43 2006 +0100 shdocvw: Cast-qual warnings fix. --- dlls/shdocvw/regsvr.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shdocvw/regsvr.c b/dlls/shdocvw/regsvr.c index ea4fbaa..e9c8e49 100644 --- a/dlls/shdocvw/regsvr.c +++ b/dlls/shdocvw/regsvr.c @@ -314,13 +314,13 @@ static HRESULT register_coclasses(struct &shellfolder_key, NULL); if (res != ERROR_SUCCESS) goto error_close_clsid_key; if (list->flags & SHELLFOLDER_WANTSFORPARSING) - res = RegSetValueExA(shellfolder_key, wfparsing_valuename, 0, REG_SZ, (LPBYTE)"", 1); + res = RegSetValueExA(shellfolder_key, wfparsing_valuename, 0, REG_SZ, (const BYTE *)"", 1); if (list->flags & SHELLFOLDER_ATTRIBUTES) res = RegSetValueExA(shellfolder_key, attributes_valuename, 0, REG_DWORD, - (LPBYTE)&list->dwAttributes, sizeof(DWORD)); + (const BYTE *)&list->dwAttributes, sizeof(DWORD)); if (list->flags & SHELLFOLDER_CALLFORATTRIBUTES) res = RegSetValueExA(shellfolder_key, cfattributes_valuename, 0, REG_DWORD, - (LPBYTE)&list->dwCallForAttributes, sizeof(DWORD)); + (const BYTE *)&list->dwCallForAttributes, sizeof(DWORD)); RegCloseKey(shellfolder_key); if (res != ERROR_SUCCESS) goto error_close_clsid_key; }

1 0

Stefan Dösinger : wined3d: Tell gl about the surface alignment.
by Alexandre Julliard 28 Sep '06

28 Sep '06

Module: wine Branch: master Commit: ab8264a86dea793dc7adde97b619253a7c1a1f6b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ab8264a86dea793dc7adde9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Sep 28 00:12:34 2006 +0200 wined3d: Tell gl about the surface alignment. --- dlls/wined3d/device.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 943a616..9d3b5a0 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1865,6 +1865,12 @@ #endif glXMakeCurrent(object->display, oldDrawable, oldContext); } + /* Set the surface alignment. This never changes, so we are safe to set it once per context*/ + glPixelStorei(GL_PACK_ALIGNMENT, 4); + checkGLcall("glPixelStorei(GL_PACK_ALIGNMENT, 4);"); + glPixelStorei(GL_UNPACK_ALIGNMENT, 4); + checkGLcall("glPixelStorei(GL_UNPACK_ALIGNMENT, 4);"); + LEAVE_GL(); TRACE("Set swapchain to %p\n", object);

1 0

Huw Davies : ole32: Don' t return from CoRegisterClassObject until we have created the named pipe.
by Alexandre Julliard 28 Sep '06

28 Sep '06

Module: wine Branch: master Commit: fead72e8a7a1928c8195815d7ec9b33794f28115 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fead72e8a7a1928c8195815… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Sep 27 16:23:42 2006 +0100 ole32: Don't return from CoRegisterClassObject until we have created the named pipe. Also don't fail if the client connects to the pipe between CreateNamedPipe and ConnectNamedPipe. --- dlls/ole32/rpc.c | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index e7266dc..7646e1d 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -924,6 +924,7 @@ struct local_server_params { CLSID clsid; IStream *stream; + HANDLE ready_event; }; /* FIXME: should call to rpcss instead */ @@ -945,12 +946,14 @@ static DWORD WINAPI local_server_thread( get_localserver_pipe_name(pipefn, &lsp->clsid); - HeapFree(GetProcessHeap(), 0, lsp); - hPipe = CreateNamedPipeW( pipefn, PIPE_ACCESS_DUPLEX, PIPE_TYPE_BYTE|PIPE_WAIT, PIPE_UNLIMITED_INSTANCES, 4096, 4096, 500 /* 0.5 second timeout */, NULL ); - + + SetEvent(lsp->ready_event); + + HeapFree(GetProcessHeap(), 0, lsp); + if (hPipe == INVALID_HANDLE_VALUE) { FIXME("pipe creation failed for %s, le is %ld\n", debugstr_w(pipefn), GetLastError()); @@ -958,7 +961,7 @@ static DWORD WINAPI local_server_thread( } while (1) { - if (!ConnectNamedPipe(hPipe,NULL)) { + if (!ConnectNamedPipe(hPipe,NULL) && GetLastError() != ERROR_PIPE_CONNECTED) { ERR("Failure during ConnectNamedPipe %ld, ABORT!\n",GetLastError()); break; } @@ -1002,14 +1005,18 @@ static DWORD WINAPI local_server_thread( void RPC_StartLocalServer(REFCLSID clsid, IStream *stream) { DWORD tid; - HANDLE thread; + HANDLE thread, ready_event; struct local_server_params *lsp = HeapAlloc(GetProcessHeap(), 0, sizeof(*lsp)); lsp->clsid = *clsid; lsp->stream = stream; IStream_AddRef(stream); + lsp->ready_event = ready_event = CreateEventW(NULL, FALSE, FALSE, NULL); thread = CreateThread(NULL, 0, local_server_thread, lsp, 0, &tid); CloseHandle(thread); /* FIXME: failure handling */ + + WaitForSingleObject(ready_event, INFINITE); + CloseHandle(ready_event); }

1 0

Andrew Talbot : secur32: Cast-qual warnings fix.
by Alexandre Julliard 28 Sep '06

28 Sep '06

Module: wine Branch: master Commit: 9c78a93e964fc9b5df4aa05a2f887373d437a08e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9c78a93e964fc9b5df4aa05… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed Sep 27 20:03:31 2006 +0100 secur32: Cast-qual warnings fix. --- dlls/secur32/secur32.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/secur32/secur32.c b/dlls/secur32/secur32.c index 1e0b704..dbe3c4c 100644 --- a/dlls/secur32/secur32.c +++ b/dlls/secur32/secur32.c @@ -238,8 +238,8 @@ static void _makeFnTableA(PSecurityFunct * implemented (yikes) */ size_t tableSize = inFnTableA->dwVersion == 1 ? - (LPBYTE)&inFnTableA->SetContextAttributesA - - (LPBYTE)inFnTableA : sizeof(SecurityFunctionTableA); + (const BYTE *)&inFnTableA->SetContextAttributesA - + (const BYTE *)inFnTableA : sizeof(SecurityFunctionTableA); memcpy(fnTableA, inFnTableA, tableSize); /* override this, since we can do it internally anyway */ @@ -309,8 +309,8 @@ static void _makeFnTableW(PSecurityFunct * implemented (yikes) */ size_t tableSize = inFnTableW->dwVersion == 1 ? - (LPBYTE)&inFnTableW->SetContextAttributesW - - (LPBYTE)inFnTableW : sizeof(SecurityFunctionTableW); + (const BYTE *)&inFnTableW->SetContextAttributesW - + (const BYTE *)inFnTableW : sizeof(SecurityFunctionTableW); memcpy(fnTableW, inFnTableW, tableSize); /* override this, since we can do it internally anyway */ @@ -374,7 +374,7 @@ static void _copyPackageInfo(PSecPkgInfo /* odd, I know, but up until Name and Comment the structures are * identical */ - memcpy(info, inInfoW ? inInfoW : (PSecPkgInfoW)inInfoA, sizeof(*info)); + memcpy(info, inInfoW ? inInfoW : (const SecPkgInfoW *)inInfoA, sizeof(*info)); if (inInfoW) { info->Name = SECUR32_strdupW(inInfoW->Name);

1 0

Robert Shearman : oleaut32: Make sure to free the allocated vtable when the tmarshal proxy is released .
by Alexandre Julliard 28 Sep '06

28 Sep '06

Module: wine Branch: master Commit: cc21d235390fafed6333e4965709a8fd65bd9392 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cc21d235390fafed6333e49… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Sep 27 15:51:26 2006 +0100 oleaut32: Make sure to free the allocated vtable when the tmarshal proxy is released. --- dlls/oleaut32/tmarshal.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index a9d0b32..9c4987f 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -416,6 +416,7 @@ TMProxyImpl_Release(LPRPCPROXYBUFFER ifa DeleteCriticalSection(&This->crit); if (This->chanbuf) IRpcChannelBuffer_Release(This->chanbuf); VirtualFree(This->asmstubs, 0, MEM_RELEASE); + HeapFree(GetProcessHeap(), 0, This->lpvtbl); CoTaskMemFree(This); } return refCount;

1 0

Robert Shearman : include: Add types to objidl.idl used by COM contexts.
by Alexandre Julliard 28 Sep '06

28 Sep '06

Module: wine Branch: master Commit: 1f854b20243ec16c7355075715042ce5dbdf455d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1f854b20243ec16c7355075… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Sep 27 15:51:18 2006 +0100 include: Add types to objidl.idl used by COM contexts. --- include/objidl.idl | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 64 insertions(+), 0 deletions(-) diff --git a/include/objidl.idl b/include/objidl.idl index 928c57a..0b1b9fe 100644 --- a/include/objidl.idl +++ b/include/objidl.idl @@ -2370,3 +2370,67 @@ interface IThumbnailExtractor : IUnknown HRESULT OnFileUpdated( [in] IStorage *pStg); } + + +cpp_quote("#ifdef USE_COM_CONTEXT_DEF") + +typedef DWORD CPFLAGS; + +typedef struct tagContextProperty +{ + GUID policyId; + CPFLAGS flags; + [unique] IUnknown *pUnk; +} ContextProperty; + +[ + local, + object, + uuid(000001c1-0000-0000-C000-000000000046) +] +interface IEnumContextProps : IUnknown +{ + typedef [unique] IEnumContextProps *LPENUMCONTEXTPROPS; + + HRESULT Next( + [in] ULONG celt, + [out, size_is(celt), length_is(*pceltFetched)] ContextProperty *pContextProperties, + [out] ULONG *pceltFetched); + + HRESULT Skip( + [in] ULONG celt); + + HRESULT Reset(); + + HRESULT Clone( + [out] IEnumContextProps **ppEnumContextProps); + + HRESULT Count( + [out] ULONG *pcelt); +} + +[ + local, + object, + uuid(000001c0-0000-0000-C000-000000000046) +] +interface IContext : IUnknown +{ + HRESULT SetProperty( + [in] REFGUID policyId, + [in] CPFLAGS flags, + [in] IUnknown *pUnk); + + HRESULT RemovePropert( + [in] REFGUID policyId); + + HRESULT GetProperty( + [in] REFGUID guid, + [out] CPFLAGS *pFlags, + [out] IUnknown **ppUnk); + + HRESULT EnumContextProps( + [out] IEnumContextProps **ppEnumContextProps); +} + +cpp_quote("#endif /* defined USE_COM_CONTEXT_DEF */")

1 0

Robert Shearman : include: Add recently added PSDK VM flags to winnt.h.
by Alexandre Julliard 28 Sep '06

28 Sep '06

Module: wine Branch: master Commit: f9e12a1001e57028b1c9b4ffd547f29ea6868590 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f9e12a1001e57028b1c9b4f… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Sep 27 15:50:04 2006 +0100 include: Add recently added PSDK VM flags to winnt.h. --- include/winnt.h | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 7ae686a..119e0be 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -535,6 +535,7 @@ #define PAGE_EXECUTE_READWRITE 0x40 #define PAGE_EXECUTE_WRITECOPY 0x80 #define PAGE_GUARD 0x100 #define PAGE_NOCACHE 0x200 +#define PAGE_WRITECOMBINE 0x400 #define MEM_COMMIT 0x00001000 #define MEM_RESERVE 0x00002000 @@ -545,7 +546,10 @@ #define MEM_PRIVATE 0x000200 #define MEM_MAPPED 0x00040000 #define MEM_RESET 0x00080000 #define MEM_TOP_DOWN 0x00100000 +#define MEM_WRITE_WATCH 0x00200000 #define MEM_PHYSICAL 0x00400000 +#define MEM_LARGE_PAGES 0x20000000 +#define MEM_4MB_PAGES 0x80000000 #ifdef __WINESRC__ #define MEM_SYSTEM 0x80000000 #endif @@ -555,8 +559,11 @@ #define SEC_IMAGE 0x010000 #define SEC_RESERVE 0x04000000 #define SEC_COMMIT 0x08000000 #define SEC_NOCACHE 0x10000000 +#define SEC_LARGE_PAGES 0x80000000 #define MEM_IMAGE SEC_IMAGE +#define WRITE_WATCH_FLAG_RESET 0x00000001 + #define MINCHAR 0x80 #define MAXCHAR 0x7f

1 0

Robert Shearman : ntdll: NtAllocateVirtual with type of MEM_WRITE_WATCH fails with STATUS_NOT_SUPPORTED on Win2000 instead of STATUS_INVALID_PARAMETER .
by Alexandre Julliard 28 Sep '06

28 Sep '06

Module: wine Branch: master Commit: c88bbd8092f9b3e8a371025d1a47d4225cc171db URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c88bbd8092f9b3e8a371025… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Sep 27 15:50:35 2006 +0100 ntdll: NtAllocateVirtual with type of MEM_WRITE_WATCH fails with STATUS_NOT_SUPPORTED on Win2000 instead of STATUS_INVALID_PARAMETER. --- dlls/ntdll/virtual.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index f7b829f..717e394 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1350,11 +1350,16 @@ NTSTATUS WINAPI NtAllocateVirtualMemory( if (!(type & MEM_SYSTEM)) { if (!(type & (MEM_COMMIT | MEM_RESERVE)) || - (type & ~(MEM_COMMIT | MEM_RESERVE | MEM_TOP_DOWN))) + (type & ~(MEM_COMMIT | MEM_RESERVE | MEM_TOP_DOWN | MEM_WRITE_WATCH | MEM_RESET))) { WARN("called with wrong alloc type flags (%08lx) !\n", type); return STATUS_INVALID_PARAMETER; } + if (type & MEM_WRITE_WATCH) + { + FIXME("MEM_WRITE_WATCH type not supported\n"); + return STATUS_NOT_SUPPORTED; + } } vprot = VIRTUAL_GetProt( protect ); if (type & MEM_COMMIT) vprot |= VPROT_COMMITTED;

1 0