wine-commits May 2007

wine-commits@winehq.org

3 participants
715 discussions

Tim Schwartz : net.exe: Add NET START command.
by Alexandre Julliard 30 May '07

30 May '07

Module: wine Branch: master Commit: 9aaaafa77459573115910a53da1e3f9dacba9f6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9aaaafa77459573115910a53d… Author: Tim Schwartz <tim(a)sanityinternet.com> Date: Mon May 28 10:02:48 2007 -0500 net.exe: Add NET START command. --- programs/net/Makefile.in | 2 +- programs/net/net.c | 68 +++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 65 insertions(+), 5 deletions(-) diff --git a/programs/net/Makefile.in b/programs/net/Makefile.in index 5db7fc0..d72a9ba 100644 --- a/programs/net/Makefile.in +++ b/programs/net/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = net.exe APPMODE = -mconsole -IMPORTS = kernel32 +IMPORTS = advapi32 kernel32 C_SRCS = net.c diff --git a/programs/net/net.c b/programs/net/net.c index f77c820..3a6c39a 100644 --- a/programs/net/net.c +++ b/programs/net/net.c @@ -18,15 +18,59 @@ #include <stdio.h> #include <string.h> +#include <windows.h> + +#define NET_START 0001 + +static BOOL net_service(int operation, char *service_name) +{ + SC_HANDLE SCManager, serviceHandle; + BOOL result = 0; + char service_display_name[4096]; + DWORD buffer_size = sizeof(service_display_name); + + SCManager = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS); + if(!SCManager) + { + printf("Couldn't get handle to SCManager.\n"); + return FALSE; + } + serviceHandle = OpenService(SCManager, service_name, SC_MANAGER_ALL_ACCESS); + if(!serviceHandle) + { + printf("Couldn't get handle to service.\n"); + CloseServiceHandle(SCManager); + return FALSE; + } + + + GetServiceDisplayName(SCManager, service_name, service_display_name, &buffer_size); + if (!service_display_name[0]) strcpy(service_display_name, service_name); + + switch(operation) + { + case NET_START: + printf("The %s service is starting.\n", service_display_name); + result = StartService(serviceHandle, 0, NULL); + + printf("The %s service ", service_display_name); + if(!result) printf("failed to start.\n"); + else printf("was started successfully.\n"); + break; + } + + CloseServiceHandle(serviceHandle); + CloseServiceHandle(SCManager); + return result; +} int main(int argc, char *argv[]) { - int ret = 0; if (argc < 2) { printf("The syntax of this command is:\n\n"); - printf("NET [ HELP ]\n"); + printf("NET [ HELP | START ]\n"); return 1; } @@ -35,7 +79,23 @@ int main(int argc, char *argv[]) printf("The syntax of this command is:\n\n"); printf("NET HELP command\n -or-\nNET command /HELP\n\n"); printf(" Commands available are:\n"); - printf(" NET HELP\n"); + printf(" NET HELP NET START\n"); } - return ret; + + if(!strcasecmp(argv[1], "start")) + { + if(argc < 3) + { + printf("Specify service name to start.\n"); + return 1; + } + + if(!net_service(NET_START, argv[2])) + { + return 1; + } + return 0; + } + + return 0; }

1 0

Mikołaj Zalewski : kernel32: Clear the extra memory in LocalReAlloc16(h, bigger_size, LMEM_ZEROINIT).
by Alexandre Julliard 30 May '07

30 May '07

Module: wine Branch: master Commit: db4586d274fb88029d8805a358e40dea43dd4662 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db4586d274fb88029d8805a35… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Wed May 30 10:06:34 2007 +0200 kernel32: Clear the extra memory in LocalReAlloc16(h, bigger_size, LMEM_ZEROINIT). --- dlls/kernel32/local16.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/local16.c b/dlls/kernel32/local16.c index eb8df76..76b2a6d 100644 --- a/dlls/kernel32/local16.c +++ b/dlls/kernel32/local16.c @@ -1330,6 +1330,9 @@ HLOCAL16 WINAPI LocalReAlloc16( HLOCAL16 handle, WORD size, UINT16 flags ) { TRACE("size increase, making new free block\n"); LOCAL_GrowArenaUpward(ds, arena, nextarena - arena); + if (flags & LMEM_ZEROINIT) + memset((char *)pArena + oldsize, 0, size - oldsize); + TRACE("returning %04x\n", handle ); return handle; }

1 0

Dmitry Timoshkov : user32: Fix some compilation warnings in 64-bit mode.
by Alexandre Julliard 30 May '07

30 May '07

Module: wine Branch: master Commit: 9a295e7f87b592157cce05c58d6c8570af39baca URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a295e7f87b592157cce05c58… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed May 30 19:32:24 2007 +0900 user32: Fix some compilation warnings in 64-bit mode. --- dlls/user32/caret.c | 2 +- dlls/user32/dde_misc.c | 2 +- dlls/user32/dde_private.h | 2 +- dlls/user32/dde_server.c | 2 +- dlls/user32/edit.c | 12 ++++++------ dlls/user32/mdi.c | 2 +- dlls/user32/menu.c | 2 +- dlls/user32/message.c | 2 +- dlls/user32/msg16.c | 2 +- dlls/user32/sysparams.c | 28 ++++++++++++++-------------- dlls/user32/uitools.c | 2 +- dlls/user32/user_private.h | 6 +++--- dlls/user32/win.c | 4 ++-- dlls/user32/winproc.c | 16 ++++++++-------- 14 files changed, 42 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9a295e7f87b592157cce0…

1 0

Dmitry Timoshkov : kernel32: Fix some compilation warnings in 64-bit mode.
by Alexandre Julliard 30 May '07

30 May '07

Module: wine Branch: master Commit: 545a71302be3b262e34cfc1aaa464ec84faadd51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=545a71302be3b262e34cfc1aa… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed May 30 19:31:52 2007 +0900 kernel32: Fix some compilation warnings in 64-bit mode. --- dlls/kernel32/kernel16_private.h | 2 +- dlls/kernel32/selector.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/kernel16_private.h b/dlls/kernel32/kernel16_private.h index c153d81..0c59bbd 100644 --- a/dlls/kernel32/kernel16_private.h +++ b/dlls/kernel32/kernel16_private.h @@ -168,7 +168,7 @@ extern THHOOK *pThhook; (((offset)+(size) <= pModule->mapping_size) ? \ (memcpy( buffer, (const char *)pModule->mapping + (offset), (size) ), TRUE) : FALSE) -#define CURRENT_STACK16 ((STACK16FRAME*)MapSL((SEGPTR)NtCurrentTeb()->WOW32Reserved)) +#define CURRENT_STACK16 ((STACK16FRAME*)MapSL(PtrToUlong(NtCurrentTeb()->WOW32Reserved))) #define CURRENT_DS (CURRENT_STACK16->ds) /* push bytes on the 16-bit stack of a thread; return a segptr to the first pushed byte */ diff --git a/dlls/kernel32/selector.c b/dlls/kernel32/selector.c index db3a47e..c8841b1 100644 --- a/dlls/kernel32/selector.c +++ b/dlls/kernel32/selector.c @@ -482,7 +482,7 @@ SEGPTR WINAPI MapLS( LPCVOID ptr ) if (!HIWORD(ptr)) return (SEGPTR)LOWORD(ptr); - base = (const char *)ptr - ((unsigned int)ptr & 0x7fff); + base = (const char *)ptr - ((ULONG_PTR)ptr & 0x7fff); HeapLock( GetProcessHeap() ); for (entry = first_entry; entry; entry = entry->next) {

1 0

Alexandre Julliard : kernel32: Store global arena base as a pointer.
by Alexandre Julliard 30 May '07

30 May '07

Module: wine Branch: master Commit: 63322dbaa57d2ddca9942847ecee5cd20457b557 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63322dbaa57d2ddca9942847e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 30 13:23:30 2007 +0200 kernel32: Store global arena base as a pointer. --- dlls/kernel32/global16.c | 16 ++++++++-------- dlls/kernel32/toolhelp.h | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/global16.c b/dlls/kernel32/global16.c index 2031525..b17c610 100644 --- a/dlls/kernel32/global16.c +++ b/dlls/kernel32/global16.c @@ -49,7 +49,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(global); /* Global arena block */ typedef struct { - DWORD_PTR base; /* Base address (0 if discarded) */ + void *base; /* Base address (0 if discarded) */ DWORD size; /* Size in bytes (0 indicates a free block) */ HGLOBAL16 handle; /* Handle for this block */ HGLOBAL16 hOwner; /* Owner of this block */ @@ -134,7 +134,7 @@ void debug_handles(void) * * Create a global heap block for a fixed range of linear memory. */ -HGLOBAL16 GLOBAL_CreateBlock( WORD flags, const void *ptr, DWORD size, +HGLOBAL16 GLOBAL_CreateBlock( WORD flags, void *ptr, DWORD size, HGLOBAL16 hOwner, unsigned char selflags ) { WORD sel, selcount; @@ -154,7 +154,7 @@ HGLOBAL16 GLOBAL_CreateBlock( WORD flags, const void *ptr, DWORD size, /* Fill the arena block */ - pArena->base = (DWORD_PTR)ptr; + pArena->base = ptr; pArena->size = GetSelectorLimit16(sel) + 1; pArena->handle = (flags & GMEM_MOVEABLE) ? sel - 1 : sel; pArena->hOwner = hOwner; @@ -195,7 +195,7 @@ BOOL16 GLOBAL_FreeBlock( HGLOBAL16 handle ) /*********************************************************************** * GLOBAL_MoveBlock */ -BOOL16 GLOBAL_MoveBlock( HGLOBAL16 handle, const void *ptr, DWORD size ) +BOOL16 GLOBAL_MoveBlock( HGLOBAL16 handle, void *ptr, DWORD size ) { WORD sel; GLOBALARENA *pArena; @@ -207,7 +207,7 @@ BOOL16 GLOBAL_MoveBlock( HGLOBAL16 handle, const void *ptr, DWORD size ) if (pArena->selCount != 1) return FALSE; - pArena->base = (DWORD)ptr; + pArena->base = ptr; pArena->size = size; SELECTOR_ReallocBlock( sel, ptr, size ); return TRUE; @@ -428,7 +428,7 @@ HGLOBAL16 WINAPI GlobalReAlloc16( As we may have used HEAP_REALLOC_IN_PLACE_ONLY, areas may overlap*/ if (pNewArena != pArena) memmove( pNewArena, pArena, sizeof(GLOBALARENA) ); - pNewArena->base = (DWORD)ptr; + pNewArena->base = ptr; pNewArena->size = GetSelectorLimit16(sel) + 1; pNewArena->selCount = selcount; pNewArena->handle = (pNewArena->flags & GA_MOVEABLE) ? sel - 1 : sel; @@ -983,7 +983,7 @@ BOOL16 WINAPI GlobalNext16( GLOBALENTRY *pGlobal, WORD wFlags) pGlobal->dwNext = i; } - pGlobal->dwAddress = pArena->base; + pGlobal->dwAddress = (DWORD_PTR)pArena->base; pGlobal->dwBlockSize = pArena->size; pGlobal->hBlock = pArena->handle; pGlobal->wcLock = pArena->lockCount; @@ -1022,7 +1022,7 @@ BOOL16 WINAPI GlobalEntryHandle16( GLOBALENTRY *pGlobal, HGLOBAL16 hItem ) { GLOBALARENA *pArena = GET_ARENA_PTR(hItem); - pGlobal->dwAddress = pArena->base; + pGlobal->dwAddress = (DWORD_PTR)pArena->base; pGlobal->dwBlockSize = pArena->size; pGlobal->hBlock = pArena->handle; pGlobal->wcLock = pArena->lockCount; diff --git a/dlls/kernel32/toolhelp.h b/dlls/kernel32/toolhelp.h index 56814ec..6506aae 100644 --- a/dlls/kernel32/toolhelp.h +++ b/dlls/kernel32/toolhelp.h @@ -103,10 +103,10 @@ BOOL16 WINAPI GlobalEntryModule16( GLOBALENTRY *pGlobal, HMODULE16 hModule, WORD wSeg ); /* FIXME: Wine internal functions */ -extern HGLOBAL16 GLOBAL_CreateBlock( UINT16 flags, const void *ptr, DWORD size, +extern HGLOBAL16 GLOBAL_CreateBlock( UINT16 flags, void *ptr, DWORD size, HGLOBAL16 hOwner, unsigned char selflags ); extern BOOL16 GLOBAL_FreeBlock( HGLOBAL16 handle ); -extern BOOL16 GLOBAL_MoveBlock( HGLOBAL16 handle, const void *ptr, DWORD size ); +extern BOOL16 GLOBAL_MoveBlock( HGLOBAL16 handle, void *ptr, DWORD size ); extern HGLOBAL16 GLOBAL_Alloc( WORD flags, DWORD size, HGLOBAL16 hOwner, unsigned char selflags ); /* Local heap */

1 0

Alexandre Julliard : winedos: Merge a number of tiny source files into interrupts.c.
by Alexandre Julliard 30 May '07

30 May '07

Module: wine Branch: master Commit: 7373ced54473899b75c6b9d813482d8500dba4f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7373ced54473899b75c6b9d81… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 30 13:12:09 2007 +0200 winedos: Merge a number of tiny source files into interrupts.c. --- dlls/winedos/Makefile.in | 11 -- dlls/winedos/dosexe.h | 33 ---- dlls/winedos/int11.c | 114 -------------- dlls/winedos/int12.c | 15 -- dlls/winedos/int17.c | 55 ------- dlls/winedos/int19.c | 39 ----- dlls/winedos/int1a.c | 127 --------------- dlls/winedos/int20.c | 39 ----- dlls/winedos/int29.c | 39 ----- dlls/winedos/int2a.c | 26 --- dlls/winedos/int41.c | 70 --------- dlls/winedos/int4b.c | 29 ---- dlls/winedos/int5c.c | 39 ----- dlls/winedos/interrupts.c | 371 +++++++++++++++++++++++++++++++++++++++++++++ 14 files changed, 371 insertions(+), 636 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7373ced54473899b75c6b…

1 0

Alexandre Julliard : dmusic: Fix license headers that mistakenly use GPL instead of LGPL.
by Alexandre Julliard 30 May '07

30 May '07

Module: wine Branch: master Commit: 7718d2bd7cd4c23facd24f8378be42c652da7002 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7718d2bd7cd4c23facd24f837… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 30 12:54:07 2007 +0200 dmusic: Fix license headers that mistakenly use GPL instead of LGPL. Confirmed by the original author and the major contributors. --- dlls/dmband/band.c | 18 +++++++++--------- dlls/dmband/bandtrack.c | 18 +++++++++--------- dlls/dmband/dmband_main.c | 18 +++++++++--------- dlls/dmband/dmband_private.h | 18 +++++++++--------- dlls/dmband/dmutils.c | 18 +++++++++--------- dlls/dmband/dmutils.h | 18 +++++++++--------- dlls/dmcompos/chordmap.c | 18 +++++++++--------- dlls/dmcompos/chordmaptrack.c | 18 +++++++++--------- dlls/dmcompos/composer.c | 18 +++++++++--------- dlls/dmcompos/dmcompos_main.c | 18 +++++++++--------- dlls/dmcompos/dmcompos_private.h | 18 +++++++++--------- dlls/dmcompos/signposttrack.c | 18 +++++++++--------- dlls/dmime/audiopath.c | 18 +++++++++--------- dlls/dmime/dmime_main.c | 18 +++++++++--------- dlls/dmime/dmime_private.h | 18 +++++++++--------- dlls/dmime/dmutils.c | 18 +++++++++--------- dlls/dmime/dmutils.h | 18 +++++++++--------- dlls/dmime/graph.c | 18 +++++++++--------- dlls/dmime/lyricstrack.c | 18 +++++++++--------- dlls/dmime/markertrack.c | 18 +++++++++--------- dlls/dmime/paramcontroltrack.c | 18 +++++++++--------- dlls/dmime/patterntrack.c | 18 +++++++++--------- dlls/dmime/performance.c | 18 +++++++++--------- dlls/dmime/segment.c | 18 +++++++++--------- dlls/dmime/segmentstate.c | 18 +++++++++--------- dlls/dmime/segtriggertrack.c | 18 +++++++++--------- dlls/dmime/seqtrack.c | 18 +++++++++--------- dlls/dmime/sysextrack.c | 18 +++++++++--------- dlls/dmime/tempotrack.c | 18 +++++++++--------- dlls/dmime/timesigtrack.c | 18 +++++++++--------- dlls/dmime/tool.c | 18 +++++++++--------- dlls/dmime/wavetrack.c | 18 +++++++++--------- dlls/dmloader/classfactory.c | 18 +++++++++--------- dlls/dmloader/container.c | 18 +++++++++--------- dlls/dmloader/debug.c | 18 +++++++++--------- dlls/dmloader/debug.h | 18 +++++++++--------- dlls/dmloader/dmloader_main.c | 18 +++++++++--------- dlls/dmloader/dmloader_private.h | 18 +++++++++--------- dlls/dmloader/loader.c | 18 +++++++++--------- dlls/dmloader/loaderstream.c | 18 +++++++++--------- dlls/dmscript/dmscript_main.c | 18 +++++++++--------- dlls/dmscript/dmscript_private.h | 18 +++++++++--------- dlls/dmscript/script.c | 18 +++++++++--------- dlls/dmscript/scripttrack.c | 18 +++++++++--------- dlls/dmstyle/auditiontrack.c | 18 +++++++++--------- dlls/dmstyle/chordtrack.c | 18 +++++++++--------- dlls/dmstyle/commandtrack.c | 18 +++++++++--------- dlls/dmstyle/dmstyle_main.c | 18 +++++++++--------- dlls/dmstyle/dmstyle_private.h | 18 +++++++++--------- dlls/dmstyle/dmutils.c | 18 +++++++++--------- dlls/dmstyle/dmutils.h | 18 +++++++++--------- dlls/dmstyle/motiftrack.c | 18 +++++++++--------- dlls/dmstyle/mutetrack.c | 18 +++++++++--------- dlls/dmstyle/style.c | 18 +++++++++--------- dlls/dmstyle/styletrack.c | 18 +++++++++--------- dlls/dmsynth/dmsynth_main.c | 18 +++++++++--------- dlls/dmsynth/dmsynth_private.h | 18 +++++++++--------- dlls/dmsynth/synth.c | 18 +++++++++--------- dlls/dmsynth/synthsink.c | 18 +++++++++--------- dlls/dmusic/buffer.c | 18 +++++++++--------- dlls/dmusic/clock.c | 18 +++++++++--------- dlls/dmusic/collection.c | 18 +++++++++--------- dlls/dmusic/dmusic.c | 18 +++++++++--------- dlls/dmusic/dmusic_main.c | 18 +++++++++--------- dlls/dmusic/dmusic_private.h | 18 +++++++++--------- dlls/dmusic/download.c | 18 +++++++++--------- dlls/dmusic/downloadedinstrument.c | 18 +++++++++--------- dlls/dmusic/instrument.c | 18 +++++++++--------- dlls/dmusic/port.c | 18 +++++++++--------- dlls/dmusic/portdownload.c | 18 +++++++++--------- dlls/dmusic/thru.c | 18 +++++++++--------- dlls/dmusic32/dmusic32_main.c | 18 +++++++++--------- dlls/dpnhpast/main.c | 18 +++++++++--------- dlls/dswave/dswave.c | 18 +++++++++--------- dlls/dswave/dswave_main.c | 18 +++++++++--------- dlls/dswave/dswave_private.h | 18 +++++++++--------- include/dls1.h | 18 +++++++++--------- include/dls2.h | 18 +++++++++--------- include/dmdls.h | 18 +++++++++--------- include/dmerror.h | 18 +++++++++--------- include/dmplugin.h | 18 +++++++++--------- include/dmusbuff.h | 18 +++++++++--------- include/dmusicc.h | 18 +++++++++--------- include/dmusicf.h | 18 +++++++++--------- include/dmusici.h | 18 +++++++++--------- include/dmusics.h | 18 +++++++++--------- 86 files changed, 774 insertions(+), 774 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7718d2bd7cd4c23facd24…

1 0

Dmitry Timoshkov : winex11.drv: Fix compilation warnings in 64-bit mode.
by Alexandre Julliard 30 May '07

30 May '07

Module: wine Branch: master Commit: 4978194fde45fb94df8c4eb0f43cabfad3f8d676 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4978194fde45fb94df8c4eb0f… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed May 30 17:52:11 2007 +0900 winex11.drv: Fix compilation warnings in 64-bit mode. --- dlls/winex11.drv/xfont.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/xfont.c b/dlls/winex11.drv/xfont.c index b53da7e..0ef18fc 100644 --- a/dlls/winex11.drv/xfont.c +++ b/dlls/winex11.drv/xfont.c @@ -2201,9 +2201,10 @@ static BOOL XFONT_ReadCachedMetrics( int fd, int res, unsigned x_checksum, int x { if( offset > length || pfi->cptable >= (UINT16)X11DRV_CPTABLE_COUNT || - (int)(pfi->next) != j++ ) + PtrToInt(pfi->next) != j++ ) { - TRACE("error: offset=%ld length=%ld cptable=%d pfi->next=%d j=%d\n",(long)offset,(long)length,pfi->cptable,(int)pfi->next,j-1); + TRACE("error: offset=%ld length=%ld cptable=%d pfi->next=%p j=%d\n", + (long)offset, (long)length, pfi->cptable, pfi->next, j-1); goto fail; } @@ -2332,7 +2333,7 @@ static BOOL XFONT_WriteCachedMetrics( int fd, unsigned x_checksum, int x_count, fi = *pfi; fi.df.dfFace = NULL; - fi.next = (fontInfo*)k; /* loader checks this */ + fi.next = IntToPtr(k); /* loader checks this */ j = write( fd, &fi, sizeof(fi) ); k++;

1 0

Dmitry Timoshkov : gdi32: Fix compilation warnings in 64-bit mode.
by Alexandre Julliard 30 May '07

30 May '07

Module: wine Branch: master Commit: edbc6e7b8a0003b98deb851a38ba9c97ba5428b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=edbc6e7b8a0003b98deb851a3… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed May 30 17:51:47 2007 +0900 gdi32: Fix compilation warnings in 64-bit mode. --- dlls/gdi32/enhmfdrv/objects.c | 6 +++--- dlls/gdi32/font.c | 8 ++++---- dlls/gdi32/gdiobj.c | 4 ++-- dlls/gdi32/mfdrv/text.c | 2 +- dlls/gdi32/printdrv.c | 8 ++++---- dlls/gdi32/region.c | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/objects.c b/dlls/gdi32/enhmfdrv/objects.c index 0a42af0..24a8934 100644 --- a/dlls/gdi32/enhmfdrv/objects.c +++ b/dlls/gdi32/enhmfdrv/objects.c @@ -392,7 +392,7 @@ HFONT EMFDRV_SelectFont( PHYSDEV dev, HFONT hFont, HANDLE gdiFont ) /****************************************************************** * EMFDRV_CreatePenIndirect */ -static HPEN EMFDRV_CreatePenIndirect(PHYSDEV dev, HPEN hPen ) +static DWORD EMFDRV_CreatePenIndirect(PHYSDEV dev, HPEN hPen) { EMRCREATEPEN emr; DWORD index = 0; @@ -423,7 +423,7 @@ static HPEN EMFDRV_CreatePenIndirect(PHYSDEV dev, HPEN hPen ) if(!EMFDRV_WriteRecord( dev, &emr.emr )) index = 0; - return (HPEN)index; + return index; } /****************************************************************** @@ -453,7 +453,7 @@ HPEN EMFDRV_SelectPen(PHYSDEV dev, HPEN hPen ) if((index = EMFDRV_FindObject(dev, hPen)) != 0) goto found; - if (!(index = (DWORD)EMFDRV_CreatePenIndirect(dev, hPen ))) return 0; + if (!(index = EMFDRV_CreatePenIndirect(dev, hPen))) return 0; GDI_hdc_using_object(hPen, physDev->hdc); found: diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index d9e6e35..17fcfe6 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -356,7 +356,7 @@ DWORD WINAPI GdiGetCodePage( HDC hdc ) int charset = GetTextCharset(hdc); /* Hmm, nicely designed api this one! */ - if(TranslateCharsetInfo((DWORD*)charset, &csi, TCI_SRCCHARSET)) + if(TranslateCharsetInfo(ULongToPtr(charset), &csi, TCI_SRCCHARSET)) cp = csi.ciACP; else { switch(charset) { @@ -2653,7 +2653,7 @@ DWORD WINAPI GetKerningPairsA( HDC hDC, DWORD cPairs, } charset = GetTextCharset(hDC); - if (!TranslateCharsetInfo((DWORD *)charset, &csi, TCI_SRCCHARSET)) + if (!TranslateCharsetInfo(ULongToPtr(charset), &csi, TCI_SRCCHARSET)) { FIXME("Can't find codepage for charset %d\n", charset); return 0; @@ -2762,10 +2762,10 @@ BOOL WINAPI TranslateCharsetInfo( while (!(*lpSrc>>index & 0x0001) && index<MAXTCIINDEX) index++; break; case TCI_SRCCODEPAGE: - while ((UINT) (lpSrc) != FONT_tci[index].ciACP && index < MAXTCIINDEX) index++; + while (PtrToUlong(lpSrc) != FONT_tci[index].ciACP && index < MAXTCIINDEX) index++; break; case TCI_SRCCHARSET: - while ((UINT) (lpSrc) != FONT_tci[index].ciCharset && index < MAXTCIINDEX) index++; + while (PtrToUlong(lpSrc) != FONT_tci[index].ciCharset && index < MAXTCIINDEX) index++; break; default: return FALSE; diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 2440b2d..7a1cdf2 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -485,7 +485,7 @@ static UINT get_default_charset( void ) uACP = GetACP(); csi.ciCharset = ANSI_CHARSET; - if ( ! TranslateCharsetInfo( (LPDWORD)uACP, &csi, TCI_SRCCODEPAGE ) ) + if ( !TranslateCharsetInfo( ULongToPtr(uACP), &csi, TCI_SRCCODEPAGE ) ) { FIXME( "unhandled codepage %u - use ANSI_CHARSET for default stock objects\n", uACP ); return ANSI_CHARSET; @@ -1157,7 +1157,7 @@ HGDIOBJ WINAPI SelectObject( HDC hdc, HGDIOBJ hObj ) if (header->funcs && header->funcs->pSelectObject) { ret = header->funcs->pSelectObject( hObj, header, hdc ); - if (ret && ret != hObj && (INT)ret > COMPLEXREGION) + if (ret && ret != hObj && HandleToULong(ret) > COMPLEXREGION) { inc_ref_count( hObj ); dec_ref_count( ret ); diff --git a/dlls/gdi32/mfdrv/text.c b/dlls/gdi32/mfdrv/text.c index 8154e39..0236493 100644 --- a/dlls/gdi32/mfdrv/text.c +++ b/dlls/gdi32/mfdrv/text.c @@ -87,7 +87,7 @@ MFDRV_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, int charset = GetTextCharset(physDev->hdc); UINT cp = CP_ACP; - if(TranslateCharsetInfo((DWORD*)charset, &csi, TCI_SRCCHARSET)) + if(TranslateCharsetInfo(ULongToPtr(charset), &csi, TCI_SRCCHARSET)) cp = csi.ciACP; else { switch(charset) { diff --git a/dlls/gdi32/printdrv.c b/dlls/gdi32/printdrv.c index 15bcada..bbb6086 100644 --- a/dlls/gdi32/printdrv.c +++ b/dlls/gdi32/printdrv.c @@ -804,7 +804,7 @@ DWORD WINAPI DrvGetPrinterData16(LPSTR lpPrinter, LPSTR lpProfile, strcpy(RegStr_Printer, Printers); strcat(RegStr_Printer, lpPrinter); - if (((DWORD)lpProfile == INT_PD_DEFAULT_DEVMODE) || (HIWORD(lpProfile) && + if ((PtrToUlong(lpProfile) == INT_PD_DEFAULT_DEVMODE) || (HIWORD(lpProfile) && (!strcmp(lpProfile, DefaultDevMode)))) { size = DrvGetPrinterDataInternal(RegStr_Printer, lpPrinterData, cbData, INT_PD_DEFAULT_DEVMODE); @@ -816,7 +816,7 @@ DWORD WINAPI DrvGetPrinterData16(LPSTR lpPrinter, LPSTR lpProfile, else res = ERROR_INVALID_PRINTER_NAME; } else - if (((DWORD)lpProfile == INT_PD_DEFAULT_MODEL) || (HIWORD(lpProfile) && + if ((PtrToUlong(lpProfile) == INT_PD_DEFAULT_MODEL) || (HIWORD(lpProfile) && (!strcmp(lpProfile, PrinterModel)))) { *lpNeeded = 32; if (!lpPrinterData) goto failed; @@ -890,7 +890,7 @@ DWORD WINAPI DrvSetPrinterData16(LPSTR lpPrinter, LPSTR lpProfile, TRACE("lpType %08x\n",lpType); if ((!lpPrinter) || (!lpProfile) || - ((DWORD)lpProfile == INT_PD_DEFAULT_MODEL) || (HIWORD(lpProfile) && + (PtrToUlong(lpProfile) == INT_PD_DEFAULT_MODEL) || (HIWORD(lpProfile) && (!strcmp(lpProfile, PrinterModel)))) return ERROR_INVALID_PARAMETER; @@ -899,7 +899,7 @@ DWORD WINAPI DrvSetPrinterData16(LPSTR lpPrinter, LPSTR lpProfile, strcpy(RegStr_Printer, Printers); strcat(RegStr_Printer, lpPrinter); - if (((DWORD)lpProfile == INT_PD_DEFAULT_DEVMODE) || (HIWORD(lpProfile) && + if ((PtrToUlong(lpProfile) == INT_PD_DEFAULT_DEVMODE) || (HIWORD(lpProfile) && (!strcmp(lpProfile, DefaultDevMode)))) { if ( RegOpenKeyA(HKEY_LOCAL_MACHINE, RegStr_Printer, &hkey) != ERROR_SUCCESS || diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index ac92581..b746447 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -551,7 +551,7 @@ static BOOL REGION_DeleteObject( HGDIOBJ handle, void *obj ) */ static HGDIOBJ REGION_SelectObject( HGDIOBJ handle, void *obj, HDC hdc ) { - return (HGDIOBJ)SelectClipRgn( hdc, handle ); + return ULongToHandle(SelectClipRgn( hdc, handle )); }

1 0

Rob Shearman : oleaut32: Fix the references in function descriptions returned for dual IDispatch interfaces .
by Alexandre Julliard 30 May '07

30 May '07

Module: wine Branch: master Commit: e98ec6db4cc63351c2f8b713503495790c08a31a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e98ec6db4cc63351c2f8b7135… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed May 30 09:01:22 2007 +0100 oleaut32: Fix the references in function descriptions returned for dual IDispatch interfaces. Do this by changing references from other interfaces (and possibly other typelibs) to uniquely identify them. Add special handling to GetRefTypeInfo to cope with this. --- dlls/oleaut32/typelib.c | 96 ++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 90 insertions(+), 6 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index c0615de..6bf9dfd 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -104,6 +104,8 @@ static DWORD FromLEDWord(DWORD p_iVal) #define FromLEDWord(X) (X) #endif +#define DISPATCH_HREF_OFFSET 0x01000000 +#define DISPATCH_HREF_MASK 0xff000000 /**************************************************************************** * FromLExxx @@ -4756,7 +4758,7 @@ HRESULT ITypeInfoImpl_GetInternalFuncDesc( ITypeInfo *iface, UINT index, const F /* internal function to make the inherited interfaces' methods appear * part of the interface */ static HRESULT ITypeInfoImpl_GetInternalDispatchFuncDesc( ITypeInfo *iface, - UINT index, const FUNCDESC **ppFuncDesc, UINT *funcs) + UINT index, const FUNCDESC **ppFuncDesc, UINT *funcs, UINT *hrefoffset) { ITypeInfoImpl *This = (ITypeInfoImpl *)iface; HRESULT hr; @@ -4764,6 +4766,8 @@ static HRESULT ITypeInfoImpl_GetInternalDispatchFuncDesc( ITypeInfo *iface, if (funcs) *funcs = 0; + else + *hrefoffset = DISPATCH_HREF_OFFSET; if(This->impltypelist) { @@ -4777,15 +4781,18 @@ static HRESULT ITypeInfoImpl_GetInternalDispatchFuncDesc( ITypeInfo *iface, hr = ITypeInfoImpl_GetInternalDispatchFuncDesc(pSubTypeInfo, index, ppFuncDesc, - &sub_funcs); + &sub_funcs, hrefoffset); implemented_funcs += sub_funcs; ITypeInfo_Release(pSubTypeInfo); if (SUCCEEDED(hr)) return hr; + *hrefoffset += DISPATCH_HREF_OFFSET; } if (funcs) *funcs = implemented_funcs + This->TypeAttr.cFuncs; + else + *hrefoffset = 0; if (index < implemented_funcs) return E_INVALIDARG; @@ -4793,6 +4800,37 @@ static HRESULT ITypeInfoImpl_GetInternalDispatchFuncDesc( ITypeInfo *iface, ppFuncDesc); } +static inline void ITypeInfoImpl_ElemDescAddHrefOffset( LPELEMDESC pElemDesc, UINT hrefoffset) +{ + TYPEDESC *pTypeDesc = &pElemDesc->tdesc; + while (TRUE) + { + switch (pTypeDesc->vt) + { + case VT_USERDEFINED: + pTypeDesc->u.hreftype += hrefoffset; + return; + case VT_PTR: + case VT_SAFEARRAY: + pTypeDesc = pTypeDesc->u.lptdesc; + break; + case VT_CARRAY: + pTypeDesc = &pTypeDesc->u.lpadesc->tdescElem; + break; + default: + return; + } + } +} + +static inline void ITypeInfoImpl_FuncDescAddHrefOffset( LPFUNCDESC pFuncDesc, UINT hrefoffset) +{ + SHORT i; + for (i = 0; i < pFuncDesc->cParams; i++) + ITypeInfoImpl_ElemDescAddHrefOffset(&pFuncDesc->lprgelemdescParam[i], hrefoffset); + ITypeInfoImpl_ElemDescAddHrefOffset(&pFuncDesc->elemdescFunc, hrefoffset); +} + /* ITypeInfo::GetFuncDesc * * Retrieves the FUNCDESC structure that contains information about a @@ -4805,12 +4843,14 @@ static HRESULT WINAPI ITypeInfo_fnGetFuncDesc( ITypeInfo2 *iface, UINT index, ITypeInfoImpl *This = (ITypeInfoImpl *)iface; const FUNCDESC *internal_funcdesc; HRESULT hr; + UINT hrefoffset = 0; TRACE("(%p) index %d\n", This, index); if (This->TypeAttr.typekind == TKIND_DISPATCH) hr = ITypeInfoImpl_GetInternalDispatchFuncDesc((ITypeInfo *)iface, index, - &internal_funcdesc, NULL); + &internal_funcdesc, NULL, + &hrefoffset); else hr = ITypeInfoImpl_GetInternalFuncDesc((ITypeInfo *)iface, index, &internal_funcdesc); @@ -4820,10 +4860,16 @@ static HRESULT WINAPI ITypeInfo_fnGetFuncDesc( ITypeInfo2 *iface, UINT index, return hr; } - return TLB_AllocAndInitFuncDesc( + hr = TLB_AllocAndInitFuncDesc( internal_funcdesc, ppFuncDesc, This->TypeAttr.typekind == TKIND_DISPATCH); + + if ((This->TypeAttr.typekind == TKIND_DISPATCH) && hrefoffset) + ITypeInfoImpl_FuncDescAddHrefOffset(*ppFuncDesc, hrefoffset); + + TRACE("-- 0x%08x\n", hr); + return hr; } static HRESULT TLB_AllocAndInitVarDesc( const VARDESC *src, VARDESC **dest_ptr ) @@ -6005,6 +6051,38 @@ static HRESULT WINAPI ITypeInfo_fnGetDllEntry( ITypeInfo2 *iface, MEMBERID memid return TYPE_E_ELEMENTNOTFOUND; } +/* internal function to make the inherited interfaces' methods appear + * part of the interface */ +static HRESULT ITypeInfoImpl_GetDispatchRefTypeInfo( ITypeInfo *iface, + HREFTYPE *hRefType, ITypeInfo **ppTInfo) +{ + ITypeInfoImpl *This = (ITypeInfoImpl *)iface; + HRESULT hr; + + TRACE("%p, 0x%x\n", iface, *hRefType); + + if (This->impltypelist && (*hRefType & DISPATCH_HREF_MASK)) + { + ITypeInfo *pSubTypeInfo; + + hr = ITypeInfo_GetRefTypeInfo(iface, This->impltypelist->hRef, &pSubTypeInfo); + if (FAILED(hr)) + return hr; + + hr = ITypeInfoImpl_GetDispatchRefTypeInfo(pSubTypeInfo, + hRefType, ppTInfo); + ITypeInfo_Release(pSubTypeInfo); + if (SUCCEEDED(hr)) + return hr; + } + *hRefType -= DISPATCH_HREF_OFFSET; + + if (!(*hRefType & DISPATCH_HREF_MASK)) + return ITypeInfo_GetRefTypeInfo(iface, *hRefType, ppTInfo); + else + return E_FAIL; +} + /* ITypeInfo::GetRefTypeInfo * * If a type description references other type descriptions, it retrieves @@ -6025,8 +6103,8 @@ static HRESULT WINAPI ITypeInfo_fnGetRefTypeInfo( result = S_OK; } else if (hRefType == -1 && - (((ITypeInfoImpl*) This)->TypeAttr.typekind == TKIND_DISPATCH) && - (((ITypeInfoImpl*) This)->TypeAttr.wTypeFlags & TYPEFLAG_FDUAL)) + (This->TypeAttr.typekind == TKIND_DISPATCH) && + (This->TypeAttr.wTypeFlags & TYPEFLAG_FDUAL)) { /* when we meet a DUAL dispinterface, we must create the interface * version of it. @@ -6056,6 +6134,12 @@ static HRESULT WINAPI ITypeInfo_fnGetRefTypeInfo( result = S_OK; + } else if ((hRefType != -1) && (hRefType & DISPATCH_HREF_MASK) && + (This->TypeAttr.typekind == TKIND_DISPATCH) && + (This->TypeAttr.wTypeFlags & TYPEFLAG_FDUAL)) + { + HREFTYPE href_dispatch = hRefType; + result = ITypeInfoImpl_GetDispatchRefTypeInfo((ITypeInfo *)iface, &href_dispatch, ppTInfo); } else { TLBRefType *ref_type; LIST_FOR_EACH_ENTRY(ref_type, &This->pTypeLib->ref_list, TLBRefType, entry)

1 0

← Newer
1
2
3
4
5
6
7
8
...
72
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 May 2007