November 2008 - Wine-commits

Christian Costa : d3dxof: Keywords are case insensitive.
by Alexandre Julliard 28 Nov '08

28 Nov '08

Module: wine Branch: master Commit: 0409ff626977e7a9b2b057a36d2756eb86b95c06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0409ff626977e7a9b2b057a36… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Thu Nov 27 22:10:11 2008 +0100 d3dxof: Keywords are case insensitive. --- dlls/d3dxof/d3dxof.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 5f471b1..dbafcc6 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -498,7 +498,7 @@ static WORD get_operator_token(char c) static BOOL is_keyword(parse_buffer* buf, const char* keyword) { DWORD len = strlen(keyword); - if (!strncmp((char*)buf->buffer, keyword,len) && is_separator(*(buf->buffer+len))) + if (!strncasecmp((char*)buf->buffer, keyword,len) && is_separator(*(buf->buffer+len))) { buf->buffer += len; buf->rem_bytes -= len;

1 0

Andrew Talbot : gdiplus: Void function should not return a value.
by Alexandre Julliard 28 Nov '08

28 Nov '08

Module: wine Branch: master Commit: 88b84820ab0d3d85ea121d477b8e51bcdd08b062 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88b84820ab0d3d85ea121d477… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Nov 26 20:37:32 2008 +0000 gdiplus: Void function should not return a value. --- dlls/gdiplus/gdiplus.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.c b/dlls/gdiplus/gdiplus.c index c9c3102..35caad8 100644 --- a/dlls/gdiplus/gdiplus.c +++ b/dlls/gdiplus/gdiplus.c @@ -109,7 +109,7 @@ GpStatus WINAPI GdiplusNotificationHook(ULONG_PTR *token) void WINAPI GdiplusNotificationUnhook(ULONG_PTR token) { FIXME("%ld\n", token); - return NotificationUnhook(token); + NotificationUnhook(token); } /*****************************************************

1 0

Andrew Talbot : wined3d: Sign-compare warnings fix.
by Alexandre Julliard 28 Nov '08

28 Nov '08

Module: wine Branch: master Commit: f40afa87c68bb0a79f7374068d618e257e884b41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f40afa87c68bb0a79f7374068… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Nov 26 20:37:28 2008 +0000 wined3d: Sign-compare warnings fix. --- dlls/wined3d/directx.c | 2 +- dlls/wined3d/drawprim.c | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index a998d86..31d71be 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1535,7 +1535,7 @@ static HRESULT WINAPI IWineD3DImpl_EnumAdapterModes(IWineD3D *iface, UINT Adapte if (Adapter == 0 && !DEBUG_SINGLE_MODE) { /* Display */ DEVMODEW DevModeW; int ModeIdx = 0; - int i = 0; + UINT i = 0; int j = 0; ZeroMemory(&DevModeW, sizeof(DevModeW)); diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index c5c4f57..d996bc6 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -145,7 +145,7 @@ void primitiveDeclarationConvertToStridedData( BYTE *data = NULL; IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; IWineD3DVertexDeclarationImpl* vertexDeclaration = (IWineD3DVertexDeclarationImpl *)This->stateBlock->vertexDecl; - int i; + unsigned int i; WINED3DVERTEXELEMENT *element; DWORD stride; DWORD numPreloadStreams = This->stateBlock->streamIsUP ? 0 : vertexDeclaration->num_streams; @@ -164,7 +164,7 @@ void primitiveDeclarationConvertToStridedData( unsigned int idx; element = vertexDeclaration->pDeclarationWine + i; - TRACE("%p Element %p (%d of %d)\n", vertexDeclaration->pDeclarationWine, + TRACE("%p Element %p (%u of %u)\n", vertexDeclaration->pDeclarationWine, element, i + 1, vertexDeclaration->declarationWNumElements - 1); if (This->stateBlock->streamSource[element->Stream] == NULL) @@ -293,7 +293,7 @@ static void drawStridedSlow(IWineD3DDevice *iface, WineDirect3DVertexStridedData unsigned int textureNo = 0; const WORD *pIdxBufS = NULL; const DWORD *pIdxBufL = NULL; - LONG vx_index; + ULONG vx_index; IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; UINT *streamOffset = This->stateBlock->streamOffset; long SkipnStrides = startVertex + This->stateBlock->loadBaseVertexIndex; @@ -389,10 +389,10 @@ static void drawStridedSlow(IWineD3DDevice *iface, WineDirect3DVertexStridedData /* Indexed so work out the number of strides to skip */ if (idxSize == 2) { - VTRACE(("Idx for vertex %d = %d\n", vx_index, pIdxBufS[startIdx+vx_index])); + VTRACE(("Idx for vertex %u = %u\n", vx_index, pIdxBufS[startIdx+vx_index])); SkipnStrides = pIdxBufS[startIdx + vx_index] + This->stateBlock->loadBaseVertexIndex; } else { - VTRACE(("Idx for vertex %d = %d\n", vx_index, pIdxBufL[startIdx+vx_index])); + VTRACE(("Idx for vertex %u = %u\n", vx_index, pIdxBufL[startIdx+vx_index])); SkipnStrides = pIdxBufL[startIdx + vx_index] + This->stateBlock->loadBaseVertexIndex; } } @@ -603,7 +603,7 @@ static void drawStridedSlowVs(IWineD3DDevice *iface, WineDirect3DVertexStridedDa long SkipnStrides = startVertex + This->stateBlock->loadBaseVertexIndex; const WORD *pIdxBufS = NULL; const DWORD *pIdxBufL = NULL; - LONG vx_index; + ULONG vx_index; int i; IWineD3DStateBlockImpl *stateblock = This->stateBlock; BYTE *ptr; @@ -659,8 +659,8 @@ static void drawStridedSlowVs(IWineD3DDevice *iface, WineDirect3DVertexStridedDa static inline void drawStridedInstanced(IWineD3DDevice *iface, WineDirect3DVertexStridedData *sd, UINT numberOfVertices, GLenum glPrimitiveType, const void *idxData, short idxSize, ULONG minIndex, ULONG startIdx, ULONG startVertex) { - UINT numInstances = 0; - int numInstancedAttribs = 0, i, j; + UINT numInstances = 0, i; + int numInstancedAttribs = 0, j; UINT instancedData[sizeof(sd->u.input) / sizeof(sd->u.input[0]) /* 16 */]; IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; IWineD3DStateBlockImpl *stateblock = This->stateBlock; @@ -823,7 +823,7 @@ void drawPrimitive(IWineD3DDevice *iface, IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; IWineD3DSurfaceImpl *target; - int i; + unsigned int i; if (NumPrimitives == 0) return;

1 0

Paul Vriens : rsaenh/tests: Fix a test failure on Win98.
by Alexandre Julliard 28 Nov '08

28 Nov '08

Module: wine Branch: master Commit: d211ddbfad6e107b615d61a2ac456f3966e0b2b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d211ddbfad6e107b615d61a2a… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Nov 27 11:03:53 2008 +0100 rsaenh/tests: Fix a test failure on Win98. --- dlls/rsaenh/tests/rsaenh.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 20e9001..0201d23 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -146,9 +146,16 @@ static void clean_up_base_environment(void) { BOOL result; + SetLastError(0xdeadbeef); result = CryptReleaseContext(hProv, 1); - ok(!result && GetLastError()==NTE_BAD_FLAGS, "%08x\n", GetLastError()); + ok(!result || broken(result) /* Win98 */, "Expected failure\n"); + ok(GetLastError()==NTE_BAD_FLAGS, "Expected NTE_BAD_FLAGS, got %08x\n", GetLastError()); + /* Just to prove that Win98 also released the CSP */ + SetLastError(0xdeadbeef); + result = CryptReleaseContext(hProv, 0); + ok(!result && GetLastError()==ERROR_INVALID_PARAMETER, "%08x\n", GetLastError()); + CryptAcquireContext(&hProv, szContainer, szProvider, PROV_RSA_FULL, CRYPT_DELETEKEYSET); }

1 0

Maarten Lankhorst : ole32: Fix releasing spy.
by Alexandre Julliard 28 Nov '08

28 Nov '08

Module: wine Branch: master Commit: 08c78e07a90583eb0b99ae09ab6e8fc3dadc78bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=08c78e07a90583eb0b99ae09a… Author: Maarten Lankhorst <maarten(a)codeweavers.com> Date: Thu Nov 27 11:45:57 2008 +0100 ole32: Fix releasing spy. --- dlls/ole32/compobj.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index d97279a..a920b9c 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -227,6 +227,7 @@ static void COM_TlsDestroy(void) if (info->apt) apartment_release(info->apt); if (info->errorinfo) IErrorInfo_Release(info->errorinfo); if (info->state) IUnknown_Release(info->state); + if (info->spy) IUnknown_Release(info->spy); HeapFree(GetProcessHeap(), 0, info); NtCurrentTeb()->ReservedForOle = NULL; } @@ -1058,6 +1059,21 @@ HRESULT WINAPI CoRegisterInitializeSpy(IInitializeSpy *spy, ULARGE_INTEGER *cook return hr; } +/****************************************************************************** + * CoRevokeInitializeSpy [OLE32.@] + * + * Remove a spy that previously watched CoInitializeEx calls + * + * PARAMS + * cookie [I] The cookie obtained from a previous CoRegisterInitializeSpy call + * + * RETURNS + * Success: S_OK if a spy is removed + * Failure: E_INVALIDARG + * + * SEE ALSO + * CoInitializeEx + */ HRESULT WINAPI CoRevokeInitializeSpy(ULARGE_INTEGER cookie) { struct oletls *info = COM_CurrentInfo(); @@ -1067,6 +1083,7 @@ HRESULT WINAPI CoRevokeInitializeSpy(ULARGE_INTEGER cookie) return E_INVALIDARG; IUnknown_Release(info->spy); + info->spy = NULL; return S_OK; }

1 0

Paul Vriens : rsaenh/tests: Fix a test failure on NT4 and below.
by Alexandre Julliard 28 Nov '08

28 Nov '08

Module: wine Branch: master Commit: 26d565ac1bfc53b243d1bc5a26add74c73f3fe77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26d565ac1bfc53b243d1bc5a2… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Nov 27 10:50:07 2008 +0100 rsaenh/tests: Fix a test failure on NT4 and below. --- dlls/rsaenh/tests/rsaenh.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 8d094aa..20e9001 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -1775,8 +1775,13 @@ static void test_enum_container(void) /* If PP_ENUMCONTAINERS is queried with CRYPT_FIRST and abData == NULL, it returns * the maximum legal length of container names (which is MAX_PATH + 1 == 261) */ + SetLastError(0xdeadbeef); result = CryptGetProvParam(hProv, PP_ENUMCONTAINERS, NULL, &dwBufferLen, CRYPT_FIRST); - ok (result && dwBufferLen == MAX_PATH + 1, "%08x\n", GetLastError()); + ok (result, "%08x\n", GetLastError()); + ok (dwBufferLen == MAX_PATH + 1 || + broken(dwBufferLen == 10) || /* Win9x, WinMe */ + broken(dwBufferLen == 55), /* NT4 */ + "Expected dwBufferLen to be (MAX_PATH + 1), it was : %d\n", dwBufferLen); /* If the result fits into abContainerName dwBufferLen is left untouched */ dwBufferLen = (DWORD)sizeof(abContainerName);

1 0

Paul Vriens : rsaenh/tests: Fix a test failure on NT4 and below.
by Alexandre Julliard 28 Nov '08

28 Nov '08

Module: wine Branch: master Commit: c3072bcaf33e53b68694c85b1b8d915565da1e99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3072bcaf33e53b68694c85b1… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Nov 27 10:23:39 2008 +0100 rsaenh/tests: Fix a test failure on NT4 and below. --- dlls/rsaenh/tests/rsaenh.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 05f4cdf..8d094aa 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -1432,13 +1432,11 @@ static void test_verify_signature(void) { if (result) return; /* check that we get a bad signature error when the signature is too short*/ + SetLastError(0xdeadbeef); result = CryptVerifySignature(hHash, abSignatureMD2, 64, hPubSignKey, NULL, 0); - ok(!result && - (NTE_BAD_SIGNATURE == GetLastError() || - ERROR_INVALID_PARAMETER == GetLastError()), - "Expected NTE_BAD_SIGNATURE or ERROR_INVALID_PARAMETER, got %08x\n", - GetLastError()); - if (result) return; + ok((!result && NTE_BAD_SIGNATURE == GetLastError()) || + broken(result), /* Win9x, WinMe, NT4 */ + "Expected NTE_BAD_SIGNATURE, got %08x\n", GetLastError()); result = CryptVerifySignature(hHash, abSignatureMD2, 128, hPubSignKey, NULL, 0); ok(result, "%08x\n", GetLastError());

1 0

Francois Gouget : localspl: Remove WINAPI on static functions where not needed.
by Alexandre Julliard 28 Nov '08

28 Nov '08

Module: wine Branch: master Commit: 1e2bfd28041feab2e5b4875941a2c0ec35e5ace8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e2bfd28041feab2e5b487594… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Nov 26 17:16:22 2008 +0100 localspl: Remove WINAPI on static functions where not needed. --- dlls/localspl/localspl_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/localspl/localspl_main.c b/dlls/localspl/localspl_main.c index 80e8424..7cadac3 100644 --- a/dlls/localspl/localspl_main.c +++ b/dlls/localspl/localspl_main.c @@ -729,7 +729,7 @@ static BOOL WINAPI fpGetPrinterDriverDirectory(LPWSTR pName, LPWSTR pEnvironment * and a special mode with lazy error checking. * */ -static BOOL WINAPI myAddPrinterDriverEx(DWORD level, LPBYTE pDriverInfo, DWORD dwFileCopyFlags, BOOL lazy) +static BOOL myAddPrinterDriverEx(DWORD level, LPBYTE pDriverInfo, DWORD dwFileCopyFlags, BOOL lazy) { static const WCHAR emptyW[1]; const printenv_t *env;

1 0

Alexandre Julliard : widl: Fix the handling of proxy delegation.
by Alexandre Julliard 28 Nov '08

28 Nov '08

Module: wine Branch: master Commit: cb7a0da5db7588d63b505d3c9ea94306df7a20bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb7a0da5db7588d63b505d3c9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 28 12:55:59 2008 +0100 widl: Fix the handling of proxy delegation. Generate a BaseIIDList for delegated interface, and point directly to the methods that have been defined in the same file instead of delegating them. --- dlls/oleaut32/usrmarshal.c | 2 + tools/widl/proxy.c | 47 ++++++++++++++++++++++++++++++++++++++++--- tools/widl/widl.c | 1 + 3 files changed, 46 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index 8f55f8f..b31eb39 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -25,6 +25,7 @@ #define COBJMACROS #define NONAMELESSUNION #define NONAMELESSSTRUCT +#define PROXY_DELEGATION #include "windef.h" #include "winbase.h" @@ -49,6 +50,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); static CStdPSFactoryBuffer PSFactoryBuffer; CSTDSTUBBUFFERRELEASE(&PSFactoryBuffer) +CSTDSTUBBUFFER2RELEASE(&PSFactoryBuffer) extern const ExtendedProxyFileInfo oleaut32_oaidl_ProxyFileInfo; extern const ExtendedProxyFileInfo oleaut32_ocidl_ProxyFileInfo; diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 3d0a766..74bec7b 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -187,6 +187,11 @@ int cant_be_null(const var_t *v) return 1; /* Default is RPC_FC_RP. */ } +static int need_delegation(const type_t *iface) +{ + return iface->ref && iface->ref->ref && iface->ref->ignore; +} + static void proxy_check_pointers( const var_list_t *args ) { const var_t *arg; @@ -504,7 +509,7 @@ static int write_proxy_methods(type_t *iface, int skip) const func_t *cur; int i = 0; - if (iface->ref) i = write_proxy_methods(iface->ref, iface->ref->ref != NULL); + if (iface->ref) i = write_proxy_methods(iface->ref, need_delegation(iface)); if (iface->funcs) LIST_FOR_EACH_ENTRY( cur, iface->funcs, const func_t, entry ) { var_t *def = cur->def; if (!is_callas(def->attrs)) { @@ -615,7 +620,7 @@ static void write_proxy(type_t *iface, unsigned int *proc_offset) print_proxy( "},\n", iface->name); print_proxy( "{\n"); indent++; - print_proxy( "CStdStubBuffer_METHODS\n"); + print_proxy( "CStdStubBuffer_%s\n", need_delegation(iface) ? "DELEGATING_METHODS" : "METHODS"); indent--; print_proxy( "}\n"); indent--; @@ -696,6 +701,29 @@ static void write_proxy_iface_name_format(const statement_list_t *stmts, const c } } +static void write_proxy_iface_base_iids(const statement_list_t *stmts) +{ + const statement_t *stmt; + + if (!stmts) return; + LIST_FOR_EACH_ENTRY( stmt, stmts, const statement_t, entry ) + { + if (stmt->type == STMT_LIBRARY) + write_proxy_iface_base_iids(stmt->u.lib->stmts); + else if (stmt->type == STMT_TYPE && stmt->u.type->type == RPC_FC_IP) + { + type_t *iface = stmt->u.type; + if (iface->ref && iface->funcs && need_proxy(iface)) + { + if (need_delegation(iface)) + fprintf( proxy, " &IID_%s, /* %s */\n", iface->ref->name, iface->name ); + else + fprintf( proxy, " 0,\n" ); + } + } + } +} + static void write_iid_lookup(const statement_list_t *stmts, const char *file_id, int *c) { const statement_t *stmt; @@ -723,7 +751,7 @@ void write_proxies(const statement_list_t *stmts) { int expr_eval_routines; char *file_id = proxy_token; - int c; + int c, have_baseiid; unsigned int proc_offset = 0; if (!do_proxies) return; @@ -768,6 +796,16 @@ void write_proxies(const statement_list_t *stmts) fprintf(proxy, "};\n"); fprintf(proxy, "\n"); + if ((have_baseiid = does_any_iface(stmts, need_delegation))) + { + fprintf(proxy, "static const IID * _%s_BaseIIDList[] =\n", file_id); + fprintf(proxy, "{\n"); + write_proxy_iface_base_iids(stmts); + fprintf(proxy, " 0\n"); + fprintf(proxy, "};\n"); + fprintf(proxy, "\n"); + } + fprintf(proxy, "#define _%s_CHECK_IID(n) IID_GENERIC_CHECK_IID(_%s, pIID, n)\n", file_id, file_id); fprintf(proxy, "\n"); fprintf(proxy, "int __stdcall _%s_IID_Lookup(const IID* pIID, int* pIndex)\n", file_id); @@ -783,7 +821,8 @@ void write_proxies(const statement_list_t *stmts) fprintf(proxy, " (const PCInterfaceProxyVtblList*)&_%s_ProxyVtblList,\n", file_id); fprintf(proxy, " (const PCInterfaceStubVtblList*)&_%s_StubVtblList,\n", file_id); fprintf(proxy, " _%s_InterfaceNamesList,\n", file_id); - fprintf(proxy, " 0,\n"); + if (have_baseiid) fprintf(proxy, " _%s_BaseIIDList,\n", file_id); + else fprintf(proxy, " 0,\n"); fprintf(proxy, " &_%s_IID_Lookup,\n", file_id); fprintf(proxy, " %d,\n", c); fprintf(proxy, " 1,\n"); diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 9b14de2..c49b009 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -253,6 +253,7 @@ static void write_dlldata_list(struct list *filenames) fprintf(dlldata, "/*** Autogenerated by WIDL %s ", PACKAGE_VERSION); fprintf(dlldata, "- Do not edit ***/\n\n"); + fprintf(dlldata, "#define PROXY_DELEGATION\n"); fprintf(dlldata, "#include <objbase.h>\n"); fprintf(dlldata, "#include <rpcproxy.h>\n\n"); start_cplusplus_guard(dlldata);

1 0

Peter Dons Tychsen : winedos: Fixed a problem with timer values that are below 50ms.
by Alexandre Julliard 28 Nov '08

28 Nov '08

Module: wine Branch: master Commit: 7160d8c70968d8d9dd2bdc9f92f753abdad102ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=7160d8c70968d8d9dd2bdc9f9… Author: Peter Dons Tychsen <donpedro(a)tdcadsl.dk> Date: Wed Nov 26 22:22:41 2008 +0100 winedos: Fixed a problem with timer values that are below 50ms. --- dlls/winedos/timer.c | 24 ++++++++++++++++++++---- 1 files changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/winedos/timer.c b/dlls/winedos/timer.c index f023b85..74e41b5 100644 --- a/dlls/winedos/timer.c +++ b/dlls/winedos/timer.c @@ -58,6 +58,8 @@ static UINT TIMER_ticks = 0; /* Number of pending timer IRQs. */ static LONG TIMER_pending = 0; +/* Number of milliseconds between IRQs. */ +static DWORD TIMER_millis = 0; /*********************************************************************** * TIMER_Relay @@ -81,11 +83,11 @@ static void CALLBACK TIMER_TimerProc( HWND hwnd, DWORD dwTime ) { LONG pending = InterlockedIncrement( &TIMER_pending ); + DWORD delta = (dwTime >= TIMER_stamp) ? + (dwTime - TIMER_stamp) : (0xffffffff - (TIMER_stamp - dwTime)); if (pending >= TIMER_MAX_PENDING) { - DWORD delta = (dwTime >= TIMER_stamp) ? - (dwTime - TIMER_stamp) : (0xffffffff - (TIMER_stamp - dwTime)); if (delta >= 60000) { @@ -97,8 +99,19 @@ static void CALLBACK TIMER_TimerProc( HWND hwnd, } else { - TIMER_stamp = dwTime; - DOSVM_QueueEvent( 0, DOS_PRIORITY_REALTIME, TIMER_Relay, NULL ); + int i; + + /* Calculate the number of valid timer interrupts we can generate */ + DWORD count = delta / TIMER_millis; + + /* Forward the timestamp with the time used */ + TIMER_stamp += (count * TIMER_millis); + + /* Generate interrupts */ + for(i=0;i<count;i++) + { + DOSVM_QueueEvent( 0, DOS_PRIORITY_REALTIME, TIMER_Relay, NULL ); + } } } @@ -122,6 +135,9 @@ static void WINAPI TIMER_DoSetTimer( ULONG_PTR arg ) TIMER_id = SetTimer( NULL, 0, millis, TIMER_TimerProc ); TIMER_stamp = GetTickCount(); TIMER_ticks = arg; + + /* Remember number of milliseconds to wait */ + TIMER_millis = millis; }

1 0