http://blog.gmane.org/gmane.comp.emulators.wine.patches hourly 1 1901-01-01T00:00+00:00 http://gmane.org/img/gmane-25t.png http://gmane.org http://permalink.gmane.org/gmane.comp.emulators.wine.patches/115838 <pre>Hi, Changelog: oledb32: GetConversionSize only returns a valid size of BSTR Best Regards Alistair Leslie-Hughes From: Alistair Leslie-Hughes &lt;leslie_alistair&lt; at &gt;hotmail.com&gt; Date: Fri, 24 May 2013 15:12:24 +1000 Subject: [PATCH] GetConversionSize only returns a valid size of BSTR To: wine-patches &lt;wine-patches&lt; at &gt;winehq.org&gt; --- dlls/oledb32/convert.c | 14 +++++--------- dlls/oledb32/tests/convert.c | 1 - 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index a6a18e3..e53f3d9 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c &lt; at &gt;&lt; at &gt; -1332,16 +1332,12 &lt; at &gt;&lt; at &gt; static HRESULT WINAPI convert_GetConversionSize(IDataConvert* iface, { case DBTYPE_VARIANT: { - VARIANT v; - - VariantInit(&amp;v); - if ((hr = VariantChangeType(&amp;v, (VARIANT*)src, 0, VT_BSTR)) == S_OK) - { - *dst_len = (SysStringLen(V_BSTR(&amp;v)) + 1) * sizeof(WCHAR); - VariantClear(&amp;v); - } + if(V_VT((VARIANT*)src) == VT_BSTR) + *dst_len = (SysStringLen(V_BSTR((VARIANT*)src))+1) * sizeof(WCHAR); else - return hr; + WARN("DBTYPE_BYTES-&gt;DBTYPE_VARIANT(%d) unimplemented\n", V_VT((VARIANT*)src)); + + return S_OK; } break; case DBTYPE_STR: diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index a3884dc..ff44e0a 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c &lt; at &gt;&lt; at &gt; -2461,7 +2461,6 &lt; at &gt;&lt; at &gt; static void test_getconversionsize(void) V_I4(&amp;var) = 4; hr = IDataConvert_GetConversionSize(convert, DBTYPE_VARIANT, DBTYPE_WSTR, &amp;src_len, &amp;dst_len, &amp;var); ok(hr == S_OK, "got 0x%08x\n", hr); - todo_wine ok(dst_len == 110, "%ld\n", dst_len); VariantClear(&amp;var); dst_len = 0; </pre> Alistair Leslie-Hughes 2013-05-25T23:19:24 http://permalink.gmane.org/gmane.comp.emulators.wine.patches/115837 <pre>Hi, Corrects whitespace issue also. Changelog: oledb32: Implement GetConversionSize DBTYPE_VARIANT -&gt; DBTYPE_BYTES Best Regards Alistair Leslie-Hughes From: Alistair Leslie-Hughes &lt;leslie_alistair&lt; at &gt;hotmail.com&gt; Date: Tue, 21 May 2013 20:39:09 +1000 Subject: [PATCH] Implement GetConversionSize DBTYPE_VARIANT -&gt; DBTYPE_BYTES To: wine-patches &lt;wine-patches&lt; at &gt;winehq.org&gt; --- dlls/oledb32/convert.c | 23 ++++++++++++++++++++++- dlls/oledb32/tests/convert.c | 15 +++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 4829ae8..a6a18e3 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c &lt; at &gt;&lt; at &gt; -121,7 +121,7 &lt; at &gt;&lt; at &gt; static int get_length(DBTYPE type) case DBTYPE_UI2: return 2; case DBTYPE_BOOL: -return sizeof(VARIANT_BOOL); + return sizeof(VARIANT_BOOL); case DBTYPE_I4: case DBTYPE_UI4: case DBTYPE_R4: &lt; at &gt;&lt; at &gt; -143,6 +143,7 &lt; at &gt;&lt; at &gt; static int get_length(DBTYPE type) return sizeof(FILETIME); case DBTYPE_GUID: return sizeof(GUID); + case DBTYPE_BYTES: case DBTYPE_WSTR: case DBTYPE_STR: case DBTYPE_BYREF | DBTYPE_WSTR: &lt; at &gt;&lt; at &gt; -1361,6 +1362,26 &lt; at &gt;&lt; at &gt; static HRESULT WINAPI convert_GetConversionSize(IDataConvert* iface, } } break; + case DBTYPE_BYTES: + { + switch (src_type) + { + case DBTYPE_VARIANT: + { + if(V_VT((VARIANT*)src) == VT_BSTR) + *dst_len = (SysStringLen(V_BSTR((VARIANT*)src))) / sizeof(WCHAR); + else + WARN("DBTYPE_BYTES-&gt;DBTYPE_VARIANT(%d) unimplemented\n", V_VT((VARIANT*)src)); + + return S_OK; + } + break; + default: + FIXME("unimplemented for %04x -&gt; DBTYPE_BYTES\n", src_type); + return E_NOTIMPL; + } + } + break; default: FIXME("unimplemented for conversion %d-&gt;%d\n", src_type, dst_type); return E_NOTIMPL; diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 089b28c..a3884dc 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c &lt; at &gt;&lt; at &gt; -2464,6 +2464,21 &lt; at &gt;&lt; at &gt; static void test_getconversionsize(void) todo_wine ok(dst_len == 110, "%ld\n", dst_len); VariantClear(&amp;var); + dst_len = 0; + src_len = 20; + V_VT(&amp;var) = VT_BSTR; + V_BSTR(&amp;var) = SysAllocString(strW); + hr = IDataConvert_GetConversionSize(convert, DBTYPE_VARIANT, DBTYPE_BYTES, &amp;src_len, &amp;dst_len, &amp;var); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(dst_len == 2, "%ld\n", dst_len); + VariantClear(&amp;var); + + dst_len = 0; + src_len = 20; + V_VT(&amp;var) = VT_NULL; + hr = IDataConvert_GetConversionSize(convert, DBTYPE_VARIANT, DBTYPE_BYTES, &amp;src_len, &amp;dst_len, &amp;var); + ok(hr == S_OK, "got 0x%08x\n", hr); + VariantClear(&amp;var); } static void test_converttobytes(void) </pre> Alistair Leslie-Hughes 2013-05-25T23:19:21 http://permalink.gmane.org/gmane.comp.emulators.wine.patches/115836 <pre>Hi, Changelog: oledb32: Check for DBSTATUS_S_ISNULL first Best Regards Alistair Leslie-Hughes From: Alistair Leslie-Hughes &lt;leslie_alistair&lt; at &gt;hotmail.com&gt; Date: Fri, 24 May 2013 15:35:30 +1000 Subject: [PATCH] Check for DBSTATUS_S_ISNULL first To: wine-patches &lt;wine-patches&lt; at &gt;winehq.org&gt; --- dlls/oledb32/convert.c | 10 +++++----- dlls/oledb32/tests/convert.c | 16 ++++++++++++++++ 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 94ba4ce..4829ae8 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c &lt; at &gt;&lt; at &gt; -179,11 +179,6 &lt; at &gt;&lt; at &gt; static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, *dst_status = DBSTATUS_E_BADACCESSOR; - if(IDataConvert_CanConvert(iface, src_type, dst_type) != S_OK) - { - return DB_E_UNSUPPORTEDCONVERSION; - } - if(src_status == DBSTATUS_S_ISNULL) { *dst_status = DBSTATUS_S_ISNULL; &lt; at &gt;&lt; at &gt; -191,6 +186,11 &lt; at &gt;&lt; at &gt; static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, return S_OK; } + if(IDataConvert_CanConvert(iface, src_type, dst_type) != S_OK) + { + return DB_E_UNSUPPORTEDCONVERSION; + } + if(dst == NULL &amp;&amp; get_length(dst_type) != 0) { *dst_len = get_length(src_type); diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 88dc1d3..089b28c 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c &lt; at &gt;&lt; at &gt; -2714,6 +2714,21 &lt; at &gt;&lt; at &gt; static void test_converttotimestamp(void) SysFreeString(bstr); } +static void test_converttoiunknown(void) +{ + HRESULT hr; + DBSTATUS dst_status; + DBLENGTH dst_len; + IUnknown *dst = NULL; + static WCHAR strW[] = {'t','e','s','t',0}; + + dst_len = 0x1234; + hr = IDataConvert_DataConvert(convert, DBTYPE_WSTR, DBTYPE_IUNKNOWN, sizeof(strW), &amp;dst_len, strW, dst, sizeof(dst), DBSTATUS_S_ISNULL, &amp;dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_ISNULL, "got %08x\n", dst_status); + ok(dst_len == 0, "got %ld\n", dst_len); +} + START_TEST(convert) { HRESULT hr; &lt; at &gt;&lt; at &gt; -2751,6 +2766,7 &lt; at &gt;&lt; at &gt; START_TEST(convert) test_converttodbdate(); test_getconversionsize(); test_converttotimestamp(); + test_converttoiunknown(); IDataConvert_Release(convert); </pre> Alistair Leslie-Hughes 2013-05-25T23:19:18 http://permalink.gmane.org/gmane.comp.emulators.wine.patches/115835 <pre>Hi, Corrected crash in tests. Changelog: oledb32: DataConvert Support NULL variant in DBTYPE_VARIANT-&gt;DBTYPE_WSTR Best Regards Alistair Leslie-Hughes From: Alistair Leslie-Hughes &lt;leslie_alistair&lt; at &gt;hotmail.com&gt; Date: Fri, 24 May 2013 12:23:18 +1000 Subject: [PATCH] DataConvert Support NULL variant in DBTYPE_VARIANT-&gt;DBTYPE_WSTR To: wine-patches &lt;wine-patches&lt; at &gt;winehq.org&gt; --- dlls/oledb32/convert.c | 3 ++- dlls/oledb32/tests/convert.c | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 0961464..94ba4ce 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c &lt; at &gt;&lt; at &gt; -787,7 +787,8 &lt; at &gt;&lt; at &gt; static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, hr = IDataConvert_DataConvert(iface, src_type, DBTYPE_BSTR, src_len, &amp;bstr_len, src, &amp;b, sizeof(BSTR), src_status, dst_status, precision, scale, flags); - if(hr != S_OK) return hr; + if(hr != S_OK || *dst_status == DBSTATUS_S_ISNULL) + return hr; bstr_len = SysStringLen(b); *dst_len = bstr_len * sizeof(WCHAR); /* Doesn't include size for '\0' */ *dst_status = DBSTATUS_S_OK; diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index fd69fed..88dc1d3 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c &lt; at &gt;&lt; at &gt; -1017,6 +1017,7 &lt; at &gt;&lt; at &gt; static void test_converttowstr(void) static const WCHAR hexunpacked_w[] = {'5','7','0','0','6','9','0','0','6','E','0','0','6','5','0','0','0','0','0','0', 0 }; static const WCHAR hexpacked_w[] = {'W','i','n','e', 0 }; BSTR b; + VARIANT v; memset(dst, 0xcc, sizeof(dst)); dst_len = 0x1234; &lt; at &gt;&lt; at &gt; -1470,6 +1471,24 &lt; at &gt;&lt; at &gt; static void test_converttowstr(void) ok(dst_len == 0, "got %ld\n", dst_len); ok(dst[0] == 0, "not null terminated\n"); ok(dst[1] == 0xcccc, "clobbered buffer\n"); + + b = SysAllocStringLen(NULL, 0); + V_VT(&amp;v) = VT_BSTR; + V_BSTR(&amp;v) = b; + hr = IDataConvert_DataConvert(convert, DBTYPE_VARIANT, DBTYPE_WSTR, 0, &amp;dst_len, &amp;v, &amp;dst, sizeof(dst), 0, &amp;dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == 0, "got %ld\n", dst_len); + ok(dst != NULL, "got %p\n", dst); + ok(dst != b, "got %p src %p\n", dst, b); + ok(!lstrcmpW(b, dst), "got %s\n", wine_dbgstr_w(dst)); + VariantClear(&amp;v); + + V_VT(&amp;v) = VT_NULL; + hr = IDataConvert_DataConvert(convert, DBTYPE_VARIANT, DBTYPE_WSTR, 0, &amp;dst_len, &amp;v, &amp;dst, sizeof(dst), 0, &amp;dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_ISNULL, "got %08x\n", dst_status); + ok(dst_len == 0, "got %ld\n", dst_len); } static void test_converttostr(void) </pre> Alistair Leslie-Hughes 2013-05-25T23:19:15 http://permalink.gmane.org/gmane.comp.emulators.wine.patches/115834 <pre>based on Austin's patch, fixed tests. From f97dd45f1689f11dc7ea207df35c5845276ff1c1 Mon Sep 17 00:00:00 2001 From: Daniel Jelinski &lt;djelinski1&lt; at &gt;gmail.com&gt; Date: Sat, 25 May 2013 20:12:51 +0200 Subject: tools/wine.inf: add HKLM\\System\\CurrentControlSet\\Services\\Eventlog\\Application registry key Originally sent by Austin English here: http://www.winehq.org/pipermail/wine-patches/2013-March/123004.html Fixed test failures. --- dlls/advapi32/tests/eventlog.c | 7 ++++--- tools/wine.inf.in | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c index 543b41c..b028354 100644 --- a/dlls/advapi32/tests/eventlog.c +++ b/dlls/advapi32/tests/eventlog.c &lt; at &gt;&lt; at &gt; -637,7 +637,6 &lt; at &gt;&lt; at &gt; static BOOL create_new_eventlog(void) /* First create our eventlog */ lret = RegOpenKeyA(HKEY_LOCAL_MACHINE, eventlogsvc, &amp;key); - /* FIXME: Wine stops here */ if (lret != ERROR_SUCCESS) { skip("Could not open the EventLog service registry key\n"); &lt; at &gt;&lt; at &gt; -832,11 +831,13 &lt; at &gt;&lt; at &gt; static void test_readwrite(void) SetLastError(0xdeadbeef); ret = GetNumberOfEventLogRecords(handle, &amp;count); ok(ret, "Expected GetNumberOfEventLogRecords success : %d\n", GetLastError()); + todo_wine ok(count == (i + 1), "Expected %d records, got %d\n", i + 1, count); oldest = 0xdeadbeef; ret = GetOldestEventLogRecord(handle, &amp;oldest); ok(ret, "Expected GetOldestEventLogRecord success : %d\n", GetLastError()); + todo_wine ok(oldest == 1 || (oldest &gt; 1 &amp;&amp; oldest != 0xdeadbeef), /* Vista SP1+, W2K8 and Win7 */ "Expected oldest to be 1 or higher, got %d\n", oldest); &lt; at &gt;&lt; at &gt; -855,6 +856,7 &lt; at &gt;&lt; at &gt; static void test_readwrite(void) count = 0xdeadbeef; ret = GetNumberOfEventLogRecords(handle, &amp;count); ok(ret, "Expected success\n"); + todo_wine ok(count == i, "Expected %d records, got %d\n", i, count); CloseEventLog(handle); &lt; at &gt;&lt; at &gt; -1083,6 +1085,7 &lt; at &gt;&lt; at &gt; static void test_autocreation(void) lstrcatA(eventlogfile, ".evtx"); } + todo_wine ok(GetFileAttributesA(eventlogfile) != INVALID_FILE_ATTRIBUTES, "Expected an eventlog file\n"); &lt; at &gt;&lt; at &gt; -1109,14 +1112,12 &lt; at &gt;&lt; at &gt; static void cleanup_eventlog(void) RegDeleteValueA(key, "Sources"); RegCloseKey(key); lret = RegDeleteKeyA(HKEY_LOCAL_MACHINE, winesvc); - todo_wine ok(lret == ERROR_SUCCESS, "Could not delete the registry tree : %d\n", lret); /* A handle to the eventlog is locked by services.exe. We can only * delete the eventlog file after reboot. */ bret = MoveFileExA(eventlogfile, NULL, MOVEFILE_DELAY_UNTIL_REBOOT); - todo_wine ok(bret, "Expected MoveFileEx to succeed: %d\n", GetLastError()); } diff --git a/tools/wine.inf.in b/tools/wine.inf.in index e48d824..14fde79 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in &lt; at &gt;&lt; at &gt; -3005,8 +3005,9 &lt; at &gt;&lt; at &gt; HKR,Parameters,"ServiceDll",,"%11%\srvsvc.dll" [Services] HKLM,%CurrentVersion%\RunServices,"winemenubuilder",2,"%11%\winemenubuilder.exe -a -r" -HKLM,"System\CurrentControlSet\Services\VxD\MSTCP",,16 +HKLM,"System\CurrentControlSet\Services\Eventlog\Application",,16 HKLM,"System\CurrentControlSet\Services\Tcpip\Parameters",,16 +HKLM,"System\CurrentControlSet\Services\VxD\MSTCP",,16 HKLM,"System\CurrentControlSet\Services\Winsock\Parameters",,16 HKLM,"System\CurrentControlSet\Services\Winsock2\Parameters\Protocol_Catalog9\Catalog_Entries",,16 </pre> Daniel Jeliński 2013-05-25T18:50:37 http://permalink.gmane.org/gmane.comp.emulators.wine.patches/115833 <pre>http://bugs.winehq.org/show_bug.cgi?id=16581 </pre> Nikolay Sivov 2013-05-25T16:14:39 http://permalink.gmane.org/gmane.comp.emulators.wine.patches/115832 <pre> This closes bug 14819. --- dlls/kernel32/heap.c | 1 + dlls/kernel32/tests/heap.c | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+) </pre> Akihiro Sagawa 2013-05-25T15:09:17 http://permalink.gmane.org/gmane.comp.emulators.wine.patches/115831 <pre>Fixed QQ crashing. --- dlls/atl100/atl.c | 6 ++++++ dlls/atl100/tests/atl.c | 6 ++++++ 2 files changed, 12 insertions(+) </pre> Qian Hong 2013-05-25T12:56:43 http://permalink.gmane.org/gmane.comp.emulators.wine.patches/115830 <pre>--- news/de/2013052401.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 news/de/2013052401.xml </pre> André Hentschel 2013-05-25T12:45:53 http://permalink.gmane.org/gmane.comp.emulators.wine.patches/115829 <pre>--- configure.ac | 1 + po/LINGUAS | 1 + po/hr.po | 13905 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 13907 insertions(+) create mode 100644 po/hr.po </pre> Joško Nikolić 2013-05-25T12:01:42 http://permalink.gmane.org/gmane.comp.emulators.wine.patches/115828 <pre>CID 1025788 checked elsewhere, so also check here. Unlikly to fail though. Ciao, Marcus --- dlls/msi/automation.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index 228d887..6266678 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c &lt; at &gt;&lt; at &gt; -857,9 +857,12 &lt; at &gt;&lt; at &gt; static HRESULT summaryinfo_invoke( break; case VT_DATE: - VariantTimeToSystemTime(V_DATE(&amp;varg1), &amp;st); - SystemTimeToFileTime(&amp;st, &amp;ftlocal); - LocalFileTimeToFileTime(&amp;ftlocal, &amp;ft); + if (!VariantTimeToSystemTime(V_DATE(&amp;varg1), &amp;st)) + return DISP_E_EXCEPTION; + if (!SystemTimeToFileTime(&amp;st, &amp;ftlocal)) + return DISP_E_EXCEPTION; + if (!LocalFileTimeToFileTime(&amp;ftlocal, &amp;ft)) + return DISP_E_EXCEPTION; ret = MsiSummaryInfoSetPropertyW(This-&gt;msiHandle, V_I4(&amp;varg0), VT_FILETIME, 0, &amp;ft, NULL); break; </pre> Marcus Meissner 2013-05-25T09:04:09 http://permalink.gmane.org/gmane.comp.emulators.wine.patches/115827 <pre>CID 1025792 got superflous after commit 9287bb80dc974235d43d5ee4fadc86e1a11dbfeb Author: Stefan Dösinger &lt;stefan&lt; at &gt;codeweavers.com&gt; Date: Sun May 19 23:13:30 2013 +0200 d3d: d3d9ex does not do video memory accounting for D3DPOOL_DEFAULT resources. which references this variable before. Ciao, Marfcus --- dlls/wined3d/resource.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 0e0678d..3d50652 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c &lt; at &gt;&lt; at &gt; -169,8 +169,7 &lt; at &gt;&lt; at &gt; void resource_cleanup(struct wined3d_resource *resource) resource-&gt;allocatedMemory = 0; resource-&gt;heapMemory = 0; - if (resource-&gt;device) - device_resource_released(resource-&gt;device, resource); + device_resource_released(resource-&gt;device, resource); } void resource_unload(struct wined3d_resource *resource) </pre> Marcus Meissner 2013-05-25T07:40:54 http://permalink.gmane.org/gmane.comp.emulators.wine.patches/115826 <pre>CID 1025790 --- dlls/oledb32/convert.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 0961464..a2fd0cb 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c &lt; at &gt;&lt; at &gt; -957,8 +957,10 &lt; at &gt;&lt; at &gt; static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, for(i =0; i &lt; size; i++,p++) { hr = SafeArrayPutElement(psa, &amp;i, &amp;p); - if(FAILED(hr)) + if(FAILED(hr)) { + SafeArrayDestroy (psa); return hr; + } } V_VT(v) = VT_ARRAY|VT_UI1; </pre> Marcus Meissner 2013-05-25T07:25:19 http://permalink.gmane.org/gmane.comp.emulators.wine.patches/115825 <pre>Use the right sizeof() CID 1025793 --- dlls/d3dx9_36/surface.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index ed93eb4..1df0cf2 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c &lt; at &gt;&lt; at &gt; -1134,8 +1134,8 &lt; at &gt;&lt; at &gt; HRESULT WINAPI D3DXLoadSurfaceFromFileInMemory(IDirect3DSurface9 *pDestSurface, hr = IWICPalette_GetColorCount(wic_palette, &amp;nb_colors); if (SUCCEEDED(hr)) { - colors = HeapAlloc(GetProcessHeap(), 0, nb_colors * sizeof(colors)); - palette = HeapAlloc(GetProcessHeap(), 0, nb_colors * sizeof(palette)); + colors = HeapAlloc(GetProcessHeap(), 0, nb_colors * sizeof(colors[0])); + palette = HeapAlloc(GetProcessHeap(), 0, nb_colors * sizeof(palette[0])); if (!colors || !palette) hr = E_OUTOFMEMORY; } </pre> Marcus Meissner 2013-05-25T07:04:37 http://permalink.gmane.org/gmane.comp.emulators.wine.patches/115824 <pre>Use the right sizeof() CID 1025793 --- dlls/d3dx9_36/surface.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index ed93eb4..1df0cf2 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c &lt; at &gt;&lt; at &gt; -1134,8 +1134,8 &lt; at &gt;&lt; at &gt; HRESULT WINAPI D3DXLoadSurfaceFromFileInMemory(IDirect3DSurface9 *pDestSurface, hr = IWICPalette_GetColorCount(wic_palette, &amp;nb_colors); if (SUCCEEDED(hr)) { - colors = HeapAlloc(GetProcessHeap(), 0, nb_colors * sizeof(colors)); - palette = HeapAlloc(GetProcessHeap(), 0, nb_colors * sizeof(palette)); + colors = HeapAlloc(GetProcessHeap(), 0, nb_colors * sizeof(colors[0])); + palette = HeapAlloc(GetProcessHeap(), 0, nb_colors * sizeof(palette[0])); if (!colors || !palette) hr = E_OUTOFMEMORY; } </pre> Marcus Meissner 2013-05-25T06:57:21 http://permalink.gmane.org/gmane.comp.emulators.wine.patches/115823 <pre> From 57d15bba44b58e86faa2fae3026c13bf85d17e4e Mon Sep 17 00:00:00 2001 From: Jactry Zeng &lt;jactry92&lt; at &gt;gmail.com&gt; Date: Sat, 25 May 2013 09:22:02 +0800 Subject: Simplified Chinese translation for release 1.5.31 To: wine-patches &lt;wine-patches&lt; at &gt;winehq.org&gt; Reply-To: wine-devel &lt;wine-devel&lt; at &gt;winehq.org&gt; --- news/zh-cn/2013052401.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 news/zh-cn/2013052401.xml diff --git a/news/zh-cn/2013052401.xml b/news/zh-cn/2013052401.xml new file mode 100644 index 0000000..ed13be1 --- /dev/null +++ b/news/zh-cn/2013052401.xml &lt; at &gt;&lt; at &gt; -0,0 +1,15 &lt; at &gt;&lt; at &gt; +&lt;news&gt; +&lt;date&gt;五月 24, 2013&lt;/date&gt; +&lt;title&gt;Wine 1.5.31 发布&lt;/title&gt; +&lt;body&gt; +&lt;p&gt; Wine 开发版 1.5.31 现在可以使用了。&lt;/p&gt; +&lt;p&gt; 本次&lt;a href="{$root}/announce/1.5.31"&gt;更新&lt;/a&gt;： +&lt;ul&gt; + &lt;li&gt;基于 Firefox 21 的新版本 Gecko 引擎。&lt;/li&gt; + &lt;li&gt;Mac OS X 上操纵杆的力量反馈支持。&lt;/li&gt; + &lt;li&gt;Mac 后端驱动窗口管理的修正。&lt;/li&gt; + &lt;li&gt;各种 bug 修复。&lt;/li&gt; +&lt;/ul&gt;&lt;/p&gt; +&lt;p&gt;&lt;p&gt;源代码可以从&lt;a href="http://prdownloads.sourceforge.net/wine/wine-1.5.31.tar.bz2"&gt;这里&lt;/a&gt;获取。 +二进制包正在构建中，稍后将出现在各自相应的&lt;a href="{$root}/download"&gt;下载位置&lt;/a&gt;。 +&lt;/p&gt;&lt;/body&gt;&lt;/news&gt; </pre> Jactry Zeng 2013-05-25T01:28:13 http://permalink.gmane.org/gmane.comp.emulators.wine.patches/115822 <pre>--- news/fr/2013052401.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 news/fr/2013052401.xml diff --git a/news/fr/2013052401.xml b/news/fr/2013052401.xml new file mode 100644 index 0000000..f03d30d --- /dev/null +++ b/news/fr/2013052401.xml &lt; at &gt;&lt; at &gt; -0,0 +1,14 &lt; at &gt;&lt; at &gt; +&lt;news&gt; +&lt;date&gt;24 mai 2013&lt;/date&gt; +&lt;title&gt;Sortie de Wine 1.5.31&lt;/title&gt; +&lt;body&gt; +&lt;p&gt; La version de développement 1.5.31 de Wine est disponible.&lt;/p&gt; +&lt;p&gt; &lt;a href="{$root}/announce/1.5.31"&gt;Nouveautés&lt;/a&gt; de cette version : +&lt;ul&gt; + &lt;li&gt;Nouvelle version du moteur Gecko basée sur Firefox 21.&lt;/li&gt; + &lt;li&gt;Prise en charge du retour de force des joysticks sous Mac OS X.&lt;/li&gt; + &lt;li&gt;Correctifs dans la gestion des fenêtres dans le pilote Mac.&lt;/li&gt; + &lt;li&gt;Diverses corrections de bogues.&lt;/li&gt; +&lt;/ul&gt;&lt;/p&gt; +&lt;p&gt;&lt;p&gt;Le &lt;a href="http://prdownloads.sourceforge.net/wine/wine-1.5.31.tar.bz2"&gt;code source&lt;/a&gt; est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs &lt;a href="{$root}/download"&gt;sites de téléchargement&lt;/a&gt; respectifs. +&lt;/p&gt;&lt;/body&gt;&lt;/news&gt; </pre> Frédéric Delanoy 2013-05-24T18:55:54 http://permalink.gmane.org/gmane.comp.emulators.wine.patches/115821 <pre>Make QQ happier, fix http://bugs.winehq.org/show_bug.cgi?id=33250 --- dlls/atl/atl.spec | 2 +- dlls/atl100/atl.c | 8 ++++++++ dlls/atl100/atl100.spec | 2 +- dlls/atl80/atl80.spec | 2 +- 4 files changed, 11 insertions(+), 3 deletions(-) </pre> Qian Hong 2013-05-24T16:43:52 http://permalink.gmane.org/gmane.comp.emulators.wine.patches/115820 <pre>--- dlls/oleaut32/typelib.c | 104 +++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 85 insertions(+), 19 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 83b503c..c9ee1cd 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c &lt; at &gt;&lt; at &gt; -1652,6 +1652,18 &lt; at &gt;&lt; at &gt; static inline TLBCustData *TLB_get_custdata_by_guid(struct list *custdata_list, return NULL; } +static inline ITypeInfoImpl *TLB_get_typeinfo_by_name(ITypeInfoImpl **typeinfos, + UINT n, const OLECHAR *name) +{ + while(n){ + if(!lstrcmpiW((*typeinfos)-&gt;Name, name)) + return *typeinfos; + ++typeinfos; + --n; + } + return NULL; +} + static TLBVarDesc *TLBVarDesc_Constructor(UINT n) { TLBVarDesc *ret; &lt; at &gt;&lt; at &gt; -5051,31 +5063,25 &lt; at &gt;&lt; at &gt; static HRESULT WINAPI ITypeLibComp_fnBindType( ITypeComp ** ppTComp) { ITypeLibImpl *This = impl_from_ITypeComp(iface); - int i; + ITypeInfoImpl *info; TRACE("(%s, %x, %p, %p)\n", debugstr_w(szName), lHash, ppTInfo, ppTComp); if(!szName || !ppTInfo || !ppTComp) return E_INVALIDARG; - for(i = 0; i &lt; This-&gt;TypeInfoCount; ++i) - { - ITypeInfoImpl *pTypeInfo = This-&gt;typeinfos[i]; - /* FIXME: should use lHash to do the search */ - if (pTypeInfo-&gt;Name &amp;&amp; !strcmpiW(pTypeInfo-&gt;Name, szName)) - { - TRACE("returning %p\n", pTypeInfo); - *ppTInfo = (ITypeInfo *)&amp;pTypeInfo-&gt;ITypeInfo2_iface; - ITypeInfo_AddRef(*ppTInfo); - *ppTComp = &amp;pTypeInfo-&gt;ITypeComp_iface; - ITypeComp_AddRef(*ppTComp); - return S_OK; - } + info = TLB_get_typeinfo_by_name(This-&gt;typeinfos, This-&gt;TypeInfoCount, szName); + if(!info){ + *ppTInfo = NULL; + *ppTComp = NULL; + return S_OK; } - TRACE("not found\n"); - *ppTInfo = NULL; - *ppTComp = NULL; + *ppTInfo = (ITypeInfo *)&amp;info-&gt;ITypeInfo2_iface; + ITypeInfo_AddRef(*ppTInfo); + *ppTComp = &amp;info-&gt;ITypeComp_iface; + ITypeComp_AddRef(*ppTComp); + return S_OK; } &lt; at &gt;&lt; at &gt; -8102,8 +8108,68 &lt; at &gt;&lt; at &gt; static HRESULT WINAPI ICreateTypeLib2_fnCreateTypeInfo(ICreateTypeLib2 *iface, LPOLESTR name, TYPEKIND kind, ICreateTypeInfo **ctinfo) { ITypeLibImpl *This = impl_from_ICreateTypeLib2(iface); - FIXME("%p %s %d %p - stub\n", This, wine_dbgstr_w(name), kind, ctinfo); - return E_NOTIMPL; + ITypeInfoImpl *info; + HRESULT hres; + + TRACE("%p %s %d %p\n", This, wine_dbgstr_w(name), kind, ctinfo); + + if (!ctinfo || !name) + return E_INVALIDARG; + + info = TLB_get_typeinfo_by_name(This-&gt;typeinfos, This-&gt;TypeInfoCount, name); + if (info) + return TYPE_E_NAMECONFLICT; + + if (This-&gt;typeinfos) + This-&gt;typeinfos = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, This-&gt;typeinfos, + sizeof(ITypeInfoImpl*) * (This-&gt;TypeInfoCount + 1)); + else + This-&gt;typeinfos = heap_alloc_zero(sizeof(ITypeInfoImpl*)); + + info = This-&gt;typeinfos[This-&gt;TypeInfoCount] = ITypeInfoImpl_Constructor(); + + info-&gt;pTypeLib = This; + info-&gt;Name = SysAllocString(name); + info-&gt;index = This-&gt;TypeInfoCount; + info-&gt;TypeAttr.typekind = kind; + info-&gt;TypeAttr.cbAlignment = 4; + + switch(info-&gt;TypeAttr.typekind) { + case TKIND_ENUM: + case TKIND_INTERFACE: + case TKIND_DISPATCH: + case TKIND_COCLASS: + info-&gt;TypeAttr.cbSizeInstance = 4; + break; + case TKIND_RECORD: + case TKIND_UNION: + info-&gt;TypeAttr.cbSizeInstance = 0; + break; + case TKIND_MODULE: + info-&gt;TypeAttr.cbSizeInstance = 2; + break; + case TKIND_ALIAS: + info-&gt;TypeAttr.cbSizeInstance = -0x75; + break; + default: + FIXME("unrecognized typekind %d\n", info-&gt;TypeAttr.typekind); + info-&gt;TypeAttr.cbSizeInstance = 0xdeadbeef; + break; + } + + hres = ITypeInfo2_QueryInterface(&amp;info-&gt;ITypeInfo2_iface, + &amp;IID_ICreateTypeInfo, (void **)ctinfo); + if (FAILED(hres)) { + SysFreeString(info-&gt;Name); + ITypeInfo2_Release(&amp;info-&gt;ITypeInfo2_iface); + return hres; + } + + info-&gt;hreftype = info-&gt;index * sizeof(MSFT_TypeInfoBase); + + ++This-&gt;TypeInfoCount; + + return S_OK; } static HRESULT WINAPI ICreateTypeLib2_fnSetName(ICreateTypeLib2 *iface, </pre> Andrew Eikum 2013-05-24T16:28:42 http://permalink.gmane.org/gmane.comp.emulators.wine.patches/115819 <pre>--- dlls/oleaut32/typelib.c | 102 ++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 81 insertions(+), 21 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 9bbd86f..83b503c 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c &lt; at &gt;&lt; at &gt; -8307,40 +8307,68 &lt; at &gt;&lt; at &gt; static HRESULT WINAPI ICreateTypeInfo2_fnSetGuid(ICreateTypeInfo2 *iface, REFGUID guid) { ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface); - FIXME("%p %s - stub\n", This, debugstr_guid(guid)); - return E_NOTIMPL; + + TRACE("%p %s\n", This, debugstr_guid(guid)); + + memcpy(&amp;This-&gt;TypeAttr.guid, guid, sizeof(GUID)); + + return S_OK; } static HRESULT WINAPI ICreateTypeInfo2_fnSetTypeFlags(ICreateTypeInfo2 *iface, UINT typeFlags) { ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface); - FIXME("%p %x - stub\n", This, typeFlags); - return E_NOTIMPL; + + TRACE("%p %x\n", This, typeFlags); + + if (typeFlags &amp; TYPEFLAG_FDUAL) + typeFlags |= TYPEFLAG_FDISPATCHABLE; + + This-&gt;TypeAttr.wTypeFlags = typeFlags; + + return S_OK; } static HRESULT WINAPI ICreateTypeInfo2_fnSetDocString(ICreateTypeInfo2 *iface, - LPOLESTR strDoc) + LPOLESTR doc) { ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface); - FIXME("%p %s - stub\n", This, wine_dbgstr_w(strDoc)); - return E_NOTIMPL; + + TRACE("%p %s\n", This, wine_dbgstr_w(doc)); + + if (!doc) + return E_INVALIDARG; + + SysFreeString(This-&gt;DocString); + This-&gt;DocString = SysAllocString(doc); + + return S_OK; } static HRESULT WINAPI ICreateTypeInfo2_fnSetHelpContext(ICreateTypeInfo2 *iface, DWORD helpContext) { ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface); - FIXME("%p %d - stub\n", This, helpContext); - return E_NOTIMPL; + + TRACE("%p %d\n", This, helpContext); + + This-&gt;dwHelpContext = helpContext; + + return S_OK; } static HRESULT WINAPI ICreateTypeInfo2_fnSetVersion(ICreateTypeInfo2 *iface, WORD majorVerNum, WORD minorVerNum) { ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface); - FIXME("%p %d %d - stub\n", This, majorVerNum, minorVerNum); - return E_NOTIMPL; + + TRACE("%p %d %d\n", This, majorVerNum, minorVerNum); + + This-&gt;TypeAttr.wMajorVerNum = majorVerNum; + This-&gt;TypeAttr.wMinorVerNum = minorVerNum; + + return S_OK; } static HRESULT WINAPI ICreateTypeInfo2_fnAddRefTypeInfo(ICreateTypeInfo2 *iface, &lt; at &gt;&lt; at &gt; -8379,16 +8407,28 &lt; at &gt;&lt; at &gt; static HRESULT WINAPI ICreateTypeInfo2_fnSetAlignment(ICreateTypeInfo2 *iface, WORD alignment) { ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface); - FIXME("%p %d - stub\n", This, alignment); - return E_NOTIMPL; + + TRACE("%p %d\n", This, alignment); + + This-&gt;TypeAttr.cbAlignment = alignment; + + return S_OK; } static HRESULT WINAPI ICreateTypeInfo2_fnSetSchema(ICreateTypeInfo2 *iface, LPOLESTR schema) { ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface); - FIXME("%p %s - stub\n", This, wine_dbgstr_w(schema)); - return E_NOTIMPL; + + TRACE("%p %s\n", This, wine_dbgstr_w(schema)); + + if (!schema) + return E_INVALIDARG; + + SysFreeString(This-&gt;TypeAttr.lpstrSchema); + This-&gt;TypeAttr.lpstrSchema = SysAllocString(schema); + + return S_OK; } static HRESULT WINAPI ICreateTypeInfo2_fnAddVarDesc(ICreateTypeInfo2 *iface, &lt; at &gt;&lt; at &gt; -8475,8 +8515,16 &lt; at &gt;&lt; at &gt; static HRESULT WINAPI ICreateTypeInfo2_fnSetTypeIdldesc(ICreateTypeInfo2 *iface, IDLDESC *idlDesc) { ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface); - FIXME("%p %p - stub\n", This, idlDesc); - return E_NOTIMPL; + + TRACE("%p %p\n", This, idlDesc); + + if (!idlDesc) + return E_INVALIDARG; + + This-&gt;TypeAttr.idldescType.dwReserved = idlDesc-&gt;dwReserved; + This-&gt;TypeAttr.idldescType.wIDLFlags = idlDesc-&gt;wIDLFlags; + + return S_OK; } static HRESULT WINAPI ICreateTypeInfo2_fnLayOut(ICreateTypeInfo2 *iface) &lt; at &gt;&lt; at &gt; -8570,8 +8618,12 &lt; at &gt;&lt; at &gt; static HRESULT WINAPI ICreateTypeInfo2_fnSetHelpStringContext(ICreateTypeInfo2 * ULONG helpStringContext) { ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface); - FIXME("%p %u - stub\n", This, helpStringContext); - return E_NOTIMPL; + + TRACE("%p %u\n", This, helpStringContext); + + This-&gt;dwHelpStringContext = helpStringContext; + + return S_OK; } static HRESULT WINAPI ICreateTypeInfo2_fnSetFuncHelpStringContext(ICreateTypeInfo2 *iface, &lt; at &gt;&lt; at &gt; -8601,8 +8653,16 &lt; at &gt;&lt; at &gt; static HRESULT WINAPI ICreateTypeInfo2_fnSetName(ICreateTypeInfo2 *iface, LPOLESTR name) { ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface); - FIXME("%p %s - stub\n", This, wine_dbgstr_w(name)); - return E_NOTIMPL; + + TRACE("%p %s\n", This, wine_dbgstr_w(name)); + + if (!name) + return E_INVALIDARG; + + SysFreeString(This-&gt;Name); + This-&gt;Name = SysAllocString(name); + + return S_OK; } static const ICreateTypeInfo2Vtbl CreateTypeInfo2Vtbl = { </pre> Andrew Eikum 2013-05-24T16:28:39 http://permalink.gmane.org/gmane.comp.emulators.wine.patches/115818 <pre>--- dlls/oleaut32/typelib.c | 88 +++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 70 insertions(+), 18 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index edc9f21..9bbd86f 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c &lt; at &gt;&lt; at &gt; -8110,64 +8110,109 &lt; at &gt;&lt; at &gt; static HRESULT WINAPI ICreateTypeLib2_fnSetName(ICreateTypeLib2 *iface, LPOLESTR name) { ITypeLibImpl *This = impl_from_ICreateTypeLib2(iface); - FIXME("%p %s - stub\n", This, wine_dbgstr_w(name)); - return E_NOTIMPL; + + TRACE("%p %s\n", This, wine_dbgstr_w(name)); + + if (!name) + return E_INVALIDARG; + + SysFreeString(This-&gt;Name); + This-&gt;Name = SysAllocString(name); + + return S_OK; } static HRESULT WINAPI ICreateTypeLib2_fnSetVersion(ICreateTypeLib2 *iface, WORD majorVerNum, WORD minorVerNum) { ITypeLibImpl *This = impl_from_ICreateTypeLib2(iface); - FIXME("%p %d %d - stub\n", This, majorVerNum, minorVerNum); - return E_NOTIMPL; + + TRACE("%p %d %d\n", This, majorVerNum, minorVerNum); + + This-&gt;LibAttr.wMajorVerNum = majorVerNum; + This-&gt;LibAttr.wMinorVerNum = minorVerNum; + + return S_OK; } static HRESULT WINAPI ICreateTypeLib2_fnSetGuid(ICreateTypeLib2 *iface, REFGUID guid) { ITypeLibImpl *This = impl_from_ICreateTypeLib2(iface); - FIXME("%p %s - stub\n", This, debugstr_guid(guid)); - return E_NOTIMPL; + + TRACE("%p %s\n", This, debugstr_guid(guid)); + + memcpy(&amp;This-&gt;LibAttr.guid, guid, sizeof(GUID)); + + return S_OK; } static HRESULT WINAPI ICreateTypeLib2_fnSetDocString(ICreateTypeLib2 *iface, LPOLESTR doc) { ITypeLibImpl *This = impl_from_ICreateTypeLib2(iface); - FIXME("%p %s - stub\n", This, wine_dbgstr_w(doc)); - return E_NOTIMPL; + + TRACE("%p %s\n", This, wine_dbgstr_w(doc)); + + if (!doc) + return E_INVALIDARG; + + SysFreeString(This-&gt;DocString); + This-&gt;DocString = SysAllocString(doc); + + return S_OK; } static HRESULT WINAPI ICreateTypeLib2_fnSetHelpFileName(ICreateTypeLib2 *iface, LPOLESTR helpFileName) { ITypeLibImpl *This = impl_from_ICreateTypeLib2(iface); - FIXME("%p %s - stub\n", This, wine_dbgstr_w(helpFileName)); - return E_NOTIMPL; + + TRACE("%p %s\n", This, wine_dbgstr_w(helpFileName)); + + if (!helpFileName) + return E_INVALIDARG; + + SysFreeString(This-&gt;HelpFile); + This-&gt;HelpFile = SysAllocString(helpFileName); + + return S_OK; } static HRESULT WINAPI ICreateTypeLib2_fnSetHelpContext(ICreateTypeLib2 *iface, DWORD helpContext) { ITypeLibImpl *This = impl_from_ICreateTypeLib2(iface); - FIXME("%p %d - stub\n", This, helpContext); - return E_NOTIMPL; + + TRACE("%p %d\n", This, helpContext); + + This-&gt;dwHelpContext = helpContext; + + return S_OK; } static HRESULT WINAPI ICreateTypeLib2_fnSetLcid(ICreateTypeLib2 *iface, LCID lcid) { ITypeLibImpl *This = impl_from_ICreateTypeLib2(iface); - FIXME("%p %x - stub\n", This, lcid); - return E_NOTIMPL; + + TRACE("%p %x\n", This, lcid); + + This-&gt;LibAttr.lcid = lcid; + + return S_OK; } static HRESULT WINAPI ICreateTypeLib2_fnSetLibFlags(ICreateTypeLib2 *iface, UINT libFlags) { ITypeLibImpl *This = impl_from_ICreateTypeLib2(iface); - FIXME("%p %x - stub\n", This, libFlags); - return E_NOTIMPL; + + TRACE("%p %x\n", This, libFlags); + + This-&gt;LibAttr.wLibFlags = libFlags; + + return S_OK; } static HRESULT WINAPI ICreateTypeLib2_fnSaveAllChanges(ICreateTypeLib2 *iface) &lt; at &gt;&lt; at &gt; -8205,8 +8250,15 &lt; at &gt;&lt; at &gt; static HRESULT WINAPI ICreateTypeLib2_fnSetHelpStringDll(ICreateTypeLib2 *iface, LPOLESTR filename) { ITypeLibImpl *This = impl_from_ICreateTypeLib2(iface); - FIXME("%p %s - stub\n", This, wine_dbgstr_w(filename)); - return E_NOTIMPL; + TRACE("%p %s\n", This, wine_dbgstr_w(filename)); + + if (!filename) + return E_INVALIDARG; + + SysFreeString(This-&gt;HelpStringDll); + This-&gt;HelpStringDll = SysAllocString(filename); + + return S_OK; } static const ICreateTypeLib2Vtbl CreateTypeLib2Vtbl = { </pre> Andrew Eikum 2013-05-24T16:28:35 Search the mailing list at Gmane query http://search.gmane.org/?group=$group=gmane.comp.emulators.wine.patches