June 2008 - Wine-commits - list.winehq.org

Maarten Lankhorst : quartz: Add the ability to force a pin to use a certain renderer.
by Alexandre Julliard 21 Jun '08

21 Jun '08

Module: wine Branch: master Commit: e8705402a40682b4e6d73856e196c2f6a8cbf3c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8705402a40682b4e6d73856e… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Jun 10 17:57:41 2008 +0200 quartz: Add the ability to force a pin to use a certain renderer. --- dlls/quartz/dsoundrender.c | 2 +- dlls/quartz/nullrenderer.c | 2 +- dlls/quartz/pin.c | 19 ++++++++++++------- dlls/quartz/pin.h | 3 ++- dlls/quartz/transform.c | 2 +- dlls/quartz/videorenderer.c | 2 +- 6 files changed, 18 insertions(+), 12 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 787ffe7..29596ea 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -344,7 +344,7 @@ HRESULT DSoundRender_create(IUnknown * pUnkOuter, LPVOID * ppv) piInput.dir = PINDIR_INPUT; piInput.pFilter = (IBaseFilter *)pDSoundRender; lstrcpynW(piInput.achName, wcsInputPinName, sizeof(piInput.achName) / sizeof(piInput.achName[0])); - hr = InputPin_Construct(&DSoundRender_InputPin_Vtbl, &piInput, DSoundRender_Sample, pDSoundRender, DSoundRender_QueryAccept, NULL, &pDSoundRender->csFilter, (IPin **)&pDSoundRender->pInputPin); + hr = InputPin_Construct(&DSoundRender_InputPin_Vtbl, &piInput, DSoundRender_Sample, pDSoundRender, DSoundRender_QueryAccept, NULL, &pDSoundRender->csFilter, NULL, (IPin **)&pDSoundRender->pInputPin); if (SUCCEEDED(hr)) { diff --git a/dlls/quartz/nullrenderer.c b/dlls/quartz/nullrenderer.c index 45315f7..bcbf32b 100644 --- a/dlls/quartz/nullrenderer.c +++ b/dlls/quartz/nullrenderer.c @@ -198,7 +198,7 @@ HRESULT NullRenderer_create(IUnknown * pUnkOuter, LPVOID * ppv) piInput.pFilter = (IBaseFilter *)pNullRenderer; lstrcpynW(piInput.achName, wcsInputPinName, sizeof(piInput.achName) / sizeof(piInput.achName[0])); - hr = InputPin_Construct(&NullRenderer_InputPin_Vtbl, &piInput, NullRenderer_Sample, (LPVOID)pNullRenderer, NullRenderer_QueryAccept, NULL, &pNullRenderer->csFilter, (IPin **)&pNullRenderer->pInputPin); + hr = InputPin_Construct(&NullRenderer_InputPin_Vtbl, &piInput, NullRenderer_Sample, (LPVOID)pNullRenderer, NullRenderer_QueryAccept, NULL, &pNullRenderer->csFilter, NULL, (IPin **)&pNullRenderer->pInputPin); if (SUCCEEDED(hr)) { diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index 8619776..18079f3 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -236,7 +236,7 @@ static HRESULT OutputPin_ConnectSpecific(IPin * iface, IPin * pReceivePin, const } static HRESULT InputPin_Init(const IPinVtbl *InputPin_Vtbl, const PIN_INFO * pPinInfo, SAMPLEPROC_PUSH pSampleProc, LPVOID pUserData, - QUERYACCEPTPROC pQueryAccept, CLEANUPPROC pCleanUp, LPCRITICAL_SECTION pCritSec, InputPin * pPinImpl) + QUERYACCEPTPROC pQueryAccept, CLEANUPPROC pCleanUp, LPCRITICAL_SECTION pCritSec, IMemAllocator *allocator, InputPin * pPinImpl) { TRACE("\n"); @@ -252,7 +252,9 @@ static HRESULT InputPin_Init(const IPinVtbl *InputPin_Vtbl, const PIN_INFO * pPi /* Input pin attributes */ pPinImpl->fnSampleProc = pSampleProc; pPinImpl->fnCleanProc = pCleanUp; - pPinImpl->pAllocator = NULL; + pPinImpl->pAllocator = pPinImpl->preferred_allocator = allocator; + if (pPinImpl->preferred_allocator) + IMemAllocator_AddRef(pPinImpl->preferred_allocator); pPinImpl->tStart = 0; pPinImpl->tStop = 0; pPinImpl->dRate = 1.0; @@ -299,7 +301,7 @@ static HRESULT OutputPin_Init(const IPinVtbl *OutputPin_Vtbl, const PIN_INFO * p return S_OK; } -HRESULT InputPin_Construct(const IPinVtbl *InputPin_Vtbl, const PIN_INFO * pPinInfo, SAMPLEPROC_PUSH pSampleProc, LPVOID pUserData, QUERYACCEPTPROC pQueryAccept, CLEANUPPROC pCleanUp, LPCRITICAL_SECTION pCritSec, IPin ** ppPin) +HRESULT InputPin_Construct(const IPinVtbl *InputPin_Vtbl, const PIN_INFO * pPinInfo, SAMPLEPROC_PUSH pSampleProc, LPVOID pUserData, QUERYACCEPTPROC pQueryAccept, CLEANUPPROC pCleanUp, LPCRITICAL_SECTION pCritSec, IMemAllocator *allocator, IPin ** ppPin) { InputPin * pPinImpl; @@ -316,7 +318,7 @@ HRESULT InputPin_Construct(const IPinVtbl *InputPin_Vtbl, const PIN_INFO * pPinI if (!pPinImpl) return E_OUTOFMEMORY; - if (SUCCEEDED(InputPin_Init(InputPin_Vtbl, pPinInfo, pSampleProc, pUserData, pQueryAccept, pCleanUp, pCritSec, pPinImpl))) + if (SUCCEEDED(InputPin_Init(InputPin_Vtbl, pPinInfo, pSampleProc, pUserData, pQueryAccept, pCleanUp, pCritSec, allocator, pPinImpl))) { *ppPin = (IPin *)pPinImpl; return S_OK; @@ -552,6 +554,8 @@ ULONG WINAPI InputPin_Release(IPin * iface) FreeMediaType(&This->pin.mtCurrent); if (This->pAllocator) IMemAllocator_Release(This->pAllocator); + This->pAllocator = NULL; + This->pin.lpVtbl = NULL; CoTaskMemFree(This); return 0; } @@ -766,6 +770,9 @@ HRESULT WINAPI MemInputPin_NotifyAllocator(IMemInputPin * iface, IMemAllocator * return E_POINTER; } + if (This->preferred_allocator && pAllocator != This->preferred_allocator) + return E_FAIL; + if (This->pAllocator) IMemAllocator_Release(This->pAllocator); This->pAllocator = pAllocator; @@ -824,9 +831,7 @@ HRESULT WINAPI MemInputPin_ReceiveCanBlock(IMemInputPin * iface) { InputPin *This = impl_from_IMemInputPin(iface); - FIXME("(%p/%p)->()\n", This, iface); - - /* FIXME: we should check whether any output pins will block */ + TRACE("(%p/%p)->()\n", This, iface); return S_OK; } diff --git a/dlls/quartz/pin.h b/dlls/quartz/pin.h index 8f160bf..6d0600e 100644 --- a/dlls/quartz/pin.h +++ b/dlls/quartz/pin.h @@ -93,6 +93,7 @@ typedef struct InputPin REFERENCE_TIME tStop; double dRate; BOOL flushing, end_of_stream; + IMemAllocator *preferred_allocator; } InputPin; typedef struct OutputPin @@ -142,7 +143,7 @@ typedef struct PullPin #define Req_Pause 3 /*** Constructors ***/ -HRESULT InputPin_Construct(const IPinVtbl *InputPin_Vtbl, const PIN_INFO * pPinInfo, SAMPLEPROC_PUSH pSampleProc, LPVOID pUserData, QUERYACCEPTPROC pQueryAccept, CLEANUPPROC pCleanUp, LPCRITICAL_SECTION pCritSec, IPin ** ppPin); +HRESULT InputPin_Construct(const IPinVtbl *InputPin_Vtbl, const PIN_INFO * pPinInfo, SAMPLEPROC_PUSH pSampleProc, LPVOID pUserData, QUERYACCEPTPROC pQueryAccept, CLEANUPPROC pCleanUp, LPCRITICAL_SECTION pCritSec, IMemAllocator *, IPin ** ppPin); HRESULT OutputPin_Construct(const IPinVtbl *OutputPin_Vtbl, long outputpin_size, const PIN_INFO * pPinInfo, ALLOCATOR_PROPERTIES *props, LPVOID pUserData, QUERYACCEPTPROC pQueryAccept, LPCRITICAL_SECTION pCritSec, IPin ** ppPin); HRESULT PullPin_Construct(const IPinVtbl *PullPin_Vtbl, const PIN_INFO * pPinInfo, SAMPLEPROC_PULL pSampleProc, LPVOID pUserData, QUERYACCEPTPROC pQueryAccept, CLEANUPPROC pCleanUp, STOPPROCESSPROC, REQUESTPROC pCustomRequest, LPCRITICAL_SECTION pCritSec, IPin ** ppPin); diff --git a/dlls/quartz/transform.c b/dlls/quartz/transform.c index 7f50268..d602c69 100644 --- a/dlls/quartz/transform.c +++ b/dlls/quartz/transform.c @@ -187,7 +187,7 @@ HRESULT TransformFilter_Create(TransformFilterImpl* pTransformFilter, const CLSI piOutput.pFilter = (IBaseFilter *)pTransformFilter; lstrcpynW(piOutput.achName, wcsOutputPinName, sizeof(piOutput.achName) / sizeof(piOutput.achName[0])); - hr = InputPin_Construct(&TransformFilter_InputPin_Vtbl, &piInput, TransformFilter_Sample, pTransformFilter, TransformFilter_Input_QueryAccept, NULL, &pTransformFilter->csFilter, &pTransformFilter->ppPins[0]); + hr = InputPin_Construct(&TransformFilter_InputPin_Vtbl, &piInput, TransformFilter_Sample, pTransformFilter, TransformFilter_Input_QueryAccept, NULL, &pTransformFilter->csFilter, NULL, &pTransformFilter->ppPins[0]); if (SUCCEEDED(hr)) { diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 416422c..1decbfe 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -521,7 +521,7 @@ HRESULT VideoRenderer_create(IUnknown * pUnkOuter, LPVOID * ppv) piInput.pFilter = (IBaseFilter *)pVideoRenderer; lstrcpynW(piInput.achName, wcsInputPinName, sizeof(piInput.achName) / sizeof(piInput.achName[0])); - hr = InputPin_Construct(&VideoRenderer_InputPin_Vtbl, &piInput, VideoRenderer_Sample, (LPVOID)pVideoRenderer, VideoRenderer_QueryAccept, NULL, &pVideoRenderer->csFilter, (IPin **)&pVideoRenderer->pInputPin); + hr = InputPin_Construct(&VideoRenderer_InputPin_Vtbl, &piInput, VideoRenderer_Sample, (LPVOID)pVideoRenderer, VideoRenderer_QueryAccept, NULL, &pVideoRenderer->csFilter, NULL, (IPin **)&pVideoRenderer->pInputPin); if (SUCCEEDED(hr)) {

1 0

Paul Vriens : setupapi/tests: Remove some function pointer checks from testRegisterDeviceInfo.
by Alexandre Julliard 21 Jun '08

21 Jun '08

Module: wine Branch: master Commit: 6546cd5db2ee8c8b73475d9344020c4efe453aab URL: http://source.winehq.org/git/wine.git/?a=commit;h=6546cd5db2ee8c8b73475d934… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Jun 20 16:18:14 2008 +0200 setupapi/tests: Remove some function pointer checks from testRegisterDeviceInfo. --- dlls/setupapi/tests/devinst.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 7604095..2612f21 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -598,12 +598,6 @@ static void testRegisterDeviceInfo(void) BOOL ret; HDEVINFO set; - if (!pSetupDiCreateDeviceInfoList || !pSetupDiDestroyDeviceInfoList || - !pSetupDiRegisterDeviceInfo) - { - skip("No SetupDiRegisterDeviceInfo\n"); - return; - } SetLastError(0xdeadbeef); ret = pSetupDiRegisterDeviceInfo(NULL, NULL, 0, NULL, NULL, NULL); ok(!ret && GetLastError() == ERROR_INVALID_HANDLE,

1 0

Paul Vriens : setupapi/tests: Remove win9x specifics from testDevRegKey.
by Alexandre Julliard 21 Jun '08

21 Jun '08

Module: wine Branch: master Commit: 44499b5b0b6b87407aa0f3f544e6dbf965bd8171 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44499b5b0b6b87407aa0f3f54… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Jun 20 16:09:55 2008 +0200 setupapi/tests: Remove win9x specifics from testDevRegKey. --- dlls/setupapi/tests/devinst.c | 15 --------------- 1 files changed, 0 insertions(+), 15 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index dcd2eb6..7604095 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -903,23 +903,8 @@ static void testDevRegKey(void) HDEVINFO set; HKEY key = NULL; - if (!pSetupDiCreateDeviceInfoList || !pSetupDiDestroyDeviceInfoList || - !pSetupDiCreateDeviceInfoA || !pSetupDiOpenDevRegKey || - !pSetupDiRegisterDeviceInfo || !pSetupDiCreateDevRegKeyW || - !pSetupDiCallClassInstaller) - { - skip("No SetupDiOpenDevRegKey\n"); - return; - } - - /* Check if we are on win9x */ SetLastError(0xdeadbeef); key = pSetupDiCreateDevRegKeyW(NULL, NULL, 0, 0, 0, NULL, NULL); - if (key == INVALID_HANDLE_VALUE && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) - { - skip("We are on win9x where the tests introduce issues\n"); - return; - } ok(key == INVALID_HANDLE_VALUE, "Expected INVALID_HANDLE_VALUE, got %p\n", key); ok(GetLastError() == ERROR_INVALID_HANDLE,

1 0

Paul Vriens : setupapi/tests: Remove win9x specifics from testDeviceRegistryPropertyW.
by Alexandre Julliard 21 Jun '08

21 Jun '08

Module: wine Branch: master Commit: 50d6b08353a2ddb704e611b55732a2b233321e10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50d6b08353a2ddb704e611b55… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Jun 20 16:00:48 2008 +0200 setupapi/tests: Remove win9x specifics from testDeviceRegistryPropertyW. --- dlls/setupapi/tests/devinst.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 2a24891..dcd2eb6 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -1272,11 +1272,6 @@ static void testDeviceRegistryPropertyW() SetLastError(0xdeadbeef); set = pSetupDiGetClassDevsW(&guid, NULL, 0, DIGCF_DEVICEINTERFACE); - if (set == INVALID_HANDLE_VALUE && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) - { - skip("W-functions are not implemented\n"); - return; - } ok(set != INVALID_HANDLE_VALUE, "SetupDiGetClassDevsW failed: %08x\n", GetLastError()); SetLastError(0xdeadbeef);

1 0

Paul Vriens : setupapi/tests: Skip all tests on Win9x and WinMe.
by Alexandre Julliard 21 Jun '08

21 Jun '08

Module: wine Branch: master Commit: 0fbe23c13dedfcd335eab7a28cb7bb4ca12bfd9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fbe23c13dedfcd335eab7a28… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Jun 20 15:43:59 2008 +0200 setupapi/tests: Skip all tests on Win9x and WinMe. --- dlls/setupapi/tests/devinst.c | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 481eaa4..2a24891 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -1365,7 +1365,21 @@ static void testDeviceRegistryPropertyW() START_TEST(devinst) { - init_function_pointers(); + HDEVINFO set; + + init_function_pointers(); + + /* Win9x/WinMe does things totally different so we skip all the tests + * + * We don't want to exclude NT4 so hence this check. + */ + SetLastError(0xdeadbeef); + set = pSetupDiGetClassDevsW(NULL, NULL, 0, 0); + if (set == INVALID_HANDLE_VALUE && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + skip("Win9x/WinMe has totally different behavior\n"); + return; + } if (pSetupDiCreateDeviceInfoListExW && pSetupDiDestroyDeviceInfoList) test_SetupDiCreateDeviceInfoListEx(); @@ -1376,6 +1390,7 @@ START_TEST(devinst) test_SetupDiOpenClassRegKeyExA(); else skip("SetupDiOpenClassRegKeyExA is not available\n"); + testInstallClass(); testCreateDeviceInfo(); testGetDeviceInstanceId();

1 0

Paul Vriens : user32/tests: Skip tests if functions are not implemented.
by Alexandre Julliard 21 Jun '08

21 Jun '08

Module: wine Branch: master Commit: 5191f0f2fd82b0c45b52b729def844eb97bc8742 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5191f0f2fd82b0c45b52b729d… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Jun 20 17:07:33 2008 +0200 user32/tests: Skip tests if functions are not implemented. --- dlls/user32/tests/msg.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 962aa5c..a47cfc5 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -1521,7 +1521,9 @@ static int log_all_parent_messages; /* user32 functions */ static HWND (WINAPI *pGetAncestor)(HWND,UINT); +static BOOL (WINAPI *pGetMenuInfo)(HMENU,LPCMENUINFO); static void (WINAPI *pNotifyWinEvent)(DWORD, HWND, LONG, LONG); +static BOOL (WINAPI *pSetMenuInfo)(HMENU,LPCMENUINFO); static HWINEVENTHOOK (WINAPI *pSetWinEventHook)(DWORD, DWORD, HMODULE, WINEVENTPROC, DWORD, DWORD, DWORD); static BOOL (WINAPI *pTrackMouseEvent)(TRACKMOUSEEVENT*); static BOOL (WINAPI *pUnhookWinEvent)(HWINEVENTHOOK); @@ -1540,7 +1542,9 @@ static void init_procs(void) } GET_PROC(user32, GetAncestor) + GET_PROC(user32, GetMenuInfo) GET_PROC(user32, NotifyWinEvent) + GET_PROC(user32, SetMenuInfo) GET_PROC(user32, SetWinEventHook) GET_PROC(user32, TrackMouseEvent) GET_PROC(user32, UnhookWinEvent) @@ -10574,7 +10578,7 @@ static void set_menu_style(HMENU hmenu, DWORD style) mi.fMask = MIM_STYLE; mi.dwStyle = style; SetLastError(0xdeadbeef); - ret = SetMenuInfo(hmenu, &mi); + ret = pSetMenuInfo(hmenu, &mi); ok(ret, "SetMenuInfo error %u\n", GetLastError()); } @@ -10587,7 +10591,7 @@ static DWORD get_menu_style(HMENU hmenu) mi.fMask = MIM_STYLE; mi.dwStyle = 0; SetLastError(0xdeadbeef); - ret = GetMenuInfo(hmenu, &mi); + ret = pGetMenuInfo(hmenu, &mi); ok(ret, "GetMenuInfo error %u\n", GetLastError()); return mi.dwStyle; @@ -10601,6 +10605,11 @@ static void test_menu_messages(void) HWND hwnd; DWORD style; + if (!pGetMenuInfo || !pSetMenuInfo) + { + skip("GetMenuInfo and/or SetMenuInfo are not available\n"); + return; + } cls.style = 0; cls.lpfnWndProc = parent_menu_proc; cls.cbClsExtra = 0;

1 0

Dan Kegel : dsound: Don't free buffer if it's owned by alsa.
by Alexandre Julliard 21 Jun '08

21 Jun '08

Module: wine Branch: master Commit: 025457e09be09b7a410feaa462f3d28690f85fba URL: http://source.winehq.org/git/wine.git/?a=commit;h=025457e09be09b7a410feaa46… Author: Dan Kegel <dank(a)kegel.com> Date: Fri Jun 20 05:49:15 2008 -0700 dsound: Don't free buffer if it's owned by alsa. --- dlls/dsound/dsound.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index cd0861a..87e9bba 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -1282,7 +1282,8 @@ ULONG DirectSoundDevice_Release(DirectSoundDevice * device) HeapFree(GetProcessHeap(), 0, device->tmp_buffer); HeapFree(GetProcessHeap(), 0, device->mix_buffer); - HeapFree(GetProcessHeap(), 0, device->buffer); + if (device->drvdesc.dwFlags & DSDDESC_USESYSTEMMEMORY) + HeapFree(GetProcessHeap(), 0, device->buffer); RtlDeleteResource(&device->buffer_list_lock); device->mixlock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&device->mixlock);

1 0

Huw Davies : inetcomm: Fully initialize start and length.
by Alexandre Julliard 21 Jun '08

21 Jun '08

Module: wine Branch: master Commit: d9bf3b5c4a83d331b1ed71cf5c3425ee3f789157 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9bf3b5c4a83d331b1ed71cf5… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jun 9 11:37:23 2008 +0100 inetcomm: Fully initialize start and length. Should fix Valgrind warnings 'Conditional jump or move depends on uninitialised value(s)' in inetcomm tests. --- dlls/inetcomm/mimeole.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index ee03e92..7e9d709 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -1629,8 +1629,8 @@ static body_t *create_sub_body(MimeMessage *msg, IStream *pStm, BODYOFFSETS *off IStream *sub_stream; ULARGE_INTEGER start, length; - start.u.LowPart = cur->offsets.cbHeaderStart; - length.u.LowPart = cur->offsets.cbBodyEnd - cur->offsets.cbHeaderStart; + start.QuadPart = cur->offsets.cbHeaderStart; + length.QuadPart = cur->offsets.cbBodyEnd - cur->offsets.cbHeaderStart; create_sub_stream(pStm, start, length, &sub_stream); sub_body = create_sub_body(msg, sub_stream, &cur->offsets, body); IStream_Release(sub_stream);

1 0

Dan Kegel : advpack: Don't close a handle if it wasn't opened.
by Alexandre Julliard 21 Jun '08

21 Jun '08

Module: wine Branch: master Commit: 64a62d2e8f53cb004db6cebfbbac96e3bba32ae9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64a62d2e8f53cb004db6cebfb… Author: Dan Kegel <dank(a)kegel.com> Date: Fri Jun 20 05:46:24 2008 -0700 advpack: Don't close a handle if it wasn't opened. --- dlls/advpack/advpack.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advpack/advpack.c b/dlls/advpack/advpack.c index 6c26e51..112d38a 100644 --- a/dlls/advpack/advpack.c +++ b/dlls/advpack/advpack.c @@ -70,7 +70,7 @@ static void get_dest_dir(HINF hInf, PCWSTR pszSection, PWSTR pszBuffer, DWORD dw INFCONTEXT context; WCHAR key[MAX_PATH + 2], value[MAX_PATH + 2]; WCHAR prefix[PREFIX_LEN + 2]; - HKEY root, subkey; + HKEY root, subkey = 0; DWORD size; static const WCHAR hklm[] = {'H','K','L','M',0}; @@ -102,7 +102,7 @@ static void get_dest_dir(HINF hInf, PCWSTR pszSection, PWSTR pszBuffer, DWORD dw strip_quotes(pszBuffer, &size); } - RegCloseKey(subkey); + if (subkey) RegCloseKey(subkey); } /* loads the LDIDs specified in the install section of an INF */

1 0

Vladimir Pankratov : oleview: Add Russian translation.
by Alexandre Julliard 21 Jun '08

21 Jun '08

Module: wine Branch: master Commit: ad0c267f748339f98fb27af11637284de1016674 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad0c267f748339f98fb27af11… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Fri Jun 20 16:07:32 2008 +0500 oleview: Add Russian translation. --- programs/oleview/Ru.rc | 213 ++++++++++++++++++++++++++++++++++++++++++++++ programs/oleview/rsrc.rc | 1 + 2 files changed, 214 insertions(+), 0 deletions(-) diff --git a/programs/oleview/Ru.rc b/programs/oleview/Ru.rc new file mode 100644 index 0000000..29aca2a --- /dev/null +++ b/programs/oleview/Ru.rc @@ -0,0 +1,213 @@ +/* + * OleView (Ru.rc) + * Russian Language Support + * + * Copyright 2008 Vladimir Pankratov + * + * 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 + */ + +LANGUAGE LANG_RUSSIAN, SUBLANG_RUSSIAN + +IDM_MENU MENU +{ + POPUP "&��" + { + MENUITEM "�&�� ...", IDM_BIND + MENUITEM "&�� TypeLib...", IDM_TYPELIB + MENUITEM SEPARATOR + MENUITEM "&�� ...", IDM_SYSCONF + MENUITEM "&�� ", IDM_REGEDIT + MENUITEM SEPARATOR + MENUITEM "&��", IDM_EXIT + } + POPUP "&��" + { + POPUP "&CoCreateInstance Flag" + { + MENUITEM "CLSCTX_&INPROC_SERVER", IDM_FLAG_INSERV,CHECKED + MENUITEM "CLSCTX_INPROC_&HANDLER", IDM_FLAG_INHANDL + MENUITEM "CLSCTX_&LOCAL_SERVER", IDM_FLAG_LOCSERV,CHECKED + MENUITEM "CLSCTX_&REMOTE_SERVER", IDM_FLAG_REMSERV + } + MENUITEM SEPARATOR + MENUITEM "�� &Type info", IDM_TYPEINFO, GRAYED + MENUITEM SEPARATOR + MENUITEM "Create &Instance", IDM_CREATEINST, GRAYED + MENUITEM "Create Instance &On...", IDM_CREATEINSTON, GRAYED + MENUITEM "&Release Instance", IDM_RELEASEINST, GRAYED + MENUITEM SEPARATOR + MENUITEM "�� C&LSID � ��", IDM_COPYCLSID, GRAYED + MENUITEM "�� &HTML object Tag � ��", IDM_HTMLTAG, GRAYED + MENUITEM SEPARATOR + MENUITEM "&��...", IDM_VIEW, GRAYED + } + POPUP "&��" + { + MENUITEM "&�� ", IDM_EXPERT,CHECKED + MENUITEM SEPARATOR + MENUITEM "&Hidden component categories", IDM_HIDDEN, GRAYED + MENUITEM SEPARATOR + MENUITEM "&�� ", IDM_TOOLBAR,CHECKED + MENUITEM "&�� ", IDM_STATUSBAR,CHECKED + MENUITEM SEPARATOR + MENUITEM "&��\tF5", IDM_REFRESH + } + POPUP "&��" + { + MENUITEM "&� ��...", IDM_ABOUT + } +} + +IDM_TYPELIB MENU +{ + POPUP "&��" + { + MENUITEM "&�� ...", IDM_SAVEAS + MENUITEM "&��", IDM_CLOSE + } + POPUP "&��" + { + MENUITEM "&Group by type kind", IDM_GROUP + MENUITEM SEPARATOR + MENUITEM "&�� ", IDM_TOOLBAR + MENUITEM "&�� ", IDM_STATUSBAR,CHECKED + } +} + +STRINGTABLE +{ + IDS_APPNAME "OleView" + IDS_APPTITLE "OleView" + IDS_READY "��" + IDS_ABOUT "OleView - OLE/COM Object Viewer" + IDS_ABOUTVER "�� 1.0" + IDS_TYPELIBTITLE "ITypeLib viewer" + IDS_OPEN "��" + IDS_OPEN_TYPELIB_FILTER "�� TypeLib (*.tlb;*.olb;*.dll;*.ocx;*.exe)\0*.tlb;*.olb;*.dll;*.ocx;*.exe\0All Files (*.*)\0*.*\0\0" + + IDM_BIND, "Bind to file via a File Moniker" + IDM_TYPELIB, "Open a TypeLib file and view the contents" + IDM_SYSCONF, "Change machine wide Distributed COM settings" + IDM_REGEDIT, "�� Wine" + IDM_EXIT, "�� " + IDM_CREATEINST, "Create an instance of the selected object" + IDM_CREATEINSTON, "Create an instance of the selected object on a specyfic machine" + IDM_RELEASEINST, "Release the currently selected object instance" + IDM_COPYCLSID, "�� GUID �� " + IDM_VIEW, "Display the viewer for the selected item" + IDM_FLAG_INSERV, "�� CLSCTX_INPROC_SERVER �� CoGetClassObject" + IDM_FLAG_INHANDL, "�� CLSCTX_INPROC_HANDLER �� CoGetClassObject" + IDM_FLAG_LOCSERV, "�� CLSCTX_LOCAL_SERVER �� CoGetClassObject" + IDM_FLAG_REMSERV, "�� CLSCTX_REMOTE_SERVER �� CoGetClassObject" + IDM_EXPERT, "�� /��" + IDM_HIDDEN, "Toggle the display of component categories that are not meant to be visible" + IDM_TOOLBAR, "��/�� " + IDM_STATUSBAR, "��/�� " + IDM_REFRESH, "�� " + IDM_ABOUT, "�� , �� " + + IDM_SAVEAS, "�� .IDL �� .H ��" + IDM_CLOSE, "�� " + IDM_GROUP, "Group typeinfos by kind" + + IDS_TREE_OC, "ObjectClasses" + IDS_TREE_GBCC, "Grouped by Component Category" + IDS_TREE_O1O, "�� OLE 1.0" + IDS_TREE_CLO, "�� COM" + IDS_TREE_AO, "�� " + IDS_TREE_AID, "ID ��" + IDS_TREE_TL, "Type Libraries" + IDS_TL_VER, "��." + IDS_TREE_I, "��" + + IDS_TAB_REG, "��" + IDS_TAB_IMPL, "Implementation" + IDS_TAB_ACTIV, "Activation" + + IDS_CGCOFAIL, "CoGetClassObject failed." + IDS_ERROR_UNKN, "�� " + IDS_TRUE, "True" + IDS_FALSE, "False" + IDS_BYTES, "��" + + IDS_ERROR_LOADTYPELIB, "LoadTypeLib( %s ) failed ($%x)" + IDS_INHERITINTERFACES, "Inherited Interfaces" +} + +DLG_CREATEINSTON DIALOG DISCARDABLE 0, 0, 250, 41 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU +CAPTION "�� " +FONT 8, "MS Shell Dlg" +{ + LTEXT "&�� :", IDIGNORE, 5, 6, 190, 8 + EDITTEXT IDC_MACHINE, 5, 16, 190, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL + DEFPUSHBUTTON "&OK", IDOK, 200, 5, 45, 14 + PUSHBUTTON "&��", IDCANCEL, 200, 22, 45, 14 +} + +DLG_SYSCONF DIALOG DISCARDABLE 0, 0, 170, 100 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU +CAPTION "�� " +FONT 8, "MS Shell Dlg" +{ + LTEXT "�� ", IDIGNORE, 5, 6, 160, 8 + CHECKBOX "&�� COM", IDC_ENABLEDCOM, 5, 20, 160, 10, WS_TABSTOP | WS_GROUP | BS_AUTOCHECKBOX + CHECKBOX "�� &�� (�� Win95)", IDC_ENABLEREMOTE, 5, 35, 160, 10, WS_TABSTOP | WS_GROUP | BS_AUTOCHECKBOX + LTEXT "�� Wine.", IDIGNORE, 5, 50, 160, 40 + DEFPUSHBUTTON "&OK", IDOK, 70, 80, 45, 14 + PUSHBUTTON "&��", IDCANCEL, 120, 80, 45, 14 +} + +DLG_DEFAULT_IV DIALOG DISCARDABLE 0, 0, 280, 50 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU +CAPTION "Default Interface Viewer" +FONT 8, "MS Shell Dlg" +{ + LTEXT "��", IDIGNORE, 5, 6, 50, 8 + LTEXT "", IDC_LABEL, 60, 6, 145, 8 + LTEXT "IID:", IDIGNORE, 5, 16, 50, 8 + LTEXT "", IDC_IDENTIFIER, 60, 16, 165, 8 + DEFPUSHBUTTON "&��", IDCANCEL, 230, 6, 45, 14 + PUSHBUTTON "&View Type Info", IDC_VIEWTYPEINFO, 6, 31, 70, 14, WS_DISABLED +} + +DLG_IPERSIST_IV DIALOG DISCARDABLE 0, 0, 280, 29 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU +CAPTION "IPersist Interface Viewer" +FONT 8, "MS Shell Dlg" +{ + LTEXT "�� :", IDIGNORE, 5, 6, 50, 8 + LTEXT "", IDC_LABEL, 60, 6, 145, 8 + LTEXT "CLSID:", IDIGNORE, 5, 16, 50, 8 + LTEXT "", IDC_IDENTIFIER, 60, 16, 165, 8 + DEFPUSHBUTTON "&��", IDCANCEL, 230, 6, 45, 14 +} + +DLG_IPERSISTSTREAM_IV DIALOG DISCARDABLE 0, 0, 280, 68 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU +CAPTION "IPersistStream Interface Viewer" +FONT 8, "MS Shell Dlg" +{ + LTEXT "�� :", IDIGNORE, 5, 6, 50, 8 + LTEXT "", IDC_LABEL, 60, 6, 145, 8 + LTEXT "CLSID:", IDIGNORE, 5, 16, 50, 8 + LTEXT "", IDC_IDENTIFIER, 60, 16, 165, 8 + DEFPUSHBUTTON "&��", IDCANCEL, 230, 6, 45, 14 + PUSHBUTTON "&IsDirty", IDC_ISDIRTY_BUTTON, 6, 31, 50, 14 + LTEXT "???", IDC_ISDIRTY, 60, 34, 145, 8 + PUSHBUTTON "&GetSizeMax", IDC_GETSIZEMAX_BUTTON, 6, 49, 50, 14 + LTEXT "???", IDC_GETSIZEMAX, 60, 52, 145, 8 +} diff --git a/programs/oleview/rsrc.rc b/programs/oleview/rsrc.rc index 9604346..5b4c781 100644 --- a/programs/oleview/rsrc.rc +++ b/programs/oleview/rsrc.rc @@ -31,6 +31,7 @@ #include "Nl.rc" #include "No.rc" #include "Pl.rc" +#include "Ru.rc" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL

1 0