April 2007 - Wine-Commits - list.winehq.org

Maarten Lankhorst : winealsa: Drop unplayed frames instead of waiting for them.
by Alexandre Julliard April 23, 2007

April 23, 2007

Module: wine Branch: master Commit: 6093bb2ecea88546adb292660cce561268830200 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6093bb2ecea88546adb292660… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Apr 20 21:47:17 2007 +0200 winealsa: Drop unplayed frames instead of waiting for them. --- dlls/winealsa.drv/dsoutput.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winealsa.drv/dsoutput.c b/dlls/winealsa.drv/dsoutput.c index ef9d9b2..b8fbea1 100644 --- a/dlls/winealsa.drv/dsoutput.c +++ b/dlls/winealsa.drv/dsoutput.c @@ -218,12 +218,12 @@ static DWORD CALLBACK DBSB_MMAPLoop(LPVOID data) case WINE_WM_STOPPING: state = WINE_WS_STOPPED; - snd_pcm_drain(wwo->pcm); + snd_pcm_drop(wwo->pcm); break; case WINE_WM_CLOSING: if (wwo->pcm != NULL) - snd_pcm_drain(wwo->pcm); + snd_pcm_drop(wwo->pcm); pdbi->mmap_thread = NULL; SetEvent(hEvent); goto out;

1 0

EA Durbin : sxs: Add new dll stub.
by Alexandre Julliard April 23, 2007

April 23, 2007

Module: wine Branch: master Commit: 74977dae4538a9250b698d88f05c51dbde608981 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74977dae4538a9250b698d88f… Author: EA Durbin <ead1234(a)hotmail.com> Date: Thu Apr 19 18:28:52 2007 -0500 sxs: Add new dll stub. --- Makefile.in | 2 ++ configure | 3 +++ configure.ac | 1 + dlls/Makefile.in | 1 + dlls/sxs/Makefile.in | 13 +++++++++++++ dlls/sxs/sxs.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ dlls/sxs/sxs.spec | 2 ++ 7 files changed, 67 insertions(+), 0 deletions(-) diff --git a/Makefile.in b/Makefile.in index 541ff0d..565871c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -369,6 +369,7 @@ ALL_MAKEFILES = \ dlls/sti/Makefile \ dlls/strmiids/Makefile \ dlls/svrapi/Makefile \ + dlls/sxs/Makefile \ dlls/tapi32/Makefile \ dlls/twain_32/Makefile \ dlls/unicows/Makefile \ @@ -711,6 +712,7 @@ dlls/stdole32.tlb/Makefile: dlls/stdole32.tlb/Makefile.in dlls/Makedll.rules dlls/sti/Makefile: dlls/sti/Makefile.in dlls/Makedll.rules dlls/strmiids/Makefile: dlls/strmiids/Makefile.in dlls/Makeimplib.rules dlls/svrapi/Makefile: dlls/svrapi/Makefile.in dlls/Makedll.rules +dlls/sxs/Makefile: dlls/sxs/Makefile.in dlls/Makedll.rules dlls/tapi32/Makefile: dlls/tapi32/Makefile.in dlls/Makedll.rules dlls/twain_32/Makefile: dlls/twain_32/Makefile.in dlls/Makedll.rules dlls/unicows/Makefile: dlls/unicows/Makefile.in dlls/Makedll.rules diff --git a/configure b/configure index e086a93..e0790fc 100755 --- a/configure +++ b/configure @@ -20627,6 +20627,8 @@ ac_config_files="$ac_config_files dlls/strmiids/Makefile" ac_config_files="$ac_config_files dlls/svrapi/Makefile" +ac_config_files="$ac_config_files dlls/sxs/Makefile" + ac_config_files="$ac_config_files dlls/tapi32/Makefile" ac_config_files="$ac_config_files dlls/twain_32/Makefile" @@ -21636,6 +21638,7 @@ do "dlls/sti/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/sti/Makefile" ;; "dlls/strmiids/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/strmiids/Makefile" ;; "dlls/svrapi/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/svrapi/Makefile" ;; + "dlls/sxs/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/sxs/Makefile" ;; "dlls/tapi32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/tapi32/Makefile" ;; "dlls/twain_32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/twain_32/Makefile" ;; "dlls/unicows/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/unicows/Makefile" ;; diff --git a/configure.ac b/configure.ac index 5f718c7..6fd21b4 100644 --- a/configure.ac +++ b/configure.ac @@ -1704,6 +1704,7 @@ AC_CONFIG_FILES([dlls/stdole32.tlb/Makefile]) AC_CONFIG_FILES([dlls/sti/Makefile]) AC_CONFIG_FILES([dlls/strmiids/Makefile]) AC_CONFIG_FILES([dlls/svrapi/Makefile]) +AC_CONFIG_FILES([dlls/sxs/Makefile]) AC_CONFIG_FILES([dlls/tapi32/Makefile]) AC_CONFIG_FILES([dlls/twain_32/Makefile]) AC_CONFIG_FILES([dlls/unicows/Makefile]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 7ec5711..6594762 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -171,6 +171,7 @@ BASEDIRS = \ stdole32.tlb \ sti \ svrapi \ + sxs \ tapi32 \ twain_32 \ unicows \ diff --git a/dlls/sxs/Makefile.in b/dlls/sxs/Makefile.in new file mode 100644 index 0000000..da028e4 --- /dev/null +++ b/dlls/sxs/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = sxs.dll +IMPORTS = kernel32 + +C_SRCS = \ + sxs.c + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/sxs/sxs.c b/dlls/sxs/sxs.c new file mode 100644 index 0000000..cd64de5 --- /dev/null +++ b/dlls/sxs/sxs.c @@ -0,0 +1,45 @@ +/* + * sxs main + * + * Copyright 2007 EA Durbin + * + * 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> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(sxs); + + +/*********************************************************************** + * DllMain (SXS.@) + * + */ +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + switch(fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( hinstDLL ); + break; + } + return TRUE; +} diff --git a/dlls/sxs/sxs.spec b/dlls/sxs/sxs.spec new file mode 100644 index 0000000..012d06b --- /dev/null +++ b/dlls/sxs/sxs.spec @@ -0,0 +1,2 @@ +@ stub CreateAssemblyCache +@ stub CreateAssemblyNameObject

1 0

Alexandre Julliard : server: Return a more correct fd type for anonymous files.
by Alexandre Julliard April 23, 2007

April 23, 2007

Module: wine Branch: master Commit: 133b8bc3edea8b0ddaaf812b2fdcbf20e244ec85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=133b8bc3edea8b0ddaaf812b2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 23 15:13:22 2007 +0200 server: Return a more correct fd type for anonymous files. --- dlls/ntdll/file.c | 2 ++ include/wine/server_protocol.h | 3 ++- server/file.c | 20 +++++++++++++++++--- server/protocol.def | 1 + 4 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index d0229af..b1e2209 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -439,6 +439,7 @@ static NTSTATUS get_io_timeouts( HANDLE handle, enum server_fd_type type, ULONG break; case FD_TYPE_SOCKET: case FD_TYPE_PIPE: + case FD_TYPE_CHAR: if (is_read) timeouts->interval = 0; /* return as soon as we got something */ break; default: @@ -491,6 +492,7 @@ static NTSTATUS get_io_avail_mode( HANDLE handle, enum server_fd_type type, BOOL case FD_TYPE_MAILSLOT: case FD_TYPE_SOCKET: case FD_TYPE_PIPE: + case FD_TYPE_CHAR: *avail_mode = TRUE; break; default: diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 1fde126..5a1c721 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1083,6 +1083,7 @@ enum server_fd_type FD_TYPE_SERIAL, FD_TYPE_PIPE, FD_TYPE_MAILSLOT, + FD_TYPE_CHAR, FD_TYPE_DEVICE, FD_TYPE_NB_TYPES }; @@ -4625,6 +4626,6 @@ union generic_reply struct allocate_locally_unique_id_reply allocate_locally_unique_id_reply; }; -#define SERVER_PROTOCOL_VERSION 298 +#define SERVER_PROTOCOL_VERSION 299 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/file.c b/server/file.c index a45c340..7fc36b0 100644 --- a/server/file.c +++ b/server/file.c @@ -58,6 +58,7 @@ struct file struct object obj; /* object header */ struct fd *fd; /* file descriptor for this file */ unsigned int access; /* file access (FILE_READ_DATA etc.) */ + mode_t mode; /* file stat.st_mode */ }; static unsigned int generic_file_map_access( unsigned int access ); @@ -110,9 +111,17 @@ static inline int is_overlapped( const struct file *file ) static struct file *create_file_for_fd( int fd, unsigned int access, unsigned int sharing ) { struct file *file; + struct stat st; + + if (fstat( fd, &st ) == -1) + { + file_set_error(); + return NULL; + } if ((file = alloc_object( &file_ops ))) { + file->mode = st.st_mode; file->access = file_map_access( &file->obj, access ); if (!(file->fd = create_anonymous_fd( &file_fd_ops, fd, &file->obj, FILE_SYNCHRONOUS_IO_NONALERT ))) @@ -124,12 +133,13 @@ static struct file *create_file_for_fd( int fd, unsigned int access, unsigned in return file; } -static struct object *create_file_obj( struct fd *fd, unsigned int access ) +static struct object *create_file_obj( struct fd *fd, unsigned int access, mode_t mode ) { struct file *file = alloc_object( &file_ops ); if (!file) return NULL; file->access = access; + file->mode = mode; file->fd = fd; grab_object( fd ); set_fd_user( fd, &file_fd_ops, &file->obj ); @@ -178,7 +188,7 @@ static struct object *create_file( const char *nameptr, data_size_t len, unsigne else if (S_ISCHR(mode) && is_serial_fd( fd )) obj = create_serial( fd ); else - obj = create_file_obj( fd, access ); + obj = create_file_obj( fd, access, mode ); release_object( fd ); @@ -235,7 +245,11 @@ static void file_flush( struct fd *fd, struct event **event ) static enum server_fd_type file_get_fd_type( struct fd *fd ) { - return FD_TYPE_FILE; + struct file *file = get_fd_user( fd ); + + if (S_ISREG(file->mode) || S_ISBLK(file->mode)) return FD_TYPE_FILE; + if (S_ISDIR(file->mode)) return FD_TYPE_DIR; + return FD_TYPE_CHAR; } static struct fd *file_get_fd( struct object *obj ) diff --git a/server/protocol.def b/server/protocol.def index 02dee2d..8e50119 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -897,6 +897,7 @@ enum server_fd_type FD_TYPE_SERIAL, /* serial port */ FD_TYPE_PIPE, /* named pipe */ FD_TYPE_MAILSLOT, /* mailslot */ + FD_TYPE_CHAR, /* unspecified char device */ FD_TYPE_DEVICE, /* Windows device file */ FD_TYPE_NB_TYPES };

1 0

Alexandre Julliard : version: Avoid size_t type in traces.
by Alexandre Julliard April 23, 2007

April 23, 2007

Module: wine Branch: master Commit: 96432dfe4b2b3007c928bf8fb6faba4c2c8f400e URL: http://source.winehq.org/git/wine.git/?a=commit;h=96432dfe4b2b3007c928bf8fb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 23 15:12:19 2007 +0200 version: Avoid size_t type in traces. --- dlls/version/tests/info.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/version/tests/info.c b/dlls/version/tests/info.c index 19079ef..e1973e5 100644 --- a/dlls/version/tests/info.c +++ b/dlls/version/tests/info.c @@ -505,8 +505,7 @@ todo_wine ok(len == 0, "VerQueryValue returned %u, expected 0\n", len); SetLastError(0xdeadbeef); ret = VerQueryValue(ver, buf, (LPVOID*)&p, &len); ok(ret, "VerQueryValue(%s) error %u\n", buf, GetLastError()); - ok(len == strlen(value_name[i]) + 1, "VerQueryValue returned %u, expected %u\n", - len, strlen(value_name[i]) + 1); + ok(len == strlen(value_name[i]) + 1, "VerQueryValue returned %u\n", len); ok(!strcmp(value_name[i], p), "expected \"%s\", got \"%s\"\n", value_name[i], p);

1 0

Andrew Talbot : ddraw: Constify some variables.
by Alexandre Julliard April 23, 2007

April 23, 2007

Module: wine Branch: master Commit: e4253fd8b9e4ffe93043a6a8c992ebfd625f50ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4253fd8b9e4ffe93043a6a8c… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Apr 21 22:16:34 2007 +0100 ddraw: Constify some variables. --- dlls/ddraw/ddraw_private.h | 6 +++--- dlls/ddraw/executebuffer.c | 4 ++-- dlls/ddraw/light.c | 2 +- dlls/ddraw/main.c | 2 +- dlls/ddraw/material.c | 2 +- dlls/ddraw/utils.c | 8 ++++---- dlls/ddraw/viewport.c | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 85f8ab2..b04c063 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -598,10 +598,10 @@ const IDirect3DVertexBufferVtbl IDirect3DVertexBuffer1_Vtbl; (((((d3dvtVertexType) >> (16 + (2 * (tex_num)))) + 1) & 0x03) + 1) void PixelFormat_WineD3DtoDD(DDPIXELFORMAT *DDPixelFormat, WINED3DFORMAT WineD3DFormat); -WINED3DFORMAT PixelFormat_DD2WineD3D(DDPIXELFORMAT *DDPixelFormat); +WINED3DFORMAT PixelFormat_DD2WineD3D(const DDPIXELFORMAT *DDPixelFormat); void DDRAW_dump_surface_desc(const DDSURFACEDESC2 *lpddsd); void DDRAW_dump_pixelformat(const DDPIXELFORMAT *PixelFormat); -void dump_D3DMATRIX(D3DMATRIX *mat); +void dump_D3DMATRIX(const D3DMATRIX *mat); void DDRAW_dump_DDCAPS(const DDCAPS *lpcaps); DWORD get_flexible_vertex_size(DWORD d3dvtVertexType); void DDRAW_dump_DDSCAPS2(const DDSCAPS2 *in); @@ -609,7 +609,7 @@ void DDRAW_dump_cooperativelevel(DWORD cooplevel); /* This only needs to be here as long the processvertices functionality of * IDirect3DExecuteBuffer isn't in WineD3D */ -void multiply_matrix(LPD3DMATRIX dest, LPD3DMATRIX src1, LPD3DMATRIX src2); +void multiply_matrix(LPD3DMATRIX dest, const D3DMATRIX *src1, const D3DMATRIX *src2); /* Used for generic dumping */ typedef struct diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index 2b9d097..2c064a9 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -55,14 +55,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d7); * *****************************************************************************/ -static void _dump_executedata(LPD3DEXECUTEDATA lpData) { +static void _dump_executedata(const D3DEXECUTEDATA *lpData) { DPRINTF("dwSize : %d\n", lpData->dwSize); DPRINTF("Vertex Offset : %d Count : %d\n", lpData->dwVertexOffset, lpData->dwVertexCount); DPRINTF("Instruction Offset : %d Length : %d\n", lpData->dwInstructionOffset, lpData->dwInstructionLength); DPRINTF("HVertex Offset : %d\n", lpData->dwHVertexOffset); } -static void _dump_D3DEXECUTEBUFFERDESC(LPD3DEXECUTEBUFFERDESC lpDesc) { +static void _dump_D3DEXECUTEBUFFERDESC(const D3DEXECUTEBUFFERDESC *lpDesc) { DPRINTF("dwSize : %d\n", lpDesc->dwSize); DPRINTF("dwFlags : %x\n", lpDesc->dwFlags); DPRINTF("dwCaps : %x\n", lpDesc->dwCaps); diff --git a/dlls/ddraw/light.c b/dlls/ddraw/light.c index 8ff984f..1eb7961 100644 --- a/dlls/ddraw/light.c +++ b/dlls/ddraw/light.c @@ -158,7 +158,7 @@ IDirect3DLightImpl_Initialize(IDirect3DLight *iface, * DDERR_INVALIDPARAMS if Light is NULL * *****************************************************************************/ -static void dump_light(LPD3DLIGHT2 light) +static void dump_light(const D3DLIGHT2 *light) { DPRINTF(" - dwSize : %d\n", light->dwSize); } diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 4e3d3a6..c89afbf 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -95,7 +95,7 @@ static CRITICAL_SECTION ddraw_list_cs = { &ddraw_list_cs_debug, -1, 0, 0, 0, 0 } * ***********************************************************************/ static HRESULT -DDRAW_Create(GUID *guid, +DDRAW_Create(const GUID *guid, void **DD, IUnknown *UnkOuter, REFIID iid) diff --git a/dlls/ddraw/material.c b/dlls/ddraw/material.c index 32a5091..06fecb0 100644 --- a/dlls/ddraw/material.c +++ b/dlls/ddraw/material.c @@ -47,7 +47,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d7); WINE_DECLARE_DEBUG_CHANNEL(ddraw_thunk); -static void dump_material(LPD3DMATERIAL mat) +static void dump_material(const D3DMATERIAL *mat) { DPRINTF(" dwSize : %d\n", mat->dwSize); } diff --git a/dlls/ddraw/utils.c b/dlls/ddraw/utils.c index e1f02bb..204342a 100644 --- a/dlls/ddraw/utils.c +++ b/dlls/ddraw/utils.c @@ -337,7 +337,7 @@ PixelFormat_WineD3DtoDD(DDPIXELFORMAT *DDPixelFormat, * WINED3DFMT_UNKNOWN if a matching format wasn't found *****************************************************************************/ WINED3DFORMAT -PixelFormat_DD2WineD3D(DDPIXELFORMAT *DDPixelFormat) +PixelFormat_DD2WineD3D(const DDPIXELFORMAT *DDPixelFormat) { TRACE("Convert a DirectDraw Pixelformat to a WineD3D Pixelformat\n"); if(TRACE_ON(ddraw)) @@ -874,7 +874,7 @@ void DDRAW_dump_surface_desc(const DDSURFACEDESC2 *lpddsd) } void -dump_D3DMATRIX(D3DMATRIX *mat) +dump_D3DMATRIX(const D3DMATRIX *mat) { DPRINTF(" %f %f %f %f\n", mat->_11, mat->_12, mat->_13, mat->_14); DPRINTF(" %f %f %f %f\n", mat->_21, mat->_22, mat->_23, mat->_24); @@ -1129,8 +1129,8 @@ void DDRAW_dump_DDCAPS(const DDCAPS *lpcaps) *****************************************************************************/ void multiply_matrix(D3DMATRIX *dest, - D3DMATRIX *src1, - D3DMATRIX *src2) + const D3DMATRIX *src1, + const D3DMATRIX *src2) { D3DMATRIX temp; diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index a643855..2ce1490 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -95,7 +95,7 @@ void viewport_activate(IDirect3DViewportImpl* This) { * Writes viewport information to TRACE * *****************************************************************************/ -static void _dump_D3DVIEWPORT(D3DVIEWPORT *lpvp) +static void _dump_D3DVIEWPORT(const D3DVIEWPORT *lpvp) { TRACE(" - dwSize = %d dwX = %d dwY = %d\n", lpvp->dwSize, lpvp->dwX, lpvp->dwY); @@ -109,7 +109,7 @@ static void _dump_D3DVIEWPORT(D3DVIEWPORT *lpvp) lpvp->dvMinZ, lpvp->dvMaxZ); } -static void _dump_D3DVIEWPORT2(D3DVIEWPORT2 *lpvp) +static void _dump_D3DVIEWPORT2(const D3DVIEWPORT2 *lpvp) { TRACE(" - dwSize = %d dwX = %d dwY = %d\n", lpvp->dwSize, lpvp->dwX, lpvp->dwY);

1 0

Alexandre Julliard : dbghelp: Don't print garbage chars in ERR message.
by Alexandre Julliard April 23, 2007

April 23, 2007

Module: wine Branch: master Commit: 9583c1137b5ee67f5fa8ca2504830a78fb5a2a85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9583c1137b5ee67f5fa8ca250… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 23 15:11:58 2007 +0200 dbghelp: Don't print garbage chars in ERR message. --- dlls/dbghelp/msc.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 6b99ed4..b20f771 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -2444,8 +2444,8 @@ static BOOL codeview_process_info(const struct process* pcs, break; } default: - ERR("Unknown CODEVIEW signature %.4s in module %s\n", - (const char*)signature, debugstr_w(msc_dbg->module->module.ModuleName)); + ERR("Unknown CODEVIEW signature %08x in module %s\n", + *signature, debugstr_w(msc_dbg->module->module.ModuleName)); break; } if (ret)

1 0

Alasdair Sinclair : advapi32: Fix one byte array overflow during DES unhash .
by Alexandre Julliard April 23, 2007

April 23, 2007

Module: wine Branch: master Commit: 25142a27d05e49db4eb8390b0d328754208817cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=25142a27d05e49db4eb8390b0… Author: Alasdair Sinclair <alasdairs(a)dsl.pipex.com> Date: Sun Apr 22 14:24:48 2007 +0100 advapi32: Fix one byte array overflow during DES unhash. --- dlls/advapi32/crypt_des.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/crypt_des.c b/dlls/advapi32/crypt_des.c index 1836ae0..840eb1b 100644 --- a/dlls/advapi32/crypt_des.c +++ b/dlls/advapi32/crypt_des.c @@ -200,9 +200,9 @@ static void KeyShiftRight( unsigned char *key, const int numbits ) { int j; - for (j = 7; j >= 0; j--) + for (j = 6; j >= 0; j--) { - if (j!=7 && (key[j] & 0x01)) + if (j!=6 && (key[j] & 0x01)) key[j+1] |= 0x80; key[j] >>= 1; }

1 0

Rolf Kalbermatter : advapi32: Add EnumServicesStatusExA/ W stub implementation.
by Alexandre Julliard April 23, 2007

April 23, 2007

Module: wine Branch: master Commit: c5339be92b59eba87cc6328c5d78c71da65a3c4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5339be92b59eba87cc6328c5… Author: Rolf Kalbermatter <r.kalbermatter(a)hccnet.nl> Date: Sun Apr 22 22:29:02 2007 +0200 advapi32: Add EnumServicesStatusExA/W stub implementation. --- dlls/advapi32/advapi32.spec | 4 ++-- dlls/advapi32/service.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 1ec5652..0d27297 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -210,8 +210,8 @@ @ stub EnumServiceGroupA @ stub EnumServiceGroupW @ stdcall EnumServicesStatusA (long long long ptr long ptr ptr ptr) -# @ stub EnumServicesStatusExA -# @ stub EnumServicesStatusExW +@ stdcall EnumServicesStatusExA(long long long long ptr long ptr ptr ptr str) +@ stdcall EnumServicesStatusExW(long long long long ptr long ptr ptr ptr wstr) @ stdcall EnumServicesStatusW (long long long ptr long ptr ptr ptr) # @ stub EnumerateTraceGuids # @ stub EqualDomainSid diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 3be5275..66ae8e7 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -1918,6 +1918,36 @@ EnumServicesStatusW( SC_HANDLE hSCManager, DWORD dwServiceType, } /****************************************************************************** + * EnumServicesStatusExA [ADVAPI32.@] + */ +BOOL WINAPI +EnumServicesStatusExA(SC_HANDLE hSCManager, SC_ENUM_TYPE InfoLevel, DWORD dwServiceType, + DWORD dwServiceState, LPBYTE lpServices, DWORD cbBufSize, LPDWORD pcbBytesNeeded, + LPDWORD lpServicesReturned, LPDWORD lpResumeHandle, LPCSTR pszGroupName) +{ + FIXME("%p level=%d type=%x state=%x %p %x %p %p %p %s\n", hSCManager, InfoLevel, + dwServiceType, dwServiceState, lpServices, cbBufSize, + pcbBytesNeeded, lpServicesReturned, lpResumeHandle, debugstr_a(pszGroupName)); + SetLastError (ERROR_ACCESS_DENIED); + return FALSE; +} + +/****************************************************************************** + * EnumServicesStatusExW [ADVAPI32.@] + */ +BOOL WINAPI +EnumServicesStatusExW(SC_HANDLE hSCManager, SC_ENUM_TYPE InfoLevel, DWORD dwServiceType, + DWORD dwServiceState, LPBYTE lpServices, DWORD cbBufSize, LPDWORD pcbBytesNeeded, + LPDWORD lpServicesReturned, LPDWORD lpResumeHandle, LPCWSTR pszGroupName) +{ + FIXME("%p level=%d type=%x state=%x %p %x %p %p %p %s\n", hSCManager, InfoLevel, + dwServiceType, dwServiceState, lpServices, cbBufSize, + pcbBytesNeeded, lpServicesReturned, lpResumeHandle, debugstr_w(pszGroupName)); + SetLastError (ERROR_ACCESS_DENIED); + return FALSE; +} + +/****************************************************************************** * GetServiceKeyNameA [ADVAPI32.@] */ BOOL WINAPI GetServiceKeyNameA( SC_HANDLE hSCManager, LPCSTR lpDisplayName,

1 0

Rolf Kalbermatter : advapi32: Make SERVICE_STATUS_PROCESS match the declaration in MSDN and PSDK.
by Alexandre Julliard April 23, 2007

April 23, 2007

Module: wine Branch: master Commit: a2fbbd9209faa9589180c6eff018ee1fbc0696ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2fbbd9209faa9589180c6eff… Author: Rolf Kalbermatter <r.kalbermatter(a)hccnet.nl> Date: Sun Apr 22 22:26:47 2007 +0200 advapi32: Make SERVICE_STATUS_PROCESS match the declaration in MSDN and PSDK. --- dlls/advapi32/service.c | 28 ++++++++++++++-------------- include/winsvc.h | 8 +++++++- 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 34cb96a..3be5275 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -1580,7 +1580,7 @@ BOOL WINAPI QueryServiceStatus(SC_HANDLE hService, ret = QueryServiceStatusEx(hService, SC_STATUS_PROCESS_INFO, (LPBYTE)&SvcStatusData, sizeof(SERVICE_STATUS_PROCESS), NULL); - if (ret) *lpservicestatus = SvcStatusData.status; + if (ret) memcpy(lpservicestatus, &SvcStatusData, sizeof(SERVICE_STATUS)) ; return ret; } @@ -1642,20 +1642,20 @@ BOOL WINAPI QueryServiceStatusEx(SC_HANDLE hService, SC_STATUS_TYPE InfoLevel, return FALSE; } - /* FIXME: this would be the pid from service_start_process() */ - pSvcStatusData->dwProcessId = 0; - /* service is running in a process that is not a system process */ - pSvcStatusData->dwServiceFlags = 0; - pipe = service_open_pipe(hsvc->name); if (pipe != INVALID_HANDLE_VALUE) { - r = service_get_status(pipe, &pSvcStatusData->status); + r = service_get_status(pipe, (LPSERVICE_STATUS)&pSvcStatusData); CloseHandle(pipe); if (r) return TRUE; } + /* FIXME: this would be the pid from service_start_process() */ + pSvcStatusData->dwProcessId = 0; + /* service is running in a process that is not a system process */ + pSvcStatusData->dwServiceFlags = 0; + TRACE("Failed to read service status\n"); /* read the service type from the registry */ @@ -1664,13 +1664,13 @@ BOOL WINAPI QueryServiceStatusEx(SC_HANDLE hService, SC_STATUS_TYPE InfoLevel, if (r != ERROR_SUCCESS || type != REG_DWORD) val = 0; - pSvcStatusData->status.dwServiceType = val; - pSvcStatusData->status.dwCurrentState = SERVICE_STOPPED; /* stopped */ - pSvcStatusData->status.dwControlsAccepted = 0; - pSvcStatusData->status.dwWin32ExitCode = ERROR_SERVICE_NEVER_STARTED; - pSvcStatusData->status.dwServiceSpecificExitCode = 0; - pSvcStatusData->status.dwCheckPoint = 0; - pSvcStatusData->status.dwWaitHint = 0; + pSvcStatusData->dwServiceType = val; + pSvcStatusData->dwCurrentState = SERVICE_STOPPED; /* stopped */ + pSvcStatusData->dwControlsAccepted = 0; + pSvcStatusData->dwWin32ExitCode = ERROR_SERVICE_NEVER_STARTED; + pSvcStatusData->dwServiceSpecificExitCode = 0; + pSvcStatusData->dwCheckPoint = 0; + pSvcStatusData->dwWaitHint = 0; return TRUE; } diff --git a/include/winsvc.h b/include/winsvc.h index eeb9539..617b9f4 100644 --- a/include/winsvc.h +++ b/include/winsvc.h @@ -135,7 +135,13 @@ typedef struct _SERVICE_STATUS { typedef struct _SERVICE_STATUS_PROCESS { - SERVICE_STATUS status; + DWORD dwServiceType; + DWORD dwCurrentState; + DWORD dwControlsAccepted; + DWORD dwWin32ExitCode; + DWORD dwServiceSpecificExitCode; + DWORD dwCheckPoint; + DWORD dwWaitHint; DWORD dwProcessId; DWORD dwServiceFlags; } SERVICE_STATUS_PROCESS, *LPSERVICE_STATUS_PROCESS;

1 0

Hans Leidekker : msi: Install data sources in the InstallODBC custom action .
by Alexandre Julliard April 23, 2007

April 23, 2007

Module: wine Branch: master Commit: 1d19c2b72f7ad987b0b187e369c6c6742e0f85c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d19c2b72f7ad987b0b187e36… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sun Apr 22 11:38:02 2007 +0200 msi: Install data sources in the InstallODBC custom action. --- dlls/msi/action.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ include/msidefs.h | 6 ++++++ include/odbcinst.h | 8 ++++++++ 3 files changed, 63 insertions(+), 0 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index f0387b1..dbf48f4 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -4483,6 +4483,44 @@ static UINT ITERATE_InstallODBCTranslator( MSIRECORD *rec, LPVOID param ) return r; } +static UINT ITERATE_InstallODBCDataSource( MSIRECORD *rec, LPVOID param ) +{ + LPWSTR attrs; + LPCWSTR desc, driver; + WORD request = ODBC_ADD_SYS_DSN; + INT registration; + DWORD len; + UINT r = ERROR_SUCCESS; + + static const WCHAR attrs_fmt[] = { + 'D','S','N','=','%','s',0 }; + + desc = MSI_RecordGetString(rec, 3); + driver = MSI_RecordGetString(rec, 4); + registration = MSI_RecordGetInteger(rec, 5); + + if (registration == msidbODBCDataSourceRegistrationPerMachine) request = ODBC_ADD_SYS_DSN; + else if (registration == msidbODBCDataSourceRegistrationPerUser) request = ODBC_ADD_DSN; + + len = lstrlenW(attrs_fmt) + lstrlenW(desc) + 1 + 1; + attrs = msi_alloc(len * sizeof(WCHAR)); + if (!attrs) + return ERROR_OUTOFMEMORY; + + sprintfW(attrs, attrs_fmt, desc); + attrs[len - 1] = '\0'; + + if (!SQLConfigDataSourceW(NULL, request, driver, attrs)) + { + ERR("Failed to install SQL data source!\n"); + r = ERROR_FUNCTION_FAILED; + } + + msi_free(attrs); + + return r; +} + static UINT ACTION_InstallODBC( MSIPACKAGE *package ) { UINT rc; @@ -4496,6 +4534,10 @@ static UINT ACTION_InstallODBC( MSIPACKAGE *package ) 'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', 'O','D','B','C','T','r','a','n','s','l','a','t','o','r',0 }; + static const WCHAR source_query[] = { + 'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', + 'O','D','B','C','D','a','t','a','S','o','u','r','c','e',0 }; + rc = MSI_DatabaseOpenViewW(package->db, driver_query, &view); if (rc != ERROR_SUCCESS) return ERROR_SUCCESS; @@ -4510,6 +4552,13 @@ static UINT ACTION_InstallODBC( MSIPACKAGE *package ) rc = MSI_IterateRecords(view, NULL, ITERATE_InstallODBCTranslator, package); msiobj_release(&view->hdr); + rc = MSI_DatabaseOpenViewW(package->db, source_query, &view); + if (rc != ERROR_SUCCESS) + return ERROR_SUCCESS; + + rc = MSI_IterateRecords(view, NULL, ITERATE_InstallODBCDataSource, package); + msiobj_release(&view->hdr); + return rc; } diff --git a/include/msidefs.h b/include/msidefs.h index b99537f..cf022d6 100644 --- a/include/msidefs.h +++ b/include/msidefs.h @@ -168,6 +168,12 @@ enum msidbComponentAttributes msidbComponentAttributes64bit = 0x00000100 }; +enum msidbODBCDataSourceRegistration +{ + msidbODBCDataSourceRegistrationPerMachine = 0x00000000, + msidbODBCDataSourceRegistrationPerUser = 0x00000001 +}; + enum msidbRegistryRoot { msidbRegistryRootClassesRoot = 0, diff --git a/include/odbcinst.h b/include/odbcinst.h index f377197..a1109d5 100644 --- a/include/odbcinst.h +++ b/include/odbcinst.h @@ -34,6 +34,14 @@ extern "C" { #define ODBC_CONFIG_DRIVER 3 #define ODBC_CONFIG_DRIVER_MAX 100 +#define ODBC_ADD_DSN 1 +#define ODBC_CONFIG_DSN 2 +#define ODBC_REMOVE_DSN 3 +#define ODBC_ADD_SYS_DSN 4 +#define ODBC_CONFIG_SYS_DSN 5 +#define ODBC_REMOVE_SYS_DSN 6 +#define ODBC_REMOVE_DEFAULT_DSN 7 + /* Mode values for SQLSetConfigMode/SQLGetConfigMode */ #define ODBC_BOTH_DSN 0 #define ODBC_USER_DSN 1

1 0