wine-commits January 2014

wine-commits@winehq.org

3 participants
814 discussions

Dmitry Timoshkov : ntdll: Remove shadow local variables.
by Alexandre Julliard 09 Jan '14

09 Jan '14

Module: wine Branch: master Commit: c7332fa1dc297e0aab71a7f6cf27d964c598e23d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7332fa1dc297e0aab71a7f6c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jan 9 19:06:29 2014 +0900 ntdll: Remove shadow local variables. --- dlls/ntdll/file.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index cf95cd0..d2efcc1 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -2134,7 +2134,6 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE hFile, PIO_STATUS_BLOCK io, if (size > 0x10000) size = 0x10000; if ((tmpbuf = RtlAllocateHeap( GetProcessHeap(), 0, size ))) { - int fd, needs_close; if (!server_get_unix_fd( hFile, FILE_READ_DATA, &fd, &needs_close, NULL, NULL )) { int res = recv( fd, tmpbuf, size, MSG_PEEK );

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 09 Jan '14

09 Jan '14

Module: wine Branch: master Commit: 9cb328e185a710861dc8edfdb21d91e22e240ca6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cb328e185a710861dc8edfdb… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Wed Jan 8 21:59:07 2014 +0200 po: Update Lithuanian translation. --- po/lt.po | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/po/lt.po b/po/lt.po index 4efafd9..7122fa2 100644 --- a/po/lt.po +++ b/po/lt.po @@ -1,11 +1,11 @@ # Lithuanian translations for Wine -# Aurimas Fišeras <aurimas(a)members.fsf.org>, 2011, 2012, 2013. +# Aurimas Fišeras <aurimas(a)members.fsf.org>, 2011, 2012, 2013, 2014. msgid "" msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2013-12-12 22:08+0300\n" +"PO-Revision-Date: 2014-01-08 21:58+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -10152,10 +10152,8 @@ msgid "Wine Explorer" msgstr "„Wine“ naršyklė" #: explorer.rc:33 -#, fuzzy -#| msgid "StartUp" msgid "Start" -msgstr "Paleidimas" +msgstr "Pradžia" #: explorer.rc:34 winefile.rc:36 msgid "&Run..."

1 0

Nikolay Sivov : oleaut32: Mask out certain features on array copy.
by Alexandre Julliard 09 Jan '14

09 Jan '14

Module: wine Branch: master Commit: b058c96136850e543d171d766e5b132ba952cfb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b058c96136850e543d171d766… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 8 21:39:42 2014 +0400 oleaut32: Mask out certain features on array copy. --- dlls/oleaut32/safearray.c | 23 +++++++--- dlls/oleaut32/tests/safearray.c | 94 +++++++++++++++++++++++++++++++++++---- 2 files changed, 102 insertions(+), 15 deletions(-) diff --git a/dlls/oleaut32/safearray.c b/dlls/oleaut32/safearray.c index 57a0d10..71f8c69 100644 --- a/dlls/oleaut32/safearray.c +++ b/dlls/oleaut32/safearray.c @@ -85,6 +85,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(variant); /* Undocumented hidden space before the start of a SafeArray descriptor */ #define SAFEARRAY_HIDDEN_SIZE sizeof(GUID) +/* features listed here are not propagated to newly created array or data copy + created with SafeArrayCopy()/SafeArrayCopyData() */ +static const USHORT ignored_copy_features = + FADF_AUTO | + FADF_STATIC | + FADF_EMBEDDED | + FADF_FIXEDSIZE | + FADF_CREATEVECTOR; + /* Allocate memory */ static inline LPVOID SAFEARRAY_Malloc(ULONG ulSize) { @@ -349,8 +358,7 @@ static HRESULT SAFEARRAY_CopyData(SAFEARRAY *psa, SAFEARRAY *dest) { ULONG ulCellCount = SAFEARRAY_GetCellCount(psa); - dest->fFeatures = (dest->fFeatures & FADF_CREATEVECTOR) | - (psa->fFeatures & ~(FADF_CREATEVECTOR|FADF_DATADELETED)); + dest->fFeatures = (dest->fFeatures & FADF_CREATEVECTOR) | (psa->fFeatures & ~ignored_copy_features); if (psa->fFeatures & FADF_VARIANT) { @@ -1273,6 +1281,7 @@ HRESULT WINAPI SafeArrayDestroyData(SAFEARRAY *psa) */ HRESULT WINAPI SafeArrayCopyData(SAFEARRAY *psaSource, SAFEARRAY *psaTarget) { + HRESULT hr; int dim; TRACE("(%p,%p)\n", psaSource, psaTarget); @@ -1288,10 +1297,10 @@ HRESULT WINAPI SafeArrayCopyData(SAFEARRAY *psaSource, SAFEARRAY *psaTarget) psaTarget->rgsabound[dim].cElements) return E_INVALIDARG; - if (SUCCEEDED(SAFEARRAY_DestroyData(psaTarget, 0)) && - SUCCEEDED(SAFEARRAY_CopyData(psaSource, psaTarget))) - return S_OK; - return E_UNEXPECTED; + hr = SAFEARRAY_DestroyData(psaTarget, 0); + if (FAILED(hr)) return hr; + + return SAFEARRAY_CopyData(psaSource, psaTarget); } /************************************************************************ @@ -1371,7 +1380,7 @@ HRESULT WINAPI SafeArrayCopy(SAFEARRAY *psa, SAFEARRAY **ppsaOut) hRet = SafeArrayAllocDescriptor(psa->cDims, ppsaOut); if (SUCCEEDED(hRet)) { - (*ppsaOut)->fFeatures = psa->fFeatures & ~FADF_CREATEVECTOR; + (*ppsaOut)->fFeatures = psa->fFeatures & ~ignored_copy_features; (*ppsaOut)->cbElements = psa->cbElements; } } diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c index faec23e..064b038 100644 --- a/dlls/oleaut32/tests/safearray.c +++ b/dlls/oleaut32/tests/safearray.c @@ -39,6 +39,10 @@ #include "wtypes.h" #include "oleauto.h" +#ifndef FADF_CREATEVECTOR + const USHORT FADF_CREATEVECTOR = 0x2000; +#endif + static HMODULE hOleaut32; static HRESULT (WINAPI *pSafeArrayAllocDescriptorEx)(VARTYPE,UINT,SAFEARRAY**); @@ -57,6 +61,14 @@ static BOOL has_i8; /* Has INT_PTR/UINT_PTR type? */ static BOOL has_int_ptr; +static const USHORT ignored_copy_features[] = + { + FADF_AUTO, + FADF_STATIC, + FADF_EMBEDDED, + FADF_FIXEDSIZE + }; + #define START_REF_COUNT 1 #define RECORD_SIZE 64 #define RECORD_SIZE_FAIL 17 @@ -1250,14 +1262,13 @@ static void test_SafeArrayGetPutElement_VARIANT(void) ok(hres == S_OK, "got 0x%08x\n", hres); } - static void test_SafeArrayCopyData(void) { SAFEARRAYBOUND sab[4]; SAFEARRAY *sa; SAFEARRAY *sacopy; HRESULT hres; - int dimension,size=1; + int dimension, size = 1, i; if (!pSafeArrayCopyData) { @@ -1330,17 +1341,52 @@ static void test_SafeArrayCopyData(void) hres = SafeArrayCopy(sa, &sacopy); ok(hres == S_OK, "copy failed hres 0x%x\n", hres); - if (hres == S_OK) + ok(SafeArrayGetElemsize(sa) == SafeArrayGetElemsize(sacopy),"elemsize wrong\n"); + ok(SafeArrayGetDim(sa) == SafeArrayGetDim(sacopy),"dimensions wrong\n"); + ok(!memcmp(sa->pvData, sacopy->pvData, size * sizeof(int)), "compared different\n"); + hres = SafeArrayDestroy(sacopy); + ok(hres == S_OK, "got 0x%08x\n", hres); + + sacopy = SafeArrayCreate(VT_INT, NUM_DIMENSIONS, sab); + ok(sacopy != NULL, "Copy test couldn't create copy array\n"); + ok(sacopy->fFeatures == FADF_HAVEVARTYPE, "0x%04x\n", sacopy->fFeatures); + + for (i = 0; i < sizeof(ignored_copy_features)/sizeof(USHORT); i++) { - ok(SafeArrayGetElemsize(sa) == SafeArrayGetElemsize(sacopy),"elemsize wrong\n"); - ok(SafeArrayGetDim(sa) == SafeArrayGetDim(sacopy),"dimensions wrong\n"); - ok(!memcmp(sa->pvData, sacopy->pvData, size * sizeof(int)), "compared different\n"); - hres = SafeArrayDestroy(sacopy); - ok(hres == S_OK, "got 0x%08x\n", hres); + USHORT feature = ignored_copy_features[i]; + USHORT orig = sacopy->fFeatures; + + sa->fFeatures |= feature; + hres = SafeArrayCopyData(sa, sacopy); + ok(hres == S_OK, "got 0x%08x\n", hres); + ok(sacopy->fFeatures == orig && orig == FADF_HAVEVARTYPE, "got features 0x%04x\n", sacopy->fFeatures); + sa->fFeatures &= ~feature; } + hres = SafeArrayDestroy(sacopy); + ok(hres == S_OK, "got 0x%08x\n", hres); hres = SafeArrayDestroy(sa); ok(hres == S_OK, "got 0x%08x\n", hres); + + /* copy data from a vector */ + sa = SafeArrayCreateVector(VT_UI1, 0, 2); + + sacopy = SafeArrayCreateVector(VT_UI1, 0, 2); + ok(sa->fFeatures == (FADF_HAVEVARTYPE|FADF_CREATEVECTOR), "got 0x%08x\n", sa->fFeatures); + ok(sacopy->fFeatures == (FADF_HAVEVARTYPE|FADF_CREATEVECTOR), "got 0x%08x\n", sacopy->fFeatures); + hres = SafeArrayCopyData(sa, sacopy); + ok(hres == S_OK, "got 0x%08x\n", hres); + ok(sacopy->fFeatures == (FADF_HAVEVARTYPE|FADF_CREATEVECTOR), "got 0x%04x\n", sacopy->fFeatures); + SafeArrayDestroy(sacopy); + + sacopy = SafeArrayCreate(VT_UI1, NUM_DIMENSIONS, sab); + ok(sacopy != NULL, "Copy test couldn't create copy array\n"); + ok(sacopy->fFeatures == FADF_HAVEVARTYPE, "0x%04x\n", sacopy->fFeatures); + hres = SafeArrayCopyData(sa, sacopy); + ok(hres == E_INVALIDARG, "got 0x%08x\n", hres); + SafeArrayDestroy(sacopy); + + SafeArrayDestroy(sa); } static void test_SafeArrayCreateEx(void) @@ -1541,6 +1587,7 @@ static void test_SafeArrayCopy(void) SAFEARRAY *sa, *sa2; VARIANTARG vSrc, vDst; HRESULT hres; + int i; sab.lLbound = 0; sab.cElements = 10; @@ -1605,6 +1652,37 @@ static void test_SafeArrayCopy(void) ok(hres == S_OK, "got 0x%08x\n", hres); hres = SafeArrayDestroy(sa); ok(hres == S_OK, "got 0x%08x\n", hres); + + /* test feature copy */ + hres = SafeArrayAllocDescriptor(1, &sa); + ok(hres == S_OK, "SafeArrayAllocDescriptor failed with error 0x%08x\n", hres); + ok(sa->fFeatures == 0, "got src features 0x%04x\n", sa->fFeatures); + sa->cbElements = 16; + + for (i = 0; i < sizeof(ignored_copy_features)/sizeof(USHORT); i++) + { + USHORT feature = ignored_copy_features[i]; + + sa->fFeatures |= feature; + hres = SafeArrayCopy(sa, &sa2); + ok(hres == S_OK, "got 0x%08x\n", hres); + ok(sa2->fFeatures == 0, "got features 0x%04x\n", sa2->fFeatures); + hres = SafeArrayDestroy(sa2); + ok(hres == S_OK, "got 0x%08x\n", hres); + sa->fFeatures &= ~feature; + } + + SafeArrayDestroy(sa); + + /* copy from a vector */ + sa = SafeArrayCreateVector(VT_UI1, 0, 2); + ok(sa->fFeatures == (FADF_HAVEVARTYPE|FADF_CREATEVECTOR), "got 0x%08x\n", hres); + hres = SafeArrayCopy(sa, &sa2); + ok(hres == S_OK, "got 0x%08x\n", hres); + ok(sa2->fFeatures == FADF_HAVEVARTYPE, "got 0x%04x\n", sa2->fFeatures); + + SafeArrayDestroy(sa2); + SafeArrayDestroy(sa); } #define MKARRAY(low,num,typ) sab.lLbound = low; sab.cElements = num; \

1 0

Bruno Jesus : iphlpapi/tests: Add more IcmpSendEcho tests related to the reply size.
by Alexandre Julliard 09 Jan '14

09 Jan '14

Module: wine Branch: master Commit: 2548d75f1681172f058ff862e8b0726638d4e8a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2548d75f1681172f058ff862e… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Jan 8 21:47:11 2014 -0200 iphlpapi/tests: Add more IcmpSendEcho tests related to the reply size. --- dlls/iphlpapi/tests/iphlpapi.c | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index dbf97b2..94716d7 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -44,6 +44,8 @@ #include <stdio.h> #include <stdlib.h> +#define ICMP_MINLEN 8 /* copied from dlls/iphlpapi/ip_icmp.h file */ + static HMODULE hLibrary = NULL; static DWORD (WINAPI *pGetNumberOfInterfaces)(PDWORD); @@ -956,7 +958,8 @@ todo_wine "expected 87, got %d\n", error); SetLastError(0xdeadbeef); - ret = pIcmpSendEcho(icmp, address, senddata, sizeof(senddata), NULL, replydata, sizeof(replydata) - 1, 1000); + replysz = sizeof(replydata) - 1; + ret = pIcmpSendEcho(icmp, address, senddata, sizeof(senddata), NULL, replydata, replysz, 1000); error = GetLastError(); todo_wine { ok (!ret, "IcmpSendEcho succeeded unexpectedly\n"); @@ -965,8 +968,42 @@ todo_wine "expected 11050, got %d\n", error); } + SetLastError(0xdeadbeef); + replysz = sizeof(ICMP_ECHO_REPLY); + ret = pIcmpSendEcho(icmp, address, senddata, 0, NULL, replydata, replysz, 1000); + error = GetLastError(); +todo_wine + ok (ret, "IcmpSendEcho failed unexpectedly with error %d\n", error); + + SetLastError(0xdeadbeef); + replysz = sizeof(ICMP_ECHO_REPLY) + ICMP_MINLEN; + ret = pIcmpSendEcho(icmp, address, senddata, ICMP_MINLEN, NULL, replydata, replysz, 1000); + error = GetLastError(); +todo_wine + ok (ret, "IcmpSendEcho failed unexpectedly with error %d\n", error); + + SetLastError(0xdeadbeef); + replysz = sizeof(ICMP_ECHO_REPLY) + ICMP_MINLEN; + ret = pIcmpSendEcho(icmp, address, senddata, ICMP_MINLEN + 1, NULL, replydata, replysz, 1000); + error = GetLastError(); + ok (!ret, "IcmpSendEcho succeeded unexpectedly\n"); +todo_wine + ok (error == IP_GENERAL_FAILURE + || broken(error == IP_BUF_TOO_SMALL) /* <= 2003 */, + "expected 11050, got %d\n", error); + + SetLastError(0xdeadbeef); + ret = pIcmpSendEcho(icmp, address, senddata, ICMP_MINLEN, NULL, replydata, replysz - 1, 1000); + error = GetLastError(); + ok (!ret, "IcmpSendEcho succeeded unexpectedly\n"); +todo_wine + ok (error == IP_GENERAL_FAILURE + || broken(error == IP_BUF_TOO_SMALL) /* <= 2003 */, + "expected 11050, got %d\n", error); + /* in windows >= vista the timeout can't be invalid */ SetLastError(0xdeadbeef); + replysz = sizeof(replydata); ret = pIcmpSendEcho(icmp, address, senddata, sizeof(senddata), NULL, replydata, replysz, 0); error = GetLastError(); if (!ret) ok(error == ERROR_INVALID_PARAMETER, "expected 87, got %d\n", error);

1 0

Michael Stefaniuc : dmime: Remove "#if 1" preprocessor directives.
by Alexandre Julliard 09 Jan '14

09 Jan '14

Module: wine Branch: master Commit: a4664409ef6cf67d88add6eb85ae503ee2b66fef URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4664409ef6cf67d88add6eb8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 9 10:37:26 2014 +0100 dmime: Remove "#if 1" preprocessor directives. --- dlls/dmime/segment.c | 2 -- dlls/dmime/segtriggertrack.c | 2 -- dlls/dmime/tempotrack.c | 9 +-------- 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index fa6a6a9..efc03ec 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -1109,7 +1109,6 @@ static HRESULT IDirectMusicSegment8Impl_IPersistStream_ParseSegmentForm (LPPERSI case DMUS_FOURCC_SEGMENT_CHUNK: { DWORD checkSz = sizeof(FOURCC); TRACE_(dmfile)(": segment chunk\n"); -#if 1 /** DX 7 */ IStream_Read (pStm, &This->header.dwRepeats, sizeof(This->header.dwRepeats), NULL); checkSz += sizeof(This->header.dwRepeats); @@ -1145,7 +1144,6 @@ static HRESULT IDirectMusicSegment8Impl_IPersistStream_ParseSegmentForm (LPPERSI IStream_Read (pStm, &This->header.rtPlayStart, sizeof(This->header.rtPlayStart), NULL); checkSz += sizeof(This->header.rtPlayStart); } -#endif liMove.QuadPart = Chunk.dwSize - checkSz + sizeof(FOURCC); IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); break; diff --git a/dlls/dmime/segtriggertrack.c b/dlls/dmime/segtriggertrack.c index 56847ae..d471114 100644 --- a/dlls/dmime/segtriggertrack.c +++ b/dlls/dmime/segtriggertrack.c @@ -460,7 +460,6 @@ static HRESULT WINAPI IDirectMusicSegTriggerTrack_IPersistStream_Load (LPPERSIST TRACE("(%p, %p): Loading\n", This, pStm); -#if 1 IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); switch (Chunk.fccID) { @@ -491,7 +490,6 @@ static HRESULT WINAPI IDirectMusicSegTriggerTrack_IPersistStream_Load (LPPERSIST return E_FAIL; } } -#endif return S_OK; } diff --git a/dlls/dmime/tempotrack.c b/dlls/dmime/tempotrack.c index cf1b275..2d19a5f 100644 --- a/dlls/dmime/tempotrack.c +++ b/dlls/dmime/tempotrack.c @@ -328,14 +328,12 @@ static HRESULT WINAPI IDirectMusicTempoTrack_IPersistStream_Load (LPPERSISTSTREA LPDMUS_PRIVATE_TEMPO_ITEM pNewItem = NULL; DWORD nItem = 0; FIXME("(%p, %p): Loading not fully implemented yet\n", This, pStm); - -#if 1 + IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); switch (Chunk.fccID) { case DMUS_FOURCC_TEMPO_TRACK: { TRACE_(dmfile)(": Tempo track\n"); -#if 1 IStream_Read (pStm, &StreamSize, sizeof(DWORD), NULL); StreamSize -= sizeof(DWORD); StreamCount = 0; @@ -356,10 +354,6 @@ static HRESULT WINAPI IDirectMusicTempoTrack_IPersistStream_Load (LPPERSISTSTREA StreamCount += sizeof(item); TRACE_(dmfile)(": StreamCount[0] = %d < StreamSize[0] = %d\n", StreamCount, StreamSize); } while (StreamCount < StreamSize); -#else - liMove.QuadPart = Chunk.dwSize; - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); -#endif break; } default: { @@ -369,7 +363,6 @@ static HRESULT WINAPI IDirectMusicTempoTrack_IPersistStream_Load (LPPERSISTSTREA return E_FAIL; } } -#endif return S_OK; }

1 0

Jeremy Newman : disable E_DEPRECATED (-8192) in PHP error reporting
by Jeremy Newman 09 Jan '14

09 Jan '14

Module: appdb Branch: master Commit: 1e53df9bf82420c7498d1561cbc0d3277f093c5e URL: http://source.winehq.org/git/appdb.git/?a=commit;h=1e53df9bf82420c7498d1561… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Jan 9 09:27:47 2014 -0600 disable E_DEPRECATED (-8192) in PHP error reporting --- .htaccess | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.htaccess b/.htaccess index 440ee16..98a1d1e 100644 --- a/.htaccess +++ b/.htaccess @@ -12,7 +12,7 @@ ErrorDocument 404 http://www.winehq.org/site/404 # Modify the PHP configuration (global vars, etc.) php_flag allow_call_time_pass_reference 1 -php_value error_reporting 30711 +php_value error_reporting 22519 php_value html_errors "1" php_value display_errors "1" php_value register_globals 0

1 0

Jeremy Newman : disable notices, and strict PHP error reporting
by Jeremy Newman 09 Jan '14

09 Jan '14

Module: appdb Branch: master Commit: 9e89f19117f5218c5ef6186a5696c937e14dfc2b URL: http://source.winehq.org/git/appdb.git/?a=commit;h=9e89f19117f5218c5ef6186a… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Jan 9 09:18:02 2014 -0600 disable notices, and strict PHP error reporting --- .htaccess | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.htaccess b/.htaccess index 1765613..440ee16 100644 --- a/.htaccess +++ b/.htaccess @@ -12,7 +12,7 @@ ErrorDocument 404 http://www.winehq.org/site/404 # Modify the PHP configuration (global vars, etc.) php_flag allow_call_time_pass_reference 1 -php_value error_reporting "1" +php_value error_reporting 30711 php_value html_errors "1" php_value display_errors "1" php_value register_globals 0

1 0

Jacek Caban : devenum: Populate CLSID_VideoCompressorCategory category in key in DEVENUM_CreateSpecialCategories.
by Alexandre Julliard 08 Jan '14

08 Jan '14

Module: wine Branch: master Commit: 81c42ce710bdc9385391310ecb3f22e2a153ac5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=81c42ce710bdc9385391310ec… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 8 14:12:25 2014 +0100 devenum: Populate CLSID_VideoCompressorCategory category in key in DEVENUM_CreateSpecialCategories. --- dlls/devenum/Makefile.in | 1 + dlls/devenum/createdevenum.c | 44 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+) diff --git a/dlls/devenum/Makefile.in b/dlls/devenum/Makefile.in index fe12606..38ca83d 100644 --- a/dlls/devenum/Makefile.in +++ b/dlls/devenum/Makefile.in @@ -1,5 +1,6 @@ MODULE = devenum.dll IMPORTS = strmiids uuid ole32 oleaut32 avicap32 winmm user32 advapi32 +DELAYIMPORTS = msvfw32 C_SRCS = \ createdevenum.c \ diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index baeb91e..11990d6 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -28,6 +28,7 @@ #include "devenum_private.h" #include "vfw.h" +#include "aviriff.h" #include "wine/debug.h" #include "wine/unicode.h" @@ -598,6 +599,44 @@ static HRESULT DEVENUM_CreateAMCategoryKey(const CLSID * clsidCategory) return res; } +static void register_vfw_codecs(void) +{ + WCHAR avico_clsid_str[CHARS_IN_GUID]; + HKEY basekey, key; + ICINFO icinfo; + DWORD i, res; + + static const WCHAR CLSIDW[] = {'C','L','S','I','D',0}; + static const WCHAR FccHandlerW[] = {'F','c','c','H','a','n','d','l','e','r',0}; + static const WCHAR FriendlyNameW[] = {'F','r','i','e','n','d','l','y','N','a','m','e',0}; + + StringFromGUID2(&CLSID_AVICo, avico_clsid_str, sizeof(avico_clsid_str)/sizeof(WCHAR)); + + basekey = open_special_category_key(&CLSID_VideoCompressorCategory, TRUE); + if(!basekey) { + ERR("Could not create key\n"); + return; + } + + for(i=0; ICInfo(FCC('v','i','d','c'), i, &icinfo); i++) { + WCHAR fcc_str[5] = {LOBYTE(LOWORD(icinfo.fccHandler)), HIBYTE(LOWORD(icinfo.fccHandler)), + LOBYTE(HIWORD(icinfo.fccHandler)), HIBYTE(HIWORD(icinfo.fccHandler))}; + + res = RegCreateKeyW(basekey, fcc_str, &key); + if(res != ERROR_SUCCESS) + continue; + + RegSetValueExW(key, CLSIDW, 0, REG_SZ, (const BYTE*)avico_clsid_str, sizeof(avico_clsid_str)); + RegSetValueExW(key, FccHandlerW, 0, REG_SZ, (const BYTE*)fcc_str, sizeof(fcc_str)); + RegSetValueExW(key, FriendlyNameW, 0, REG_SZ, (const BYTE*)icinfo.szName, (strlenW(icinfo.szName)+1)*sizeof(WCHAR)); + /* FIXME: Set ClassManagerFlags and FilterData values */ + + RegCloseKey(key); + } + + RegCloseKey(basekey); +} + static HANDLE DEVENUM_populate_handle; static const WCHAR DEVENUM_populate_handle_nameW[] = {'_','_','W','I','N','E','_', @@ -648,6 +687,8 @@ static HRESULT DEVENUM_CreateSpecialCategories(void) RegDeleteTreeW(basekey, path); if (SUCCEEDED(DEVENUM_GetCategoryKey(&CLSID_MidiRendererCategory, &basekey, path, MAX_PATH))) RegDeleteTreeW(basekey, path); + if (SUCCEEDED(DEVENUM_GetCategoryKey(&CLSID_VideoCompressorCategory, &basekey, path, MAX_PATH))) + RegDeleteTreeW(basekey, path); rf2.dwVersion = 2; rf2.dwMerit = MERIT_PREFERRED; @@ -927,6 +968,9 @@ static HRESULT DEVENUM_CreateSpecialCategories(void) if (pMapper) IFilterMapper2_Release(pMapper); + + register_vfw_codecs(); + SetEvent(DEVENUM_populate_handle); return res; }

1 0

Jacek Caban : devenum: Enumerate both regular key and special key for special categories.
by Alexandre Julliard 08 Jan '14

08 Jan '14

Module: wine Branch: master Commit: 92be7be48dbff2a28f196bceb087b76dee8b2680 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92be7be48dbff2a28f196bceb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 8 14:12:11 2014 +0100 devenum: Enumerate both regular key and special key for special categories. --- dlls/devenum/createdevenum.c | 66 ++++++++++++++++++++++++++++++++-------- dlls/devenum/devenum_private.h | 2 +- dlls/devenum/mediacatenum.c | 32 +++++++++++++------ 3 files changed, 78 insertions(+), 22 deletions(-) diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index 58fe7a4..baeb91e 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -37,7 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(devenum); extern HINSTANCE DEVENUM_hInstance; -const WCHAR wszInstanceKeyName[] ={'I','n','s','t','a','n','c','e',0}; +const WCHAR wszInstanceKeyName[] ={'\\','I','n','s','t','a','n','c','e',0}; static const WCHAR wszRegSeparator[] = {'\\', 0 }; static const WCHAR wszActiveMovieKey[] = {'S','o','f','t','w','a','r','e','\\', @@ -134,13 +134,57 @@ HRESULT DEVENUM_GetCategoryKey(REFCLSID clsidDeviceClass, HKEY *pBaseKey, WCHAR if (!StringFromGUID2(clsidDeviceClass, wszRegKeyName + CLSID_STR_LEN, maxLen - CLSID_STR_LEN)) return E_OUTOFMEMORY; - strcatW(wszRegKeyName, wszRegSeparator); strcatW(wszRegKeyName, wszInstanceKeyName); } return S_OK; } +static HKEY open_category_key(const CLSID *clsid) +{ + WCHAR key_name[sizeof(wszInstanceKeyName)/sizeof(WCHAR) + CHARS_IN_GUID-1 + 6 /* strlen("CLSID\") */], *ptr; + HKEY ret; + + strcpyW(key_name, clsid_keyname); + ptr = key_name + strlenW(key_name); + *ptr++ = '\\'; + + if (!StringFromGUID2(clsid, ptr, CHARS_IN_GUID)) + return NULL; + + ptr += strlenW(ptr); + strcpyW(ptr, wszInstanceKeyName); + + if (RegOpenKeyExW(HKEY_CLASSES_ROOT, key_name, 0, KEY_READ, &ret) != ERROR_SUCCESS) { + WARN("Could not open %s\n", debugstr_w(key_name)); + return NULL; + } + + return ret; +} + +static HKEY open_special_category_key(const CLSID *clsid, BOOL create) +{ + WCHAR key_name[sizeof(wszActiveMovieKey)/sizeof(WCHAR) + CHARS_IN_GUID-1]; + HKEY ret; + LONG res; + + strcpyW(key_name, wszActiveMovieKey); + if (!StringFromGUID2(clsid, key_name + sizeof(wszActiveMovieKey)/sizeof(WCHAR)-1, CHARS_IN_GUID)) + return NULL; + + if(create) + res = RegCreateKeyW(HKEY_CURRENT_USER, key_name, &ret); + else + res = RegOpenKeyExW(HKEY_CURRENT_USER, key_name, 0, KEY_READ, &ret); + if (res != ERROR_SUCCESS) { + WARN("Could not open %s\n", debugstr_w(key_name)); + return NULL; + } + + return ret; +} + static void DEVENUM_ReadPinTypes(HKEY hkeyPinKey, REGFILTERPINS *rgPin) { HKEY hkeyTypes = NULL; @@ -466,9 +510,7 @@ static HRESULT WINAPI DEVENUM_ICreateDevEnum_CreateClassEnumerator( IEnumMoniker **ppEnumMoniker, DWORD dwFlags) { - WCHAR wszRegKey[MAX_PATH]; - HKEY hkey; - HKEY hbasekey; + HKEY hkey, special_hkey = NULL; HRESULT hr; TRACE("(%p)->(%s, %p, %x)\n", iface, debugstr_guid(clsidDeviceClass), ppEnumMoniker, dwFlags); @@ -483,29 +525,29 @@ static HRESULT WINAPI DEVENUM_ICreateDevEnum_CreateClassEnumerator( DEVENUM_RegisterLegacyAmFilters(); } - hr = DEVENUM_GetCategoryKey(clsidDeviceClass, &hbasekey, wszRegKey, MAX_PATH); - if (FAILED(hr)) - return hr; - if (IsSpecialCategory(clsidDeviceClass)) { hr = DEVENUM_CreateSpecialCategories(); if (FAILED(hr)) return hr; - if (RegOpenKeyW(hbasekey, wszRegKey, &hkey) != ERROR_SUCCESS) + + special_hkey = open_special_category_key(clsidDeviceClass, FALSE); + if (!special_hkey) { ERR("Couldn't open registry key for special device: %s\n", debugstr_guid(clsidDeviceClass)); return S_FALSE; } } - else if (RegOpenKeyW(hbasekey, wszRegKey, &hkey) != ERROR_SUCCESS) + + hkey = open_category_key(clsidDeviceClass); + if (!hkey && !special_hkey) { FIXME("Category %s not found\n", debugstr_guid(clsidDeviceClass)); return S_FALSE; } - return DEVENUM_IEnumMoniker_Construct(hkey, ppEnumMoniker); + return DEVENUM_IEnumMoniker_Construct(hkey, special_hkey, ppEnumMoniker); } /********************************************************************** diff --git a/dlls/devenum/devenum_private.h b/dlls/devenum/devenum_private.h index 17e89a5..4f14423 100644 --- a/dlls/devenum/devenum_private.h +++ b/dlls/devenum/devenum_private.h @@ -68,7 +68,7 @@ typedef struct } MediaCatMoniker; MediaCatMoniker * DEVENUM_IMediaCatMoniker_Construct(void) DECLSPEC_HIDDEN; -HRESULT DEVENUM_IEnumMoniker_Construct(HKEY hkey, IEnumMoniker ** ppEnumMoniker) DECLSPEC_HIDDEN; +HRESULT DEVENUM_IEnumMoniker_Construct(HKEY hkey, HKEY special_hkey, IEnumMoniker ** ppEnumMoniker) DECLSPEC_HIDDEN; extern ClassFactoryImpl DEVENUM_ClassFactory DECLSPEC_HIDDEN; extern ICreateDevEnum DEVENUM_CreateDevEnum DECLSPEC_HIDDEN; diff --git a/dlls/devenum/mediacatenum.c b/dlls/devenum/mediacatenum.c index 60ba110..ce66711 100644 --- a/dlls/devenum/mediacatenum.c +++ b/dlls/devenum/mediacatenum.c @@ -35,7 +35,9 @@ typedef struct IEnumMoniker IEnumMoniker_iface; LONG ref; DWORD index; + DWORD subkey_cnt; HKEY hkey; + HKEY special_hkey; } EnumMonikerImpl; typedef struct @@ -717,6 +719,8 @@ static ULONG WINAPI DEVENUM_IEnumMoniker_Release(IEnumMoniker *iface) if (!ref) { + if(This->special_hkey) + RegCloseKey(This->special_hkey); RegCloseKey(This->hkey); CoTaskMemFree(This); DEVENUM_UnlockModule(); @@ -738,7 +742,12 @@ static HRESULT WINAPI DEVENUM_IEnumMoniker_Next(IEnumMoniker *iface, ULONG celt, while (fetched < celt) { - res = RegEnumKeyW(This->hkey, This->index, buffer, sizeof(buffer) / sizeof(WCHAR)); + if(This->index+fetched < This->subkey_cnt) + res = RegEnumKeyW(This->hkey, This->index+fetched, buffer, sizeof(buffer) / sizeof(WCHAR)); + else if(This->special_hkey) + res = RegEnumKeyW(This->special_hkey, This->index+fetched-This->subkey_cnt, buffer, sizeof(buffer) / sizeof(WCHAR)); + else + break; if (res != ERROR_SUCCESS) { break; @@ -747,7 +756,8 @@ static HRESULT WINAPI DEVENUM_IEnumMoniker_Next(IEnumMoniker *iface, ULONG celt, if (!pMoniker) return E_OUTOFMEMORY; - if (RegOpenKeyW(This->hkey, buffer, &pMoniker->hkey) != ERROR_SUCCESS) + if (RegOpenKeyW(This->index+fetched < This->subkey_cnt ? This->hkey : This->special_hkey, + buffer, &pMoniker->hkey) != ERROR_SUCCESS) { IMoniker_Release(&pMoniker->IMoniker_iface); break; @@ -772,17 +782,16 @@ static HRESULT WINAPI DEVENUM_IEnumMoniker_Next(IEnumMoniker *iface, ULONG celt, static HRESULT WINAPI DEVENUM_IEnumMoniker_Skip(IEnumMoniker *iface, ULONG celt) { EnumMonikerImpl *This = impl_from_IEnumMoniker(iface); - DWORD subKeys; + DWORD special_subkeys = 0; TRACE("(%p)->(%d)\n", iface, celt); /* Before incrementing, check if there are any more values to run through. Some programs use the Skip() function to get the number of devices */ - if(RegQueryInfoKeyW(This->hkey, NULL, NULL, NULL, &subKeys, NULL, NULL, NULL, NULL, NULL, NULL, NULL) != ERROR_SUCCESS) - { - return S_FALSE; - } - if((This->index + celt) >= subKeys) + if(This->special_hkey) + RegQueryInfoKeyW(This->special_hkey, NULL, NULL, NULL, &special_subkeys, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + + if((This->index + celt) >= This->subkey_cnt + special_subkeys) { return S_FALSE; } @@ -824,7 +833,7 @@ static const IEnumMonikerVtbl IEnumMoniker_Vtbl = DEVENUM_IEnumMoniker_Clone }; -HRESULT DEVENUM_IEnumMoniker_Construct(HKEY hkey, IEnumMoniker ** ppEnumMoniker) +HRESULT DEVENUM_IEnumMoniker_Construct(HKEY hkey, HKEY special_hkey, IEnumMoniker ** ppEnumMoniker) { EnumMonikerImpl * pEnumMoniker = CoTaskMemAlloc(sizeof(EnumMonikerImpl)); if (!pEnumMoniker) @@ -834,9 +843,14 @@ HRESULT DEVENUM_IEnumMoniker_Construct(HKEY hkey, IEnumMoniker ** ppEnumMoniker) pEnumMoniker->ref = 1; pEnumMoniker->index = 0; pEnumMoniker->hkey = hkey; + pEnumMoniker->special_hkey = special_hkey; *ppEnumMoniker = &pEnumMoniker->IEnumMoniker_iface; + if(RegQueryInfoKeyW(pEnumMoniker->hkey, NULL, NULL, NULL, &pEnumMoniker->subkey_cnt, NULL, NULL, NULL, NULL, NULL, NULL, NULL) != ERROR_SUCCESS) + pEnumMoniker->subkey_cnt = 0; + + DEVENUM_LockModule(); return S_OK;

1 0

Jacek Caban : devenum: Moved test for special category GUID to separated function.
by Alexandre Julliard 08 Jan '14

08 Jan '14

Module: wine Branch: master Commit: 6ce17c1fa4a38f180c10db5db60ae7897e2dcd69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ce17c1fa4a38f180c10db5db… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 8 14:12:00 2014 +0100 devenum: Moved test for special category GUID to separated function. --- dlls/devenum/createdevenum.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index b7e288b..58fe7a4 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -107,12 +107,17 @@ static ULONG WINAPI DEVENUM_ICreateDevEnum_Release(ICreateDevEnum * iface) return 1; /* non-heap based object */ } +static BOOL IsSpecialCategory(const CLSID *clsid) +{ + return IsEqualGUID(clsid, &CLSID_AudioRendererCategory) || + IsEqualGUID(clsid, &CLSID_AudioInputDeviceCategory) || + IsEqualGUID(clsid, &CLSID_VideoInputDeviceCategory) || + IsEqualGUID(clsid, &CLSID_MidiRendererCategory); +} + HRESULT DEVENUM_GetCategoryKey(REFCLSID clsidDeviceClass, HKEY *pBaseKey, WCHAR *wszRegKeyName, UINT maxLen) { - if (IsEqualGUID(clsidDeviceClass, &CLSID_AudioRendererCategory) || - IsEqualGUID(clsidDeviceClass, &CLSID_AudioInputDeviceCategory) || - IsEqualGUID(clsidDeviceClass, &CLSID_VideoInputDeviceCategory) || - IsEqualGUID(clsidDeviceClass, &CLSID_MidiRendererCategory)) + if (IsSpecialCategory(clsidDeviceClass)) { *pBaseKey = HKEY_CURRENT_USER; strcpyW(wszRegKeyName, wszActiveMovieKey); @@ -482,10 +487,7 @@ static HRESULT WINAPI DEVENUM_ICreateDevEnum_CreateClassEnumerator( if (FAILED(hr)) return hr; - if (IsEqualGUID(clsidDeviceClass, &CLSID_AudioRendererCategory) || - IsEqualGUID(clsidDeviceClass, &CLSID_AudioInputDeviceCategory) || - IsEqualGUID(clsidDeviceClass, &CLSID_VideoInputDeviceCategory) || - IsEqualGUID(clsidDeviceClass, &CLSID_MidiRendererCategory)) + if (IsSpecialCategory(clsidDeviceClass)) { hr = DEVENUM_CreateSpecialCategories(); if (FAILED(hr))

1 0

← Newer
1
...
59
60
61
62
63
64
65
...
82
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2014