April 2006 - Wine-commits - list.winehq.org

Paul Vriens : usp10: Fix return codes of ScriptGetFontProperties + tests.
by Alexandre Julliard 21 Apr '06

21 Apr '06

Module: wine Branch: refs/heads/master Commit: e56f6a38b1e876082c94baceed862665aa3dbb4c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e56f6a38b1e876082c94bac… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Fri Apr 21 08:00:14 2006 +0200 usp10: Fix return codes of ScriptGetFontProperties + tests. --- dlls/usp10/tests/usp10.c | 79 +++++++++++++++++++++++++++++++++++++++++++++- dlls/usp10/usp10.c | 22 +++++++------ 2 files changed, 90 insertions(+), 11 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 12907dc..f411ce8 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -32,6 +32,82 @@ #include <winuser.h> #include <winerror.h> #include <usp10.h> +void test_ScriptGetFontProperties(void) +{ + HRESULT hr; + HDC hdc; + HWND hwnd; + SCRIPT_CACHE psc,old_psc; + SCRIPT_FONTPROPERTIES sfp; + + /* Only do the bare minumum to get a valid hdc */ + hwnd = CreateWindowExA(0, "static", "", WS_POPUP, 0,0,100,100,0, 0, 0, NULL); + assert(hwnd != 0); + + hdc = GetDC(hwnd); + ok( hdc != NULL, "HDC failed to be created %p\n", hdc); + + /* Some sanity checks for ScriptGetFontProperties */ + + hr = ScriptGetFontProperties(NULL,NULL,NULL); + ok( hr == E_INVALIDARG, "(NULL,NULL,NULL), expected E_INVALIDARG, got %08x\n", (unsigned int)hr); + + hr = ScriptGetFontProperties(NULL,NULL,&sfp); + ok( hr == E_INVALIDARG, "(NULL,NULL,&sfp), expected E_INVALIDARG, got %08x\n", (unsigned int)hr); + + /* Set psc to NULL, to be able to check if a pointer is returned in psc */ + psc = NULL; + hr = ScriptGetFontProperties(NULL,&psc,NULL); + ok( hr == E_INVALIDARG, "(NULL,&psc,NULL), expected E_INVALIDARG, got %08x\n", (unsigned int)hr); + ok( psc == NULL, "Expected psc to be NULL, got %p\n", psc); + + /* Set psc to NULL, to be able to check if a pointer is returned in psc */ + psc = NULL; + hr = ScriptGetFontProperties(NULL,&psc,&sfp); + ok( hr == E_PENDING, "(NULL,&psc,&sfp), expected E_PENDING, got %08x\n", (unsigned int)hr); + ok( psc == NULL, "Expected psc to be NULL, got %p\n", psc); + + hr = ScriptGetFontProperties(hdc,NULL,NULL); + ok( hr == E_INVALIDARG, "(hdc,NULL,NULL), expected E_INVALIDARG, got %08x\n", (unsigned int)hr); + + hr = ScriptGetFontProperties(hdc,NULL,&sfp); + ok( hr == E_INVALIDARG, "(hdc,NULL,&sfp), expected E_INVALIDARG, got %08x\n", (unsigned int)hr); + + /* Set psc to NULL, to be able to check if a pointer is returned in psc */ + psc = NULL; + hr = ScriptGetFontProperties(hdc,&psc,NULL); + ok( hr == E_INVALIDARG, "(hdc,&psc,NULL), expected E_INVALIDARG, got %08x\n", (unsigned int)hr); + ok( psc == NULL, "Expected psc to be NULL, got %p\n", psc); + + /* Pass an uninitialized sfp */ + psc = NULL; + hr = ScriptGetFontProperties(hdc,&psc,&sfp); + ok( hr == E_INVALIDARG, "(hdc,&psc,&sfp) partly uninitialized, expected E_INVALIDARG, got %08x\n", (unsigned int)hr); + ok( psc != NULL, "Expected a pointer in psc, got NULL\n"); + ScriptFreeCache(&psc); + ok( psc == NULL, "Expected psc to be NULL, got %p\n", psc); + + /* Give it the correct cBytes, we don't care about what's coming back */ + sfp.cBytes = sizeof(SCRIPT_FONTPROPERTIES); + psc = NULL; + hr = ScriptGetFontProperties(hdc,&psc,&sfp); + ok( hr == S_OK, "(hdc,&psc,&sfp) partly initialized, expected S_OK, got %08x\n", (unsigned int)hr); + ok( psc != NULL, "Expected a pointer in psc, got NULL\n"); + + /* Save the psc pointer */ + old_psc = psc; + /* Now a NULL hdc again */ + hr = ScriptGetFontProperties(NULL,&psc,&sfp); + ok( hr == S_OK, "(NULL,&psc,&sfp), expected S_OK, got %08x\n", (unsigned int)hr); + ok( psc == old_psc, "Expected psc not to be changed, was %p is now %p\n", old_psc, psc); + ScriptFreeCache(&psc); + ok( psc == NULL, "Expected psc to be NULL, got %p\n", psc); + + /* Cleanup */ + ReleaseDC(hwnd, hdc); + DestroyWindow(hwnd); +} + START_TEST(usp10) { HRESULT hr; @@ -211,5 +287,6 @@ START_TEST(usp10) DeleteObject(hrgn); ReleaseDC(hwnd, hdc); DestroyWindow(hwnd); - return; + + test_ScriptGetFontProperties(); } diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index d1be349..efb942e 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -126,6 +126,10 @@ HRESULT WINAPI ScriptGetFontProperties(H TEXTMETRICW ptm; TRACE("%p,%p,%p\n", hdc, psc, sfp); + + if (!psc || !sfp) + return E_INVALIDARG; + if (!hdc && !*psc) { TRACE("No Script_Cache (psc) and no hdc. Ask for one. Hdc=%p, psc=%p\n", hdc, *psc); return E_PENDING; @@ -145,16 +149,14 @@ HRESULT WINAPI ScriptGetFontProperties(H return E_INVALIDARG; /* return something sensible? */ - if (NULL != sfp) { - sfp->wgBlank = 0; - if (GetTextMetricsW(phdc, &ptm)) - sfp->wgDefault = ptm.tmDefaultChar; - else - sfp->wgDefault = 0; - sfp->wgInvalid = 0; - sfp->wgKashida = 0xffff; - sfp->iKashidaWidth = 0; - } + sfp->wgBlank = 0; + if (GetTextMetricsW(phdc, &ptm)) + sfp->wgDefault = ptm.tmDefaultChar; + else + sfp->wgDefault = 0; + sfp->wgInvalid = 0; + sfp->wgKashida = 0xffff; + sfp->iKashidaWidth = 0; return 0; }

1 0

Mike McCormack : rpcrt4: Allocate RpcServerProtseq in a single place.
by Alexandre Julliard 21 Apr '06

21 Apr '06

Module: wine Branch: refs/heads/master Commit: 9b791e0983f722de1e1effeefe8f44c8a75db976 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9b791e0983f722de1e1effe… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Apr 21 15:38:25 2006 +0900 rpcrt4: Allocate RpcServerProtseq in a single place. --- dlls/rpcrt4/rpc_server.c | 31 +++++++++++++++++++++---------- 1 files changed, 21 insertions(+), 10 deletions(-) diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index 0fb4545..8889540 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -725,21 +725,34 @@ RPC_STATUS WINAPI RpcServerUseProtseqEpW } /*********************************************************************** + * alloc_serverprotoseq (internal) + */ +static RpcServerProtseq *alloc_serverprotoseq(UINT MaxCalls, char *Protseq, char *Endpoint) +{ + RpcServerProtseq* ps; + + ps = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(RpcServerProtseq)); + ps->MaxCalls = MaxCalls; + ps->Protseq = Protseq; + ps->Endpoint = Endpoint; + + return ps; +} + +/*********************************************************************** * RpcServerUseProtseqEpExA (RPCRT4.@) */ RPC_STATUS WINAPI RpcServerUseProtseqEpExA( unsigned char *Protseq, UINT MaxCalls, unsigned char *Endpoint, LPVOID SecurityDescriptor, PRPC_POLICY lpPolicy ) { + char *szps = (char*)Protseq, *szep = (char*)Endpoint; RpcServerProtseq* ps; - TRACE("(%s,%u,%s,%p,{%u,%lu,%lu})\n", debugstr_a( (char*)Protseq ), MaxCalls, - debugstr_a( (char*)Endpoint ), SecurityDescriptor, + TRACE("(%s,%u,%s,%p,{%u,%lu,%lu})\n", debugstr_a(szps), MaxCalls, + debugstr_a(szep), SecurityDescriptor, lpPolicy->Length, lpPolicy->EndpointFlags, lpPolicy->NICFlags ); - ps = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(RpcServerProtseq)); - ps->MaxCalls = MaxCalls; - ps->Protseq = RPCRT4_strdupA((char*)Protseq); - ps->Endpoint = RPCRT4_strdupA((char*)Endpoint); + ps = alloc_serverprotoseq(MaxCalls, RPCRT4_strdupA(szps), RPCRT4_strdupA(szep)); return RPCRT4_use_protseq(ps); } @@ -756,10 +769,8 @@ RPC_STATUS WINAPI RpcServerUseProtseqEpE debugstr_w( Endpoint ), SecurityDescriptor, lpPolicy->Length, lpPolicy->EndpointFlags, lpPolicy->NICFlags ); - ps = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(RpcServerProtseq)); - ps->MaxCalls = MaxCalls; - ps->Protseq = RPCRT4_strdupWtoA(Protseq); - ps->Endpoint = RPCRT4_strdupWtoA(Endpoint); + ps = alloc_serverprotoseq(MaxCalls, RPCRT4_strdupWtoA(Protseq), + RPCRT4_strdupWtoA(Endpoint)); return RPCRT4_use_protseq(ps); }

1 0

Alexandre Julliard : gdi: Added WineEngGetCharABCWidthsI stub for the non-freetype case.
by Alexandre Julliard 21 Apr '06

21 Apr '06

Module: wine Branch: refs/heads/master Commit: 80634596a516f79b07c63eb7c9b8448933614e0e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=80634596a516f79b07c63eb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 21 11:27:38 2006 +0200 gdi: Added WineEngGetCharABCWidthsI stub for the non-freetype case. --- dlls/gdi/freetype.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/gdi/freetype.c b/dlls/gdi/freetype.c index 9546986..1c923ec 100644 --- a/dlls/gdi/freetype.c +++ b/dlls/gdi/freetype.c @@ -4136,6 +4136,13 @@ BOOL WineEngGetCharABCWidths(GdiFont fon return FALSE; } +BOOL WineEngGetCharABCWidthsI(GdiFont font, UINT firstChar, UINT count, LPWORD pgi, + LPABC buffer) +{ + ERR("called but we don't have FreeType\n"); + return FALSE; +} + BOOL WineEngGetTextExtentPoint(GdiFont font, LPCWSTR wstr, INT count, LPSIZE size) {

1 0

Bill Medland : include: Expand pack nesting from 3 to 15 levels.
by Alexandre Julliard 21 Apr '06

21 Apr '06

Module: wine Branch: refs/heads/master Commit: 11fdd9584d2240ba99899c35bbebec8758065c62 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=11fdd9584d2240ba99899c3… Author: Bill Medland <billmedland(a)mercuryspeed.com> Date: Thu Apr 20 10:45:39 2006 -0700 include: Expand pack nesting from 3 to 15 levels. --- include/poppack.h | 194 ++++++++++++++++++++++++++++++++++++++++++++++++++++ include/pshpack1.h | 66 +++++++++++++++++- include/pshpack2.h | 66 +++++++++++++++++- include/pshpack4.h | 66 +++++++++++++++++- include/pshpack8.h | 66 +++++++++++++++++- 5 files changed, 445 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=11fdd9584d2240ba998…

1 0

Eric Kohl : widl: Implement support for unique pointers to strings.
by Alexandre Julliard 21 Apr '06

21 Apr '06

Module: wine Branch: refs/heads/master Commit: ff302bfc7a03a41a2b38259b5d222aa2d536f6cc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ff302bfc7a03a41a2b38259… Author: Eric Kohl <eric.kohl(a)t-online.de> Date: Thu Apr 20 22:28:41 2006 +0200 widl: Implement support for unique pointers to strings. --- tools/widl/typegen.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index b2f160a..033caf8 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1708,7 +1708,7 @@ void write_remoting_arguments(FILE *file fprintf(file, ";\n"); } - if (phase == PHASE_FREE) + if ((phase == PHASE_FREE) || (pointer_type == RPC_FC_UP)) print_phase_function(file, indent, "Pointer", phase, var->name, *type_offset); else print_phase_function(file, indent, "ConformantString", phase, var->name,

1 0

Stefan Dösinger : wined3d: Implement IWineD3DPalette.
by Alexandre Julliard 21 Apr '06

21 Apr '06

Module: wine Branch: refs/heads/master Commit: a6f71af021b0846771243026c4f3bdc55e6779bc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a6f71af021b084677124302… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Apr 21 00:00:30 2006 +0200 wined3d: Implement IWineD3DPalette. --- dlls/wined3d/device.c | 22 +++++++++- dlls/wined3d/palette.c | 92 ++++++++++++++++++++++++++++++++++++---- dlls/wined3d/wined3d_private.h | 14 ++++++ 3 files changed, 117 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 93acc84..790ac12 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1623,21 +1623,39 @@ HRESULT WINAPI IWineD3DDeviceImpl_Create HRESULT WINAPI IWineD3DDeviceImpl_CreatePalette(IWineD3DDevice *iface, DWORD Flags, PALETTEENTRY *PalEnt, IWineD3DPalette **Palette, IUnknown *Parent) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; IWineD3DPaletteImpl *object; + HRESULT hr; TRACE("(%p)->(%lx, %p, %p, %p)\n", This, Flags, PalEnt, Palette, Parent); /* Create the new object */ object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IWineD3DPaletteImpl)); if(!object) { ERR("Out of memory when allocating memory for a IWineD3DPalette implementation\n"); - return DDERR_OUTOFVIDEOMEMORY; + return E_OUTOFMEMORY; } object->lpVtbl = &IWineD3DPalette_Vtbl; object->ref = 1; + object->Flags = Flags; + object->parent = Parent; + object->wineD3DDevice = This; + object->palNumEntries = IWineD3DPaletteImpl_Size(Flags); + + object->hpal = CreatePalette((const LOGPALETTE*)&(object->palVersion)); + + if(!object->hpal) { + HeapFree( GetProcessHeap(), 0, object); + return E_OUTOFMEMORY; + } + + hr = IWineD3DPalette_SetEntries((IWineD3DPalette *) object, 0, 0, IWineD3DPaletteImpl_Size(Flags), PalEnt); + if(FAILED(hr)) { + IWineD3DPalette_Release((IWineD3DPalette *) object); + return hr; + } *Palette = (IWineD3DPalette *) object; - return DD_OK; + return WINED3D_OK; } HRESULT WINAPI IWineD3DDeviceImpl_Init3D(IWineD3DDevice *iface, WINED3DPRESENT_PARAMETERS* pPresentationParameters, D3DCB_CREATEADDITIONALSWAPCHAIN D3DCB_CreateAdditionalSwapChain) { diff --git a/dlls/wined3d/palette.c b/dlls/wined3d/palette.c index 650ac4e..ebc3429 100644 --- a/dlls/wined3d/palette.c +++ b/dlls/wined3d/palette.c @@ -29,6 +29,8 @@ #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); +#define SIZE_BITS (DDPCAPS_1BIT | DDPCAPS_2BIT | DDPCAPS_4BIT | DDPCAPS_8BIT) + HRESULT WINAPI IWineD3DPaletteImpl_QueryInterface(IWineD3DPalette *iface, REFIID refiid, void **obj) { IWineD3DPaletteImpl *This = (IWineD3DPaletteImpl *)iface; TRACE("(%p)->(%s,%p)\n",This,debugstr_guid(refiid),obj); @@ -67,24 +69,96 @@ ULONG WINAPI IWineD3DPaletteImpl_Release return ref; } +/* Not called from the vtable */ +DWORD IWineD3DPaletteImpl_Size(DWORD dwFlags) { + switch (dwFlags & SIZE_BITS) { + case DDPCAPS_1BIT: return 2; + case DDPCAPS_2BIT: return 4; + case DDPCAPS_4BIT: return 16; + case DDPCAPS_8BIT: return 256; + default: assert(0); return 256; + } +} + HRESULT WINAPI IWineD3DPaletteImpl_GetEntries(IWineD3DPalette *iface, DWORD Flags, DWORD Start, DWORD Count, PALETTEENTRY *PalEnt) { - FIXME("This is unimplemented for now(d3d7 merge)\n"); - return DDERR_INVALIDPARAMS; + IWineD3DPaletteImpl *This = (IWineD3DPaletteImpl *)iface; + + TRACE("(%p)->(%08lx,%ld,%ld,%p)\n",This,Flags,Start,Count,PalEnt); + + if (Flags != 0) return WINED3DERR_INVALIDCALL; /* unchecked */ + if (Start + Count > IWineD3DPaletteImpl_Size(This->Flags)) + return WINED3DERR_INVALIDCALL; + + if (This->Flags & DDPCAPS_8BITENTRIES) + { + unsigned int i; + LPBYTE entry = (LPBYTE)PalEnt; + + for (i=Start; i < Count+Start; i++) + *entry++ = This->palents[i].peRed; + } + else + memcpy(PalEnt, This->palents+Start, Count * sizeof(PALETTEENTRY)); + + return WINED3D_OK; } -HRESULT WINAPI IWineD3DPaletteImpl_SetEntries(IWineD3DPalette *iface, DWORD Flags, DWORD Start, DWORD Count, PALETTEENTRY *PalEnt) { - FIXME("This is unimplemented for now(d3d7 merge)\n"); - return DDERR_INVALIDPARAMS; +HRESULT WINAPI IWineD3DPaletteImpl_SetEntries(IWineD3DPalette *iface, DWORD Flags, DWORD Start, DWORD Count, PALETTEENTRY *PalEnt) +{ + IWineD3DPaletteImpl *This = (IWineD3DPaletteImpl *)iface; + ResourceList *res; + + TRACE("(%p)->(%08lx,%ld,%ld,%p)\n",This,Flags,Start,Count,PalEnt); + + if (This->Flags & DDPCAPS_8BITENTRIES) { + unsigned int i; + const BYTE* entry = (const BYTE*)PalEnt; + + for (i=Start; i < Count+Start; i++) + This->palents[i].peRed = *entry++; + } + else { + memcpy(This->palents+Start, PalEnt, Count * sizeof(PALETTEENTRY)); + + if (This->hpal) + SetPaletteEntries(This->hpal, Start, Count, This->palents+Start); + } + +#if 0 + /* Now, if we are in 'depth conversion mode', update the screen palette */ + /* FIXME: we need to update the image or we won't get palette fading. */ + if (This->ddraw->d->palette_convert != NULL) + This->ddraw->d->palette_convert(palent,This->screen_palents,start,count); +#endif + + /* If the palette is attached to the render target, update all render targets */ + + for(res = This->wineD3DDevice->resources; res != NULL; res=res->next) { + if(IWineD3DResource_GetType(res->resource) == D3DRTYPE_SURFACE) { + IWineD3DSurfaceImpl *impl = (IWineD3DSurfaceImpl *) res->resource; + if(impl->palette == This) + IWineD3DSurface_RealizePalette( (IWineD3DSurface *) res->resource); + } + } + + return WINED3D_OK; } HRESULT WINAPI IWineD3DPaletteImpl_GetCaps(IWineD3DPalette *iface, DWORD *Caps) { - FIXME("This is unimplemented for now(d3d7 merge)\n"); - return DDERR_INVALIDPARAMS; + IWineD3DPaletteImpl *This = (IWineD3DPaletteImpl *)iface; + TRACE("(%p)->(%p)\n", This, Caps); + + *Caps = This->Flags; + return WINED3D_OK; } HRESULT WINAPI IWineD3DPaletteImpl_GetParent(IWineD3DPalette *iface, IUnknown **Parent) { - FIXME("This is unimplemented for now(d3d7 merge)\n"); - return DDERR_INVALIDPARAMS; + IWineD3DPaletteImpl *This = (IWineD3DPaletteImpl *)iface; + TRACE("(%p)->(%p)\n", This, Parent); + + *Parent = (IUnknown *) This->parent; + IUnknown_AddRef( (IUnknown *) This->parent); + return WINED3D_OK; } const IWineD3DPaletteVtbl IWineD3DPalette_Vtbl = diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 55a92f7..9ac0e41 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -830,6 +830,7 @@ struct IWineD3DSurfaceImpl /* IWineD3DSurface fields */ IWineD3DBase *container; WINED3DSURFACET_DESC currentDesc; + IWineD3DPaletteImpl *palette; UINT textureName; UINT bytesPerPixel; @@ -1282,9 +1283,22 @@ struct IWineD3DPaletteImpl { /* IUnknown parts */ const IWineD3DPaletteVtbl *lpVtbl; LONG ref; + + IUnknown *parent; + IWineD3DDeviceImpl *wineD3DDevice; + + /* IWineD3DPalette */ + HPALETTE hpal; + WORD palVersion; /*| */ + WORD palNumEntries; /*| LOGPALETTE */ + PALETTEENTRY palents[256]; /*| */ + /* This is to store the palette in 'screen format' */ + int screen_palents[256]; + DWORD Flags; }; extern const IWineD3DPaletteVtbl IWineD3DPalette_Vtbl; +DWORD IWineD3DPaletteImpl_Size(DWORD dwFlags); /* DirectDraw utility functions */ extern WINED3DFORMAT pixelformat_for_depth(DWORD depth);

1 0

Alexandre Julliard : kernel: Make GetTickCount call NtGetTickCount.
by Alexandre Julliard 20 Apr '06

20 Apr '06

Module: wine Branch: refs/heads/master Commit: b0c63af12429f0455852d878337f60db33050cef URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b0c63af12429f0455852d87… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 20 20:13:12 2006 +0200 kernel: Make GetTickCount call NtGetTickCount. --- dlls/kernel/kernel_main.c | 10 +--------- 1 files changed, 1 insertions(+), 9 deletions(-) diff --git a/dlls/kernel/kernel_main.c b/dlls/kernel/kernel_main.c index a78439e..ed9fe60 100644 --- a/dlls/kernel/kernel_main.c +++ b/dlls/kernel/kernel_main.c @@ -59,8 +59,6 @@ static CRITICAL_SECTION_DEBUG critsect_d }; static CRITICAL_SECTION ldt_section = { &critsect_debug, -1, 0, 0, 0, 0 }; -static DWORD server_start_time; - /*********************************************************************** * locking for LDT routines */ @@ -106,10 +104,6 @@ static void thread_detach(void) static BOOL process_attach(void) { SYSTEM_INFO si; - SYSTEM_TIMEOFDAY_INFORMATION sti; - - NtQuerySystemInformation( SystemTimeOfDayInformation, &sti, sizeof(sti), NULL ); - RtlTimeToSecondsSince1970( &sti.liKeBootTime, &server_start_time ); /* FIXME: should probably be done in ntdll */ GetSystemInfo( &si ); @@ -230,7 +224,5 @@ INT WINAPI MulDiv( INT nMultiplicand, IN */ DWORD WINAPI GetTickCount(void) { - struct timeval t; - gettimeofday( &t, NULL ); - return ((t.tv_sec - server_start_time) * 1000) + (t.tv_usec / 1000); + return NtGetTickCount(); }

1 0

Jacek Caban : ntdll: Added NtGetTickCount implementation.
by Alexandre Julliard 20 Apr '06

20 Apr '06

Module: wine Branch: refs/heads/master Commit: 2333c805008e3b1e22c809831612b8c2705b79df URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2333c805008e3b1e22c8098… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 19 21:21:52 2006 +0200 ntdll: Added NtGetTickCount implementation. --- dlls/ntdll/ntdll.spec | 4 ++-- dlls/ntdll/time.c | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 38ded31..90afeb2 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -177,7 +177,7 @@ # @ stub NtFreeUserPhysicalPages @ stdcall NtGetContextThread(long ptr) # @ stub NtGetDevicePowerState @ stub NtGetPlugPlayEvent -@ stub NtGetTickCount +@ stdcall NtGetTickCount() # @ stub NtGetWriteWatch @ stub NtImpersonateAnonymousToken @ stub NtImpersonateClientOfPort @@ -1019,7 +1019,7 @@ # @ stub ZwFreeUserPhysicalPages @ stdcall ZwGetContextThread(long ptr) NtGetContextThread # @ stub ZwGetDevicePowerState @ stub ZwGetPlugPlayEvent -@ stub ZwGetTickCount +@ stdcall ZwGetTickCount() NtGetTickCount # @ stub ZwGetWriteWatch # @ stub ZwImpersonateAnonymousToken @ stub ZwImpersonateClientOfPort diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index 79a1967..cd99619 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -877,6 +877,20 @@ NTSTATUS WINAPI NtQueryPerformanceCounte return STATUS_SUCCESS; } + +/****************************************************************************** + * NtGetTickCount (NTDLL.@) + * ZwGetTickCount (NTDLL.@) + */ +ULONG WINAPI NtGetTickCount(void) +{ + struct timeval current_time; + + gettimeofday(&current_time, NULL); + return (current_time.tv_sec - server_start_time)*1000 + current_time.tv_usec/1000; +} + + /*********************************************************************** * TIME_GetTZAsStr [internal] *

1 0

Alexandre Julliard : user: Don' t return CLASS_OTHER_PROCESS when modifying a class.
by Alexandre Julliard 20 Apr '06

20 Apr '06

Module: wine Branch: refs/heads/master Commit: bace1ef6f0365f5024648800b756c531ce96f048 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bace1ef6f0365f502464880… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 20 19:50:01 2006 +0200 user: Don't return CLASS_OTHER_PROCESS when modifying a class. Based on a patch by qingdoa daoo. --- dlls/user/class.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user/class.c b/dlls/user/class.c index ff89bb9..0e9d4ff 100644 --- a/dlls/user/class.c +++ b/dlls/user/class.c @@ -76,14 +76,14 @@ static CLASS *get_class_ptr( HWND hwnd, if (ptr) { if (ptr != WND_OTHER_PROCESS && ptr != WND_DESKTOP) return ptr->class; + if (!write_access) return CLASS_OTHER_PROCESS; - if (write_access && (ptr == WND_DESKTOP || IsWindow( hwnd ))) /* check other processes */ + /* modifying classes in other processes is not allowed */ + if (ptr == WND_DESKTOP || IsWindow( hwnd )) { - /* modifying classes in other processes is not allowed */ SetLastError( ERROR_ACCESS_DENIED ); return NULL; } - return CLASS_OTHER_PROCESS; } SetLastError( ERROR_INVALID_WINDOW_HANDLE ); return NULL;

1 0

James Hawkins : advpack: Implement LaunchINFSectionW.
by Alexandre Julliard 20 Apr '06

20 Apr '06

Module: wine Branch: refs/heads/master Commit: 924d91ca057b25dd7d136b0109efad2ece3b321a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=924d91ca057b25dd7d136b0… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Apr 20 10:09:44 2006 -0500 advpack: Implement LaunchINFSectionW. --- dlls/advpack/install.c | 45 ++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 40 insertions(+), 5 deletions(-) diff --git a/dlls/advpack/install.c b/dlls/advpack/install.c index af8213e..6432406 100644 --- a/dlls/advpack/install.c +++ b/dlls/advpack/install.c @@ -516,14 +516,49 @@ INT WINAPI LaunchINFSectionA(HWND hWnd, * 'A' Always reboot. * 'I' Reboot if needed (default). * 'N' No reboot. - * - * BUGS - * Unimplemented. */ INT WINAPI LaunchINFSectionW(HWND hWnd, HINSTANCE hInst, LPWSTR cmdline, INT show) { - FIXME("(%p, %p, %s, %i): stub\n", hWnd, hInst, debugstr_w(cmdline), show); - return 0; + ADVInfo info; + LPWSTR cmdline_copy, cmdline_ptr; + LPWSTR inf_filename, install_sec; + LPWSTR str_flags; + DWORD flags = 0; + HRESULT hr = S_OK; + + TRACE("(%p, %p, %s, %d)\n", hWnd, hInst, debugstr_w(cmdline), show); + + if (!cmdline) + return E_INVALIDARG; + + cmdline_copy = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(cmdline) + 1) * sizeof(WCHAR)); + cmdline_ptr = cmdline_copy; + lstrcpyW(cmdline_copy, cmdline); + + inf_filename = get_parameter(&cmdline_ptr, ','); + install_sec = get_parameter(&cmdline_ptr, ','); + + str_flags = get_parameter(&cmdline_ptr, ','); + if (str_flags) + flags = atolW(str_flags); + + ZeroMemory(&info, sizeof(ADVInfo)); + + hr = install_init(inf_filename, install_sec, NULL, flags, &info); + if (hr != S_OK) + goto done; + + hr = spapi_install(&info); + if (hr != S_OK) + goto done; + + hr = adv_install(&info); + +done: + install_release(&info); + HeapFree(GetProcessHeap(), 0, cmdline_copy); + + return hr; } /***********************************************************************

1 0