June 2006 - Wine-Commits - list.winehq.org

Stefan Dösinger : ddraw: Palette refcounting fixes + tests.
by Alexandre Julliard June 19, 2006

June 19, 2006

Module: wine Branch: refs/heads/master Commit: 01273e7eb67a7bd918a246e0d76f36fd628f6a34 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=01273e7eb67a7bd918a246e… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sat Jun 17 15:47:52 2006 +0200 ddraw: Palette refcounting fixes + tests. --- dlls/ddraw/ddraw.c | 21 +++++- dlls/ddraw/palette.c | 1 dlls/ddraw/surface.c | 4 + dlls/ddraw/tests/.gitignore | 1 dlls/ddraw/tests/Makefile.in | 3 + dlls/ddraw/tests/refcount.c | 147 ++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 174 insertions(+), 3 deletions(-) create mode 100644 dlls/ddraw/tests/refcount.c diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index cdf4d46..5fad1cd 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2950,13 +2950,29 @@ IDirectDrawImpl_CreatePalette(IDirectDra HRESULT hr = DDERR_GENERIC; TRACE("(%p)->(%lx,%p,%p,%p)\n", This, Flags, ColorTable, Palette, pUnkOuter); - if(pUnkOuter != NULL) return CLASS_E_NOAGGREGATION; /* unchecked */ + if(pUnkOuter != NULL) + { + WARN("pUnkOuter is %p, returning CLASS_E_NOAGGREGATION\n", pUnkOuter); + return CLASS_E_NOAGGREGATION; + } + + /* The refcount test shows that a cooplevel is required for this */ + if(!This->cooperative_level) + { + WARN("No cooperative level set, returning DDERR_NOCOOPERATIVELEVELSET\n"); + return DDERR_NOCOOPERATIVELEVELSET; + } object = HeapAlloc(GetProcessHeap(), 0, sizeof(IDirectDrawPaletteImpl)); - if(!object) return E_OUTOFMEMORY; + if(!object) + { + ERR("Out of memory when allocating memory for a palette implementation\n"); + return E_OUTOFMEMORY; + } ICOM_INIT_INTERFACE(object, IDirectDrawPalette, IDirectDrawPalette_Vtbl); object->ref = 1; + object->ddraw_owner = This; hr = IWineD3DDevice_CreatePalette(This->wineD3DDevice, Flags, ColorTable, &object->wineD3DPalette, (IUnknown *) ICOM_INTERFACE(object, IDirectDrawPalette) ); if(hr != DD_OK) @@ -2965,6 +2981,7 @@ IDirectDrawImpl_CreatePalette(IDirectDra return hr; } + IDirectDraw7_AddRef(iface); *Palette = ICOM_INTERFACE(object, IDirectDrawPalette); return DD_OK; } diff --git a/dlls/ddraw/palette.c b/dlls/ddraw/palette.c index 66b8844..97a9ef4 100644 --- a/dlls/ddraw/palette.c +++ b/dlls/ddraw/palette.c @@ -104,6 +104,7 @@ IDirectDrawPaletteImpl_Release(IDirectDr if (ref == 0) { IWineD3DPalette_Release(This->wineD3DPalette); + IDirectDraw7_Release(ICOM_INTERFACE(This->ddraw_owner, IDirectDraw7)); HeapFree(GetProcessHeap(), 0, This); } diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 212b9b3..5590c80 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -360,6 +360,10 @@ IDirectDrawSurfaceImpl_Release(IDirectDr } } + /* The refcount test shows that the palette is detached when the surface is destroyed */ + IDirectDrawSurface7_SetPalette(ICOM_INTERFACE(This, IDirectDrawSurface7), + NULL); + /* Loop through all complex attached surfaces, * and destroy them */ diff --git a/dlls/ddraw/tests/.gitignore b/dlls/ddraw/tests/.gitignore index 7daa343..348040a 100644 --- a/dlls/ddraw/tests/.gitignore +++ b/dlls/ddraw/tests/.gitignore @@ -2,4 +2,5 @@ Makefile d3d.ok ddrawmodes.ok dsurface.ok +refcount.ok testlist.c diff --git a/dlls/ddraw/tests/Makefile.in b/dlls/ddraw/tests/Makefile.in index d6fc8b1..ec8488f 100644 --- a/dlls/ddraw/tests/Makefile.in +++ b/dlls/ddraw/tests/Makefile.in @@ -9,7 +9,8 @@ EXTRALIBS = -ldxguid CTESTS = \ d3d.c \ ddrawmodes.c \ - dsurface.c + dsurface.c \ + refcount.c @MAKE_TEST_RULES@ diff --git a/dlls/ddraw/tests/refcount.c b/dlls/ddraw/tests/refcount.c new file mode 100644 index 0000000..466868e --- /dev/null +++ b/dlls/ddraw/tests/refcount.c @@ -0,0 +1,147 @@ +/* + * Some unit tests for ddraw reference counting + * + * Copyright (C) 2006 Stefan Dösinger + * + * 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 + */ +#define COBJMACROS + +#include <assert.h> +#include "wine/test.h" +#include "ddraw.h" +#include "d3d.h" +#include "unknwn.h" + +static HRESULT (WINAPI *pDirectDrawCreateEx)(LPGUID,LPVOID*,REFIID,LPUNKNOWN); + +static void init_function_pointers(void) +{ + HMODULE hmod = GetModuleHandleA("ddraw.dll"); + + if(hmod) + { + pDirectDrawCreateEx = (void*)GetProcAddress(hmod, "DirectDrawCreateEx"); + } +} + +unsigned long getRefcount(IUnknown *iface) +{ + IUnknown_AddRef(iface); + return IUnknown_Release(iface); +} + +static void test_ddraw(void) +{ + HRESULT hr; + unsigned long ref; + IDirectDraw7 *DDraw; + IDirectDrawPalette *palette; + IDirectDrawSurface7 *surface; + PALETTEENTRY Table[256]; + DDSURFACEDESC2 ddsd; + + hr = pDirectDrawCreateEx(NULL, (void **) &DDraw, &IID_IDirectDraw7, NULL); + ok(hr == DD_OK || hr==DDERR_NODIRECTDRAWSUPPORT, "DirectDrawCreateEx returned: %lx\n", hr); + if(!DDraw) + { + trace("Couldn't create DDraw interface, skipping tests\n"); + return; + } + + ref = getRefcount( (IUnknown *) DDraw); + ok(ref == 1, "Got refcount %ld, expected 1\n", ref); + + /* Fails without a cooplevel */ + hr = IDirectDraw7_CreatePalette(DDraw, DDPCAPS_ALLOW256 | DDPCAPS_8BIT, Table, &palette, NULL); + ok(hr == DDERR_NOCOOPERATIVELEVELSET, "CreatePalette returned %08lx\n", hr); + + /* This check is before the cooplevel check */ + hr = IDirectDraw7_CreatePalette(DDraw, DDPCAPS_ALLOW256 | DDPCAPS_8BIT, Table, &palette, (void *) 0xdeadbeef); + ok(hr == CLASS_E_NOAGGREGATION, "CreatePalette returned %08lx\n", hr); + + hr = IDirectDraw7_SetCooperativeLevel(DDraw, 0, DDSCL_NORMAL); + ok(hr == DD_OK, "SetCooperativeLevel failed with %08lx\n", hr); + + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; + ddsd.dwWidth = 64; + ddsd.dwHeight = 64; + ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; + ddsd.ddpfPixelFormat.dwSize = sizeof(ddsd.ddpfPixelFormat); + ddsd.ddpfPixelFormat.dwFlags = DDPF_PALETTEINDEXED8 | DDPF_RGB; + ddsd.ddpfPixelFormat.dwRGBBitCount = 8; + + hr = IDirectDraw7_CreateSurface(DDraw, &ddsd, &surface, NULL); + ok(hr == DD_OK, "CreateSurface failed with %08lx\n", hr); + + /* DDraw refcount increased by 1 */ + ref = getRefcount( (IUnknown *) DDraw); + ok(ref == 2, "Got refcount %ld, expected 2\n", ref); + + /* Surface refcount starts with 1 */ + ref = getRefcount( (IUnknown *) surface); + ok(ref == 1, "Got refcount %ld, expected 1\n", ref); + + hr = IDirectDraw7_CreatePalette(DDraw, DDPCAPS_ALLOW256 | DDPCAPS_8BIT, Table, &palette, NULL); + ok(hr == DD_OK, "CreatePalette returned %08lx\n", hr); + + /* DDraw refcount increased by 1 */ + ref = getRefcount( (IUnknown *) DDraw); + ok(ref == 3, "Got refcount %ld, expected 3\n", ref); + + /* Palette starts with 1 */ + ref = getRefcount( (IUnknown *) palette); + ok(ref == 1, "Got refcount %ld, expected 1\n", ref); + + /* Test attaching a palette to a surface */ + hr = IDirectDrawSurface7_SetPalette(surface, palette); + ok(hr == DD_OK, "IDirectDrawSurface_SetPalette failed with %08lx\n", hr); + + /* Palette refcount increased, surface stays the same */ + ref = getRefcount( (IUnknown *) palette); + ok(ref == 2, "Got refcount %ld, expected 2\n", ref); + ref = getRefcount( (IUnknown *) surface); + ok(ref == 1, "Got refcount %ld, expected 1\n", ref); + + IDirectDrawSurface7_Release(surface); + /* Incresed before - decrease now */ + ref = getRefcount( (IUnknown *) DDraw); + ok(ref == 2, "Got refcount %ld, expected 2\n", ref); + + /* Releasing the surface detaches the palette */ + ref = getRefcount( (IUnknown *) palette); + ok(ref == 1, "Got refcount %ld, expected 1\n", ref); + + IDirectDrawPalette_Release(palette); + + /* Incresed before - decrease now */ + ref = getRefcount( (IUnknown *) DDraw); + ok(ref == 1, "Got refcount %ld, expected 1\n", ref); + + IDirectDraw7_Release(DDraw); +} + +START_TEST(refcount) +{ + init_function_pointers(); + if(!pDirectDrawCreateEx) + { + trace("function DirectDrawCreateEx not available, skipping tests\n"); + return; + } + test_ddraw(); +}

1 0

Robert Shearman : ntdll: If ObjectAttributes is NULL then an error is returned at the
by Alexandre Julliard June 19, 2006

June 19, 2006

Module: wine Branch: refs/heads/master Commit: e4b51580e1ba482e3a3f66bcd5e24f790decf42b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e4b51580e1ba482e3a3f66b… Author: Robert Shearman <rob(a)codeweavers.com> Date: Sat Jun 17 12:32:05 2006 +0100 ntdll: If ObjectAttributes is NULL then an error is returned at the start of the NtOpenSymbolicLinkObject, therefore ObjectAttributes does not need to be checked for NULL later on in the function. --- dlls/ntdll/om.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/om.c b/dlls/ntdll/om.c index 19d1901..41855dc 100644 --- a/dlls/ntdll/om.c +++ b/dlls/ntdll/om.c @@ -506,8 +506,8 @@ NTSTATUS WINAPI NtOpenSymbolicLinkObject SERVER_START_REQ(open_symlink) { req->access = DesiredAccess; - req->attributes = ObjectAttributes ? ObjectAttributes->Attributes : 0; - req->rootdir = ObjectAttributes ? ObjectAttributes->RootDirectory : 0; + req->attributes = ObjectAttributes->Attributes; + req->rootdir = ObjectAttributes->RootDirectory; if (ObjectAttributes->ObjectName) wine_server_add_data(req, ObjectAttributes->ObjectName->Buffer, ObjectAttributes->ObjectName->Length);

1 0

Robert Shearman : rpcrt4: Use the thread pool in the RPC server for processing packets.
by Alexandre Julliard June 19, 2006

June 19, 2006

Module: wine Branch: refs/heads/master Commit: 1437f8bd8c7a82ab1568ea10fe46f2d0a0837fe4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1437f8bd8c7a82ab1568ea1… Author: Robert Shearman <rob(a)codeweavers.com> Date: Sat Jun 17 12:31:32 2006 +0100 rpcrt4: Use the thread pool in the RPC server for processing packets. --- dlls/rpcrt4/rpc_server.c | 92 +++------------------------------------------- 1 files changed, 5 insertions(+), 87 deletions(-) diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index d8cc634..5beff9a 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -53,7 +53,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(rpc); typedef struct _RpcPacket { - struct _RpcPacket* next; struct _RpcConnection* conn; RpcPktHdr* hdr; RPC_MESSAGE* msg; @@ -103,20 +102,9 @@ static HANDLE mgr_mutex; /* set when server thread has finished opening connections */ static HANDLE server_ready_event; -static CRITICAL_SECTION spacket_cs; -static CRITICAL_SECTION_DEBUG spacket_cs_debug = -{ - 0, 0, &spacket_cs, - { &spacket_cs_debug.ProcessLocksList, &spacket_cs_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": spacket_cs") } -}; -static CRITICAL_SECTION spacket_cs = { &spacket_cs_debug, -1, 0, 0, 0, 0 }; - -static RpcPacket* spacket_head; -static RpcPacket* spacket_tail; static HANDLE server_sem; -static LONG worker_count, worker_free, worker_tls; +static LONG worker_tls; static UUID uuid_nil; @@ -165,34 +153,6 @@ static RpcServerInterface* RPCRT4_find_i return cif; } -static void RPCRT4_push_packet(RpcPacket* packet) -{ - packet->next = NULL; - EnterCriticalSection(&spacket_cs); - if (spacket_tail) { - spacket_tail->next = packet; - spacket_tail = packet; - } else { - spacket_head = packet; - spacket_tail = packet; - } - LeaveCriticalSection(&spacket_cs); -} - -static RpcPacket* RPCRT4_pop_packet(void) -{ - RpcPacket* packet; - EnterCriticalSection(&spacket_cs); - packet = spacket_head; - if (packet) { - spacket_head = packet->next; - if (!spacket_head) spacket_tail = NULL; - } - LeaveCriticalSection(&spacket_cs); - if (packet) packet->next = NULL; - return packet; -} - typedef struct { PRPC_MESSAGE msg; void* buf; @@ -350,52 +310,12 @@ fail: static DWORD CALLBACK RPCRT4_worker_thread(LPVOID the_arg) { - DWORD obj; - RpcPacket* pkt; - - for (;;) { - /* idle timeout after 5s */ - obj = WaitForSingleObject(server_sem, 5000); - if (obj == WAIT_TIMEOUT) { - /* if another idle thread exist, self-destruct */ - if (worker_free > 1) break; - continue; - } - pkt = RPCRT4_pop_packet(); - if (!pkt) continue; - InterlockedDecrement(&worker_free); - for (;;) { - RPCRT4_process_packet(pkt->conn, pkt->hdr, pkt->msg); - HeapFree(GetProcessHeap(), 0, pkt); - /* try to grab another packet here without waiting - * on the semaphore, in case it hits max */ - pkt = RPCRT4_pop_packet(); - if (!pkt) break; - /* decrement semaphore */ - WaitForSingleObject(server_sem, 0); - } - InterlockedIncrement(&worker_free); - } - InterlockedDecrement(&worker_free); - InterlockedDecrement(&worker_count); + RpcPacket *pkt = the_arg; + RPCRT4_process_packet(pkt->conn, pkt->hdr, pkt->msg); + HeapFree(GetProcessHeap(), 0, pkt); return 0; } -static void RPCRT4_create_worker_if_needed(void) -{ - if (!worker_free && worker_count < MAX_THREADS) { - HANDLE thread; - InterlockedIncrement(&worker_count); - InterlockedIncrement(&worker_free); - thread = CreateThread(NULL, 0, RPCRT4_worker_thread, NULL, 0, NULL); - if (thread) CloseHandle(thread); - else { - InterlockedDecrement(&worker_free); - InterlockedDecrement(&worker_count); - } - } -} - static DWORD CALLBACK RPCRT4_io_thread(LPVOID the_arg) { RpcConnection* conn = (RpcConnection*)the_arg; @@ -429,9 +349,7 @@ #else packet->conn = conn; packet->hdr = hdr; packet->msg = msg; - RPCRT4_create_worker_if_needed(); - RPCRT4_push_packet(packet); - ReleaseSemaphore(server_sem, 1, NULL); + QueueUserWorkItem(RPCRT4_worker_thread, packet, WT_EXECUTEDEFAULT); #endif msg = NULL; }

1 0

Robert Shearman : ole32: Document CoCreateFreeThreadedMarshaler.
by Alexandre Julliard June 19, 2006

June 19, 2006

Module: wine Branch: refs/heads/master Commit: 1ddc722ec243200ec5b16792cbfde5b68d151c84 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1ddc722ec243200ec5b1679… Author: Robert Shearman <rob(a)codeweavers.com> Date: Sat Jun 17 12:31:54 2006 +0100 ole32: Document CoCreateFreeThreadedMarshaler. --- dlls/ole32/ftmarshal.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/ftmarshal.c b/dlls/ole32/ftmarshal.c index 7493bab..6f80091 100644 --- a/dlls/ole32/ftmarshal.c +++ b/dlls/ole32/ftmarshal.c @@ -302,6 +302,23 @@ static const IMarshalVtbl ftmvtbl = /*********************************************************************** * CoCreateFreeThreadedMarshaler [OLE32.@] * + * Creates a free-threaded marshaler. + * + * PARAMS + * punkOuter [I] Optional. Outer unknown. + * ppunkMarshal [O] On return, the inner unknown of the created free-threaded marshaler. + * + * RETURNS + * Success: S_OK + * Failure: E_OUTOFMEMORY if no memory available to create object. + * + * NOTES + * Objects that ensure their state is maintained consistent when used by + * multiple threads and reference no single-threaded objects are known as + * free-threaded. The free-threaded marshaler enables these objects to be + * efficiently marshaled within the same process, by not creating proxies + * (as they aren't needed for the object to be safely used), whilst still + * allowing the object to be used in inter-process and inter-machine contexts. */ HRESULT WINAPI CoCreateFreeThreadedMarshaler (LPUNKNOWN punkOuter, LPUNKNOWN * ppunkMarshal) {

1 0

Robert Shearman : ole32: Reuse event handles used for COM calls.
by Alexandre Julliard June 19, 2006

June 19, 2006

Module: wine Branch: refs/heads/master Commit: aa09031c78016cd8d0ff4108b6b132ba727a9b9e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=aa09031c78016cd8d0ff410… Author: Robert Shearman <rob(a)codeweavers.com> Date: Sat Jun 17 12:31:44 2006 +0100 ole32: Reuse event handles used for COM calls. This reduces the number of server calls during a COM call by half. --- dlls/ole32/rpc.c | 25 +++++++++++++++++++++++-- 1 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index e30989d..cf49698 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -100,6 +100,7 @@ typedef struct OXID oxid; /* apartment in which the channel is valid */ DWORD dest_context; /* returned from GetDestCtx */ LPVOID dest_context_data; /* returned from GetDestCtx */ + HANDLE event; /* cached event handle */ } ClientRpcChannelBuffer; struct dispatch_params @@ -152,6 +153,7 @@ static ULONG WINAPI ClientRpcChannelBuff if (ref) return ref; + if (This->event) CloseHandle(This->event); RpcBindingFree(&This->bind); HeapFree(GetProcessHeap(), 0, This); return 0; @@ -207,6 +209,24 @@ static HRESULT WINAPI ServerRpcChannelBu return E_NOTIMPL; } +static HANDLE ClientRpcChannelBuffer_GetEventHandle(ClientRpcChannelBuffer *This) +{ + HANDLE event = InterlockedExchangePointer(&This->event, NULL); + + /* Note: must be auto-reset event so we can reuse it without a call + * to ResetEvent */ + if (!event) event = CreateEventW(NULL, FALSE, FALSE, NULL); + + return event; +} + +static void ClientRpcChannelBuffer_ReleaseEventHandle(ClientRpcChannelBuffer *This, HANDLE event) +{ + if (InterlockedCompareExchangePointer(&This->event, event, NULL)) + /* already a handle cached in This */ + CloseHandle(event); +} + /* this thread runs an outgoing RPC */ static DWORD WINAPI rpc_sendreceive_thread(LPVOID param) { @@ -271,7 +291,7 @@ static HRESULT WINAPI ClientRpcChannelBu RpcBindingInqObject(msg->Handle, &ipid); hr = ipid_get_dispatch_params(&ipid, &apt, &params->stub, &params->chan); - params->handle = CreateEventW(NULL, FALSE, FALSE, NULL); + params->handle = ClientRpcChannelBuffer_GetEventHandle(This); if ((hr == S_OK) && !apt->multi_threaded) { TRACE("Calling apartment thread 0x%08lx...\n", apt->tid); @@ -315,7 +335,7 @@ static HRESULT WINAPI ClientRpcChannelBu if (WaitForSingleObject(params->handle, 0)) hr = CoWaitForMultipleHandles(0, INFINITE, 1, &params->handle, &index); } - CloseHandle(params->handle); + ClientRpcChannelBuffer_ReleaseEventHandle(This, params->handle); if (hr == S_OK) hr = params->hr; @@ -478,6 +498,7 @@ HRESULT RPC_CreateClientChannel(const OX apartment_getoxid(COM_CurrentApt(), &This->oxid); This->dest_context = dest_context; This->dest_context_data = dest_context_data; + This->event = NULL; *chan = (IRpcChannelBuffer*)This;

1 0

Thomas Weidenmueller : widl: Fix updating the proc offset.
by Alexandre Julliard June 19, 2006

June 19, 2006

Module: wine Branch: refs/heads/master Commit: af994f4e4f7b417e37239f7d44fb8b258bcfb0ec URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=af994f4e4f7b417e37239f7… Author: Thomas Weidenmueller <wine-patches(a)reactsoft.com> Date: Sun Jun 18 19:45:50 2006 +0200 widl: Fix updating the proc offset. --- tools/widl/client.c | 6 +++--- tools/widl/server.c | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index 39ab18a..6f8773e 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -271,14 +271,14 @@ static void write_function_stubs(type_t while (NEXT_LINK(var)) var = NEXT_LINK(var); while (var) { - proc_offset += get_size_procformatstring_var(var); + *proc_offset += get_size_procformatstring_var(var); var = PREV_LINK(var); } } if (!is_void(def->type, NULL)) - proc_offset += get_size_procformatstring_var(def); + *proc_offset += get_size_procformatstring_var(def); else - proc_offset += 2; /* FC_END and FC_PAD */ + *proc_offset += 2; /* FC_END and FC_PAD */ indent--; print_client("}\n"); diff --git a/tools/widl/server.c b/tools/widl/server.c index 97f5102..72d5ae7 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -276,7 +276,7 @@ static void write_function_stubs(type_t print_server("NdrConvert(\n"); indent++; print_server("(PMIDL_STUB_MESSAGE)&_StubMsg,\n"); - print_server("(PFORMAT_STRING)&__MIDL_ProcFormatString.Format[%u]);\n", proc_offset); + print_server("(PFORMAT_STRING)&__MIDL_ProcFormatString.Format[%u]);\n", *proc_offset); indent -= 2; fprintf(server, "\n"); @@ -422,14 +422,14 @@ static void write_function_stubs(type_t while (NEXT_LINK(var)) var = NEXT_LINK(var); while (var) { - proc_offset += get_size_procformatstring_var(var); + *proc_offset += get_size_procformatstring_var(var); var = PREV_LINK(var); } } if (!is_void(def->type, NULL)) - proc_offset += get_size_procformatstring_var(def); + *proc_offset += get_size_procformatstring_var(def); else - proc_offset += 2; /* FC_END and FC_PAD */ + *proc_offset += 2; /* FC_END and FC_PAD */ func = PREV_LINK(func); }

1 0

Fatih Aşıcı : winecfg: Update Turkish resorce file.
by Alexandre Julliard June 19, 2006

June 19, 2006

Module: wine Branch: refs/heads/master Commit: 1b7da2379f526dd6f9e6236c3e4135efd4db9954 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1b7da2379f526dd6f9e6236… Author: Fatih Aşıcı <fatih.asici(a)gmail.com> Date: Sat Jun 17 14:18:38 2006 +0300 winecfg: Update Turkish resorce file. --- programs/winecfg/Tr.rc | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/programs/winecfg/Tr.rc b/programs/winecfg/Tr.rc index 21149c3..fd51ddc 100644 --- a/programs/winecfg/Tr.rc +++ b/programs/winecfg/Tr.rc @@ -165,7 +165,11 @@ BEGIN GROUPBOX " DirectSound ",IDC_STATIC,8,205,244,60 LTEXT "Donan�m H�zland�rmas�: ",IDC_STATIC,15,215,90,10 COMBOBOX IDC_DSOUND_HW_ACCEL,100,213,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "S�r�c� Em�lasyonu",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,230,230,10 + LTEXT "�ntan�ml� �rnekleme H�z�:",IDC_STATIC,15,232,70,8 + COMBOBOX IDC_DSOUND_RATES,90,230,42,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "�rnek Ba��na Bit Say�s�:",IDC_STATIC,137,232,80,8 + COMBOBOX IDC_DSOUND_BITS,220,230,30,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "S�r�c� Em�lasyonu",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,250,230,10 END IDD_DESKTOP_INTEGRATION DIALOG DISCARDABLE 0, 0, 260, 250 @@ -210,3 +214,14 @@ BEGIN IDS_SHELL_FOLDER "Klas�r" IDS_LINKS_TO "Hedef Dizin" END + +STRINGTABLE DISCARDABLE +BEGIN +IDS_DLL_WARNING "Bu kitapl��n y�kleme s�ras�n�n de�i�tirilmesi �nerilmez.\nBunu yapmak istedi�inizden emin misiniz?" +IDS_DLL_WARNING_CAPTION "Uyar�: sistem kitapl��" +IDS_DLL_NATIVE "do�al" +IDS_DLL_BUILTIN "yerle�ik" +IDS_DLL_NATIVE_BUILTIN "do�al, yerle�ik" +IDS_DLL_BUILTIN_NATIVE "yerle�ik, do�al" +IDS_DLL_DISABLED "devre d��" +END

1 0

Saulius Krasuckas : lz32: Enable old test and expand it.
by Alexandre Julliard June 19, 2006

June 19, 2006

Module: wine Branch: refs/heads/master Commit: 183da10af457f3b7ed0f0b13f49570e52a91256e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=183da10af457f3b7ed0f0b1… Author: Saulius Krasuckas <saulius.krasuckas(a)ieee.org> Date: Fri Jun 16 22:43:15 2006 +0300 lz32: Enable old test and expand it. --- dlls/lz32/tests/lzexpand_main.c | 45 +++++++++++++++++++++++++++++---------- 1 files changed, 34 insertions(+), 11 deletions(-) diff --git a/dlls/lz32/tests/lzexpand_main.c b/dlls/lz32/tests/lzexpand_main.c index 277f1ba..07058c9 100644 --- a/dlls/lz32/tests/lzexpand_main.c +++ b/dlls/lz32/tests/lzexpand_main.c @@ -28,9 +28,7 @@ #include <lzexpand.h> #include "wine/test.h" static char filename_[] = "testfile.xx_"; -#if 0 static char filename[] = "testfile.xxx"; -#endif static char filename2[] = "testfile.yyy"; /* This is the hex string representation of the file created by compressing @@ -59,6 +57,9 @@ static void test_lzopenfile(void) OFSTRUCT test; DWORD retval; INT file; + char expected[MAX_PATH]; + char filled_0xA5[OFS_MAXPATHNAME]; + /* Check for nonexistent file. */ file = LZOpenFile("badfilename_", &test, OF_READ); @@ -88,20 +89,42 @@ static void test_lzopenfile(void) ok(file >= 0, "LZOpenFile failed on read/write\n"); LZClose(file); - /* If the file "foo.xxx" does not exist, LZOpenFile should then check for the file "foo.xx_" and open that -- at least on some operating systems. Doesn't seem to on my copy of Win98. - The Wine testing guidelines say we should accept the behavior of - any valid version of Windows. Thus it seems we cannot check this?! - Revisit this at some point to see if this can be tested somehow. */ -#if 0 + retval = GetCurrentDirectory(MAX_PATH, expected); + ok(retval > 0, "GetCurrentDirectory returned %ld, GLE=0x%lx\n", + retval, GetLastError()); + lstrcatA(expected, "\\"); + lstrcatA(expected, filename); + /* Compressed file name ends with underscore. */ + retval = lstrlenA(expected); + expected[retval-1] = '_'; + memset(&filled_0xA5, 0xA5, OFS_MAXPATHNAME); + memset(&test, 0xA5, sizeof(test)); + SetLastError(0xfaceabee); + + /* Try to open compressed file. */ file = LZOpenFile(filename, &test, OF_EXIST); - ok(file != LZERROR_BADINHANDLE, - "LZOpenFile \"filename_\" check failed\n"); - LZClose(file); -#endif + if(file != LZERROR_BADINHANDLE) { /* NT */ + ok(test.cBytes == sizeof(OFSTRUCT), + "LZOpenFile set test.cBytes to %d\n", test.cBytes); + ok(test.nErrCode == 0, + "LZOpenFile set test.nErrCode to %d\n", test.nErrCode); + ok(lstrcmpA(test.szPathName, expected) == 0, + "LZOpenFile returned '%s', but was expected to return '%s'\n", + test.szPathName, expected); + LZClose(file); + } else { /* 9x */ + ok(test.cBytes == 0xA5, + "LZOpenFile set test.cBytes to %d\n", test.cBytes); + ok(test.nErrCode == ERROR_FILE_NOT_FOUND, + "LZOpenFile set test.nErrCode to %d\n", test.nErrCode); + ok(strncmp(test.szPathName, filled_0xA5, OFS_MAXPATHNAME) == 0, + "LZOpenFile returned '%s', but was expected to return '%s'\n", + test.szPathName, filled_0xA5); + } /* Delete the file then make sure it doesn't exist anymore. */ file = LZOpenFile(filename_, &test, OF_DELETE);

1 0

qingdoa daoo : kernel: Fix reported address space limit to be in keeping with ntdll.
by Alexandre Julliard June 19, 2006

June 19, 2006

Module: wine Branch: refs/heads/master Commit: 43fa835e0eafb0dd22ec9603cb0f63f9d46b7479 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=43fa835e0eafb0dd22ec960… Author: qingdoa daoo <qingdao33122(a)yahoo.com> Date: Sat Jun 17 14:10:07 2006 +0800 kernel: Fix reported address space limit to be in keeping with ntdll. --- dlls/kernel/cpu.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel/cpu.c b/dlls/kernel/cpu.c index 6ba35ac..b077ad6 100644 --- a/dlls/kernel/cpu.c +++ b/dlls/kernel/cpu.c @@ -333,7 +333,7 @@ VOID WINAPI GetSystemInfo( /* FIXME: the two entries below should be computed somehow... */ cachedsi.lpMinimumApplicationAddress = (void *)0x00010000; - cachedsi.lpMaximumApplicationAddress = (void *)0x7FFFFFFF; + cachedsi.lpMaximumApplicationAddress = (void *)0x7FFEFFFF; cachedsi.dwActiveProcessorMask = 1; cachedsi.dwNumberOfProcessors = 1; cachedsi.dwProcessorType = PROCESSOR_INTEL_PENTIUM;

1 0

Detlef Riekenberg : winspool: AddMonitor: Test the driver entry before return an error.
by Alexandre Julliard June 19, 2006

June 19, 2006

Module: wine Branch: refs/heads/master Commit: 698a8a0b86348149f60e7352bbe6857048712ae0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=698a8a0b86348149f60e735… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Jun 16 10:01:31 2006 +0200 winspool: AddMonitor: Test the driver entry before return an error. --- dlls/winspool.drv/info.c | 21 +++++++++++++++++---- 1 files changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 9d6e1c0..05df47a 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -1480,10 +1480,23 @@ BOOL WINAPI AddMonitorW(LPWSTR pName, DW return FALSE; } - if(RegCreateKeyExW(hroot, mi2w->pName, 0, NULL, REG_OPTION_NON_VOLATILE, - KEY_WRITE, NULL, &hentry, &disposition) == ERROR_SUCCESS) { - - if (disposition == REG_OPENED_EXISTING_KEY) { + if(RegCreateKeyExW( hroot, mi2w->pName, 0, NULL, REG_OPTION_NON_VOLATILE, + KEY_WRITE | KEY_QUERY_VALUE, NULL, &hentry, + &disposition) == ERROR_SUCCESS) { + + /* Some installers set options for the port before calling AddMonitor. + We query the "Driver" entry to verify that the monitor is installed, + before we return an error. + When a user installs two print monitors at the same time with the + same name but with a different driver DLL and a task switch comes + between RegQueryValueExW and RegSetValueExW, a race condition + is possible but silently ignored. */ + + DWORD namesize = 0; + + if ((disposition == REG_OPENED_EXISTING_KEY) && + (RegQueryValueExW(hentry, DriverW, NULL, NULL, NULL, + &namesize) == ERROR_SUCCESS)) { TRACE("monitor %s already exists\n", debugstr_w(mi2w->pName)); /* NT: ERROR_PRINT_MONITOR_ALREADY_INSTALLED (3006) 9x: ERROR_ALREADY_EXISTS (183) */

1 0