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

Maarten Lankhorst : dsound: Block align SetCurrentPosition and add test for it.
by Alexandre Julliard May 25, 2007

May 25, 2007

Module: wine Branch: master Commit: 236035894407181e75d149aae71eda56c4936841 URL: http://source.winehq.org/git/wine.git/?a=commit;h=236035894407181e75d149aae… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu May 24 20:42:14 2007 +0200 dsound: Block align SetCurrentPosition and add test for it. --- dlls/dsound/buffer.c | 1 + dlls/dsound/tests/dsound.c | 16 +++++++++++++++- 2 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index 252fbc8..b1cecd7 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -687,6 +687,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_SetCurrentPosition( EnterCriticalSection(&(This->lock)); newpos %= This->buflen; + newpos -= newpos%This->pwfx->nBlockAlign; This->buf_mixpos = newpos; if (This->hwbuf) { hres = IDsDriverBuffer_SetPosition(This->hwbuf, This->buf_mixpos); diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index 6f95264..cbb6829 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -9,6 +9,7 @@ * So this is only done if the test is being run in interactive mode. * * Copyright (c) 2002-2004 Francois Gouget + * Copyright (c) 2007 Maarten Lankhorst * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -764,6 +765,7 @@ static HRESULT test_block_align(LPGUID lpGuid) DSBUFFERDESC bufdesc; DSBCAPS dsbcaps; WAVEFORMATEX wfx; + DWORD pos, pos2; int ref; /* Create the DirectSound object */ @@ -790,11 +792,23 @@ static HRESULT test_block_align(LPGUID lpGuid) rc=IDirectSoundBuffer_GetCaps(secondary,&dsbcaps); ok(rc==DS_OK,"IDirectSoundBuffer_GetCaps() should have returned DS_OK, " "returned: %s\n", DXGetErrorString8(rc)); - if (rc==DS_OK) + if (rc==DS_OK && wfx.nBlockAlign > 1) + { ok(dsbcaps.dwBufferBytes==(wfx.nAvgBytesPerSec + wfx.nBlockAlign), "Buffer size not a multiple of nBlockAlign: requested %d, " "got %d, should be %d\n", bufdesc.dwBufferBytes, dsbcaps.dwBufferBytes, wfx.nAvgBytesPerSec + wfx.nBlockAlign); + + rc = IDirectSoundBuffer_SetCurrentPosition(secondary, 0); + ok(rc == DS_OK, "Could not set position to 0: %s\n", DXGetErrorString8(rc)); + rc = IDirectSoundBuffer_GetCurrentPosition(secondary, &pos, NULL); + ok(rc == DS_OK, "Could not get position: %s\n", DXGetErrorString8(rc)); + rc = IDirectSoundBuffer_SetCurrentPosition(secondary, 1); + ok(rc == DS_OK, "Could not set position to 1: %s\n", DXGetErrorString8(rc)); + rc = IDirectSoundBuffer_GetCurrentPosition(secondary, &pos2, NULL); + ok(rc == DS_OK, "Could not get new position: %s\n", DXGetErrorString8(rc)); + ok(pos == pos2, "Positions not the same! Old position: %d, new position: %d\n", pos, pos2); + } ref=IDirectSoundBuffer_Release(secondary); ok(ref==0,"IDirectSoundBuffer_Release() secondary has %d references, " "should have 0\n",ref);

1 0

James Hawkins : msi: Add the ability to deformat the component's source.
by Alexandre Julliard May 25, 2007

May 25, 2007

Module: wine Branch: master Commit: ea2c96c5dfb42a5efceeaf6d044953b93a2de5f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea2c96c5dfb42a5efceeaf6d0… Author: James Hawkins <truiken(a)gmail.com> Date: Thu May 24 11:11:20 2007 -0700 msi: Add the ability to deformat the component's source. --- dlls/msi/format.c | 5 +++-- dlls/msi/tests/format.c | 5 +---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/msi/format.c b/dlls/msi/format.c index fa85e60..1bcfa6e 100644 --- a/dlls/msi/format.c +++ b/dlls/msi/format.c @@ -113,16 +113,17 @@ static LPWSTR deformat_component(MSIPACKAGE* package, LPCWSTR key, DWORD* sz) { LPWSTR value = NULL; MSICOMPONENT *comp; + BOOL source; *sz = 0; if (!package) return NULL; - FIXME("component key %s\n", debugstr_w(key)); comp = get_loaded_component(package,key); if (comp) { - value = resolve_folder(package, comp->Directory, FALSE, FALSE, TRUE, NULL); + source = (comp->Action == INSTALLSTATE_SOURCE) ? TRUE : FALSE; + value = resolve_folder(package, comp->Directory, source, FALSE, TRUE, NULL); *sz = (strlenW(value)) * sizeof(WCHAR); } diff --git a/dlls/msi/tests/format.c b/dlls/msi/tests/format.c index 16661e3..23438bb 100644 --- a/dlls/msi/tests/format.c +++ b/dlls/msi/tests/format.c @@ -2236,10 +2236,7 @@ static void test_formatrecord_tables(void) MsiRecordSetString( hrec, 1, "[$parietal]" ); r = MsiFormatRecord( hpkg, hrec, buf, &size ); ok( r == ERROR_SUCCESS, "format record failed: %d\n", r); - todo_wine - { - ok( !lstrcmp( buf, expected ), "Expected '%s', got %s\n", expected, buf); - } + ok( !lstrcmp( buf, expected ), "Expected '%s', got %s\n", expected, buf); DeleteFile( "C:\\I am a really long directory\\temporal.txt" ); RemoveDirectory( "C:\\I am a really long directory" );

1 0

James Hawkins : msi: Remove a misleading ERR, as this fails if a file doesn 't exist, which is common.
by Alexandre Julliard May 25, 2007

May 25, 2007

Module: wine Branch: master Commit: f5c2806ca19bfcfe1c7d3002714b4df829a9d650 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5c2806ca19bfcfe1c7d30027… Author: James Hawkins <truiken(a)gmail.com> Date: Thu May 24 11:10:44 2007 -0700 msi: Remove a misleading ERR, as this fails if a file doesn't exist, which is common. --- dlls/msi/format.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/msi/format.c b/dlls/msi/format.c index 2ea6e23..fa85e60 100644 --- a/dlls/msi/format.c +++ b/dlls/msi/format.c @@ -162,8 +162,6 @@ static LPWSTR deformat_file(MSIPACKAGE* package, LPCWSTR key, DWORD* sz, } else { - ERR("Unable to get ShortPath size (%s)\n", - debugstr_w( file->TargetPath) ); value = strdupW( file->TargetPath ); *sz = (lstrlenW(value)) * sizeof(WCHAR); }

1 0

Jacek Caban : mshtml: Added missing WINAPI in window proc.
by Alexandre Julliard May 25, 2007

May 25, 2007

Module: wine Branch: master Commit: 4a71ab79f51896103908ab766a89a493bee911a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a71ab79f51896103908ab766… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 24 19:16:02 2007 +0200 mshtml: Added missing WINAPI in window proc. --- dlls/mshtml/view.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/view.c b/dlls/mshtml/view.c index e0db0b8..79fe399 100644 --- a/dlls/mshtml/view.c +++ b/dlls/mshtml/view.c @@ -248,7 +248,7 @@ static HRESULT activate_window(HTMLDocument *This) return S_OK; } -static LRESULT tooltips_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) +static LRESULT WINAPI tooltips_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { tooltip_data *data = GetPropW(hwnd, wszTooltipData);

1 0

Jacek Caban : mshtml: Fixed AsyncOpen implementation for channels without associated document.
by Alexandre Julliard May 25, 2007

May 25, 2007

Module: wine Branch: master Commit: de2e9e13ce839d251f495afc8bc75685f2f47496 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de2e9e13ce839d251f495afc8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 24 19:15:22 2007 +0200 mshtml: Fixed AsyncOpen implementation for channels without associated document. --- dlls/mshtml/nsio.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index a47bb1d..601a300 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -647,7 +647,7 @@ static nsresult NSAPI nsChannel_AsyncOpen(nsIHttpChannel *iface, nsIStreamListen if(do_load_from_moniker_hack(This)) return WINE_NS_LOAD_FROM_MONIKER; - }else if(container->doc) { + }else { BOOL cont = before_async_open(This, container); nsIWebBrowserChrome_Release(NSWBCHROME(container)); @@ -655,11 +655,11 @@ static nsresult NSAPI nsChannel_AsyncOpen(nsIHttpChannel *iface, nsIStreamListen TRACE("canceled\n"); return NS_ERROR_UNEXPECTED; } - }else { - nsIWebBrowserChrome_Release(NSWBCHROME(container)); - return This->channel - ? nsIChannel_AsyncOpen(This->channel, aListener, aContext) - : NS_ERROR_UNEXPECTED; + + if(!container->doc) + return This->channel + ? nsIChannel_AsyncOpen(This->channel, aListener, aContext) + : NS_ERROR_UNEXPECTED; } } @@ -1567,7 +1567,7 @@ static nsresult NSAPI nsURI_SetNSContainer(nsIWineURI *iface, NSContainer *aCont if(This->container) { if(This->container == aContainer) return NS_OK; - WARN("Container already set: %p\n", This->container); + TRACE("Changing %p -> %p\n", This->container, aContainer); nsIWebBrowserChrome_Release(NSWBCHROME(This->container)); }

1 0

Detlef Riekenberg : localui/tests: Add tests for AddPortUI.
by Alexandre Julliard May 25, 2007

May 25, 2007

Module: wine Branch: master Commit: 189719c1bb79ad3e15a7d6ff0183c283a64dda84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=189719c1bb79ad3e15a7d6ff0… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu May 24 17:27:51 2007 +0200 localui/tests: Add tests for AddPortUI. --- dlls/localui/tests/localui.c | 57 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 57 insertions(+), 0 deletions(-) diff --git a/dlls/localui/tests/localui.c b/dlls/localui/tests/localui.c index 414d8d3..7965d3c 100644 --- a/dlls/localui/tests/localui.c +++ b/dlls/localui/tests/localui.c @@ -48,6 +48,7 @@ static WCHAR does_not_existW[] = {'d','o','e','s','_','n','o','t','_','e','x','i static WCHAR emptyW[] = {0}; static CHAR fmt_comA[] = {'C','O','M','%','u',':',0}; static CHAR fmt_lptA[] = {'L','P','T','%','u',':',0}; +static WCHAR localportW[] = {'L','o','c','a','l',' ','P','o','r','t',0}; static WCHAR portname_fileW[] = {'F','I','L','E',':',0}; static LPBYTE pi_buffer; @@ -123,6 +124,61 @@ static LPWSTR strdupW(LPCWSTR strW) /* ########################### */ +static void test_AddPortUI(void) +{ + DWORD res; + LPWSTR new_portname; + + /* not present before w2k */ + if (!pAddPortUI) { + skip("AddPortUI not found\n"); + return; + } + + SetLastError(0xdeadbeef); + res = pAddPortUI(NULL, NULL, NULL, NULL); + ok( !res && (GetLastError() == ERROR_UNKNOWN_PORT), + "got %d with %u (expected '0' with ERROR_UNKNOWN_PORT)\n", + res, GetLastError()); + + SetLastError(0xdeadbeef); + res = pAddPortUI(NULL, NULL, emptyW, NULL); + ok( !res && (GetLastError() == ERROR_UNKNOWN_PORT), + "got %d with %u (expected '0' with ERROR_UNKNOWN_PORT)\n", + res, GetLastError()); + + SetLastError(0xdeadbeef); + res = pAddPortUI(NULL, NULL, does_not_existW, NULL); + ok( !res && (GetLastError() == ERROR_UNKNOWN_PORT), + "got %d with %u (expected '0' with ERROR_UNKNOWN_PORT)\n", + res, GetLastError()); + + if (winetest_interactive) { + SetLastError(0xdeadbeef); + new_portname = NULL; + /* + * - On MSDN, you can read, that no dialogs should be displayed, when hWnd + * is NULL, but native localui does not care + * - when the new port already exist, + * TRUE is returned, but new_portname is NULL + * - when the new port starts with "COM" or "LPT", + * FALSE is returned with ERROR_NOT_SUPPORTED in windows + */ + res = pAddPortUI(NULL, NULL, localportW, &new_portname); + ok( res || + (GetLastError() == ERROR_CANCELLED) || + (GetLastError() == ERROR_ACCESS_DENIED) || + (GetLastError() == ERROR_NOT_SUPPORTED), + "got %d with %u and %p (expected '!= 0' or '0' with: " + "ERROR_CANCELLED, ERROR_ACCESS_DENIED or ERROR_NOT_SUPPORTED)\n", + res, GetLastError(), new_portname); + + GlobalFree(new_portname); + } +} + +/* ########################### */ + static void test_ConfigurePortUI(void) { DWORD res; @@ -255,6 +311,7 @@ START_TEST(localui) /* "FILE:" */ file_present = find_portinfo2(portname_fileW); + test_AddPortUI(); test_ConfigurePortUI(); /* cleanup */

1 0

Vitaliy Margolen : wine.inf: Create fake dll for iexplore.exe.
by Alexandre Julliard May 25, 2007

May 25, 2007

Module: wine Branch: master Commit: 70995ed459e07ad9976cc2c20c28ffa77f46a7d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70995ed459e07ad9976cc2c20… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Thu May 24 07:50:10 2007 -0600 wine.inf: Create fake dll for iexplore.exe. --- tools/wine.inf | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index 5d0420d..9a71005 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -2212,6 +2212,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,winver.exe 11,,ws2_32.dll 11,,wsock32.dll +16422,Internet Explorer,iexplore.exe [SystemIni] system.ini, mci,,"MPEGVideo=mciqtz.drv"

1 0

Rob Shearman : secur32: Fix the dwVersion field in the security function tables returned by InitSecurityInterfaceA /W.
by Alexandre Julliard May 25, 2007

May 25, 2007

Module: wine Branch: master Commit: 087eedc3f58dd7761de4832debc46bd57c16cd9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=087eedc3f58dd7761de4832de… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu May 24 13:05:28 2007 +0100 secur32: Fix the dwVersion field in the security function tables returned by InitSecurityInterfaceA/W. --- dlls/secur32/secur32.c | 4 ++-- dlls/secur32/tests/secur32.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/secur32.c b/dlls/secur32/secur32.c index 421b115..aabb56c 100644 --- a/dlls/secur32/secur32.c +++ b/dlls/secur32/secur32.c @@ -86,7 +86,7 @@ static SecurePackageTable *packageTable = NULL; static SecureProviderTable *providerTable = NULL; static SecurityFunctionTableA securityFunctionTableA = { - SECURITY_SUPPORT_PROVIDER_INTERFACE_VERSION_2, + SECURITY_SUPPORT_PROVIDER_INTERFACE_VERSION, EnumerateSecurityPackagesA, QueryCredentialsAttributesA, AcquireCredentialsHandleA, @@ -117,7 +117,7 @@ static SecurityFunctionTableA securityFunctionTableA = { }; static SecurityFunctionTableW securityFunctionTableW = { - SECURITY_SUPPORT_PROVIDER_INTERFACE_VERSION_2, + SECURITY_SUPPORT_PROVIDER_INTERFACE_VERSION, EnumerateSecurityPackagesW, QueryCredentialsAttributesW, AcquireCredentialsHandleW, diff --git a/dlls/secur32/tests/secur32.c b/dlls/secur32/tests/secur32.c index 57f2ee1..99d5069 100644 --- a/dlls/secur32/tests/secur32.c +++ b/dlls/secur32/tests/secur32.c @@ -32,6 +32,8 @@ static HMODULE secdll; static BOOLEAN (WINAPI * pGetComputerObjectNameA)(EXTENDED_NAME_FORMAT NameFormat, LPSTR lpNameBuffer, PULONG lpnSize); static BOOLEAN (WINAPI * pGetComputerObjectNameW)(EXTENDED_NAME_FORMAT NameFormat, LPWSTR lpNameBuffer, PULONG lpnSize); +static PSecurityFunctionTableA (SEC_ENTRY * pInitSecurityInterfaceA)(void); +static PSecurityFunctionTableW (SEC_ENTRY * pInitSecurityInterfaceW)(void); static EXTENDED_NAME_FORMAT formats[] = { NameUnknown, NameFullyQualifiedDN, NameSamCompatible, NameDisplay, @@ -86,6 +88,38 @@ static void testGetComputerObjectNameW(void) } } +static void test_InitSecurityInterface(void) +{ + PSecurityFunctionTableA sftA; + PSecurityFunctionTableW sftW; + + sftA = pInitSecurityInterfaceA(); + ok(sftA != NULL, "pInitSecurityInterfaceA failed\n"); + ok(sftA->dwVersion == SECURITY_SUPPORT_PROVIDER_INTERFACE_VERSION, "wrong dwVersion %ld in security function table\n", sftA->dwVersion); + ok(!sftA->Reserved2, "Reserved2 should be NULL instead of %p in security function table\n", sftA->Reserved2); + todo_wine + ok(sftA->Reserved3 != NULL, "Reserved3 should not be NULL in security function table\n"); + todo_wine + ok(sftA->Reserved4 != NULL, "Reserved4 should not be NULL in security function table\n"); + ok(!sftA->Reserved8, "Reserved8 should be NULL instead of %p in security function table\n", sftA->Reserved8); + + if (!pInitSecurityInterfaceW) + { + skip("InitSecurityInterfaceW not exported by secur32.dll\n"); + return; + } + + sftW = pInitSecurityInterfaceW(); + ok(sftW != NULL, "pInitSecurityInterfaceW failed\n"); + ok(sftW->dwVersion == SECURITY_SUPPORT_PROVIDER_INTERFACE_VERSION, "wrong dwVersion %ld in security function table\n", sftW->dwVersion); + ok(!sftW->Reserved2, "Reserved2 should be NULL instead of %p in security function table\n", sftW->Reserved2); + todo_wine + ok(sftW->Reserved3 != NULL, "Reserved3 should note be NULL in security function table\n"); + todo_wine + ok(sftW->Reserved4 != NULL, "Reserved4 should not be NULL in security function table\n"); + ok(!sftW->Reserved8, "Reserved8 should be NULL instead of %p in security function table\n", sftW->Reserved8); +} + START_TEST(secur32) { secdll = LoadLibraryA("secur32.dll"); @@ -97,6 +131,8 @@ START_TEST(secur32) { pGetComputerObjectNameA = (PVOID)GetProcAddress(secdll, "GetComputerObjectNameA"); pGetComputerObjectNameW = (PVOID)GetProcAddress(secdll, "GetComputerObjectNameW"); + pInitSecurityInterfaceA = (PVOID)GetProcAddress(secdll, "InitSecurityInterfaceA"); + pInitSecurityInterfaceW = (PVOID)GetProcAddress(secdll, "InitSecurityInterfaceW"); if (pGetComputerObjectNameA) testGetComputerObjectNameA(); @@ -104,6 +140,8 @@ START_TEST(secur32) if (pGetComputerObjectNameW) testGetComputerObjectNameW(); + test_InitSecurityInterface(); + FreeLibrary(secdll); } }

1 0

Nigel Liang : shlwapi: Stub implementation for SHSetTimerQueueTimer.
by Alexandre Julliard May 25, 2007

May 25, 2007

Module: wine Branch: master Commit: ddbb317915f7cfb1dd6f48431f4fde43527eb068 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddbb317915f7cfb1dd6f48431… Author: Nigel Liang <ncliang(a)gmail.com> Date: Mon May 21 18:05:28 2007 -0700 shlwapi: Stub implementation for SHSetTimerQueueTimer. --- dlls/shlwapi/ordinal.c | 26 ++++++++++++++++++++++++++ dlls/shlwapi/shlwapi.spec | 2 +- include/shlwapi.h | 4 ++++ 3 files changed, 31 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 213980c..7d5c6cb 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -4223,6 +4223,32 @@ BOOL WINAPI SHQueueUserWorkItem(LPTHREAD_START_ROUTINE pfnCallback, } /*********************************************************************** + * SHSetTimerQueueTimer (SHLWAPI.263) + */ +HANDLE WINAPI SHSetTimerQueueTimer(HANDLE hQueue, + WAITORTIMERCALLBACK pfnCallback, LPVOID pContext, DWORD dwDueTime, + DWORD dwPeriod, LPCSTR lpszLibrary, DWORD dwFlags) +{ + HANDLE hNewTimer; + + /* SHSetTimerQueueTimer flags -> CreateTimerQueueTimer flags */ + if (dwFlags & TPS_LONGEXECTIME) { + dwFlags &= ~TPS_LONGEXECTIME; + dwFlags |= WT_EXECUTELONGFUNCTION; + } + if (dwFlags & TPS_EXECUTEIO) { + dwFlags &= ~TPS_EXECUTEIO; + dwFlags |= WT_EXECUTEINIOTHREAD; + } + + if (!CreateTimerQueueTimer(&hNewTimer, hQueue, pfnCallback, pContext, + dwDueTime, dwPeriod, dwFlags)) + return NULL; + + return hNewTimer; +} + +/*********************************************************************** * IUnknown_OnFocusChangeIS (SHLWAPI.@) */ HRESULT WINAPI IUnknown_OnFocusChangeIS(LPUNKNOWN lpUnknown, LPUNKNOWN pFocusObject, BOOL bFocus) diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index ec7d259..d236858 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -260,7 +260,7 @@ 260 stdcall -noname SHQueueUserWorkItem(long long long long long long long) 261 stub -noname SHCreateTimerQueue 262 stub -noname SHDeleteTimerQueue -263 stub -noname SHSetTimerQueueTimer +263 stdcall -noname SHSetTimerQueueTimer(long ptr ptr long long str long) 264 stub -noname SHChangeTimerQueueTimer 265 stub -noname SHCancelTimerQueueTimer 266 stdcall -noname SHRestrictionLookup(long wstr ptr ptr) diff --git a/include/shlwapi.h b/include/shlwapi.h index 638a958..21b1e99 100644 --- a/include/shlwapi.h +++ b/include/shlwapi.h @@ -1041,6 +1041,10 @@ HRESULT WINAPI DllInstall(BOOL,LPCWSTR) DECLSPEC_HIDDEN; BOOL WINAPI IsOS(DWORD); +/* SHSetTimerQueueTimer definitions */ +#define TPS_EXECUTEIO 0x00000001 +#define TPS_LONGEXECTIME 0x00000008 + #include <poppack.h> #ifdef __cplusplus

1 0

Alexandre Julliard : winebuild: Set the IMAGE_FILE_EXECUTABLE_IMAGE flag for all modules.
by Alexandre Julliard May 25, 2007

May 25, 2007

Module: wine Branch: master Commit: 560113b7438542c031ec1f87783977069f241c75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=560113b7438542c031ec1f877… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 24 12:54:27 2007 +0200 winebuild: Set the IMAGE_FILE_EXECUTABLE_IMAGE flag for all modules. --- tools/winebuild/utils.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 656e375..a251e6f 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -333,7 +333,7 @@ DLLSPEC *alloc_dll_spec(void) spec->alloc_entry_points = 0; spec->nb_names = 0; spec->nb_resources = 0; - spec->characteristics = 0; + spec->characteristics = IMAGE_FILE_EXECUTABLE_IMAGE; spec->dll_characteristics = IMAGE_DLLCHARACTERISTICS_NX_COMPAT; spec->subsystem = 0; spec->subsystem_major = 4;

1 0