August 2013 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Move the WINED3D_MAX_FBO_ENTRIES constant to context.c.
by Alexandre Julliard 30 Aug '13

30 Aug '13

Module: wine Branch: master Commit: 53f747de1b987f14c52b214c89f9ad8e32de9baf URL: http://source.winehq.org/git/wine.git/?a=commit;h=53f747de1b987f14c52b214c8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 30 08:42:45 2013 +0200 wined3d: Move the WINED3D_MAX_FBO_ENTRIES constant to context.c. --- dlls/wined3d/context.c | 2 ++ dlls/wined3d/wined3d_private.h | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index cd1cfd4..e8a5a83 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -33,6 +33,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); WINE_DECLARE_DEBUG_CHANNEL(d3d_perf); WINE_DECLARE_DEBUG_CHANNEL(d3d_synchronous); +#define WINED3D_MAX_FBO_ENTRIES 64 + static DWORD wined3d_context_tls_idx; /* FBO helper functions */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 05a6250..c111e73 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1014,8 +1014,6 @@ enum fogsource { FOGSOURCE_COORD, }; -#define WINED3D_MAX_FBO_ENTRIES 64 - struct wined3d_occlusion_query { struct list entry;

1 0

Henri Verbeet : wined3d: Move the DEFAULT_REFRESH_RATE constant to directx. c.
by Alexandre Julliard 30 Aug '13

30 Aug '13

Module: wine Branch: master Commit: f7b84fe7550843a49cd273d5760c7318eeb0c44b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7b84fe7550843a49cd273d57… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 30 08:42:46 2013 +0200 wined3d: Move the DEFAULT_REFRESH_RATE constant to directx.c. --- dlls/wined3d/directx.c | 1 + dlls/wined3d/wined3d_private.h | 2 -- 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e235043..570299b3 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -33,6 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); WINE_DECLARE_DEBUG_CHANNEL(d3d_perf); #define WINE_DEFAULT_VIDMEM (64 * 1024 * 1024) +#define DEFAULT_REFRESH_RATE 0 /* The driver names reflect the lowest GPU supported * by a certain driver, so DRIVER_AMD_R300 supports diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c111e73..2f8c6b2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2572,8 +2572,6 @@ HDC swapchain_get_backup_dc(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN void swapchain_update_draw_bindings(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; void swapchain_update_render_to_fbo(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; -#define DEFAULT_REFRESH_RATE 0 - /***************************************************************************** * Utility function prototypes */

1 0

Henri Verbeet : d3dx9: Avoid some needless casts.
by Alexandre Julliard 30 Aug '13

30 Aug '13

Module: wine Branch: master Commit: 7175367ad5c010dfe83b921cad4ff92a626722d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7175367ad5c010dfe83b921ca… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 30 08:42:47 2013 +0200 d3dx9: Avoid some needless casts. --- dlls/d3dx9_36/shader.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 8e5236d..e3f6d5c 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -328,13 +328,13 @@ HRESULT WINAPI D3DXAssembleShaderFromFileW(const WCHAR *filename, const D3DXMACR HRESULT WINAPI D3DXAssembleShaderFromResourceA(HMODULE module, const char *resource, const D3DXMACRO *defines, ID3DXInclude *include, DWORD flags, ID3DXBuffer **shader, ID3DXBuffer **error_messages) { + void *buffer; HRSRC res; - LPCSTR buffer; DWORD len; if (!(res = FindResourceA(module, resource, (LPCSTR)RT_RCDATA))) return D3DXERR_INVALIDDATA; - if (FAILED(load_resource_into_memory(module, res, (LPVOID *)&buffer, &len))) + if (FAILED(load_resource_into_memory(module, res, &buffer, &len))) return D3DXERR_INVALIDDATA; return D3DXAssembleShader(buffer, len, defines, include, flags, shader, error_messages); @@ -343,13 +343,13 @@ HRESULT WINAPI D3DXAssembleShaderFromResourceA(HMODULE module, const char *resou HRESULT WINAPI D3DXAssembleShaderFromResourceW(HMODULE module, const WCHAR *resource, const D3DXMACRO *defines, ID3DXInclude *include, DWORD flags, ID3DXBuffer **shader, ID3DXBuffer **error_messages) { + void *buffer; HRSRC res; - LPCSTR buffer; DWORD len; if (!(res = FindResourceW(module, resource, (LPCWSTR)RT_RCDATA))) return D3DXERR_INVALIDDATA; - if (FAILED(load_resource_into_memory(module, res, (LPVOID *)&buffer, &len))) + if (FAILED(load_resource_into_memory(module, res, &buffer, &len))) return D3DXERR_INVALIDDATA; return D3DXAssembleShader(buffer, len, defines, include, flags, shader, error_messages); @@ -448,13 +448,13 @@ HRESULT WINAPI D3DXCompileShaderFromResourceA(HMODULE module, const char *resour ID3DXInclude *include, const char *entrypoint, const char *profile, DWORD flags, ID3DXBuffer **shader, ID3DXBuffer **error_messages, ID3DXConstantTable **constant_table) { + void *buffer; HRSRC res; - LPCSTR buffer; DWORD len; if (!(res = FindResourceA(module, resource, (LPCSTR)RT_RCDATA))) return D3DXERR_INVALIDDATA; - if (FAILED(load_resource_into_memory(module, res, (LPVOID *)&buffer, &len))) + if (FAILED(load_resource_into_memory(module, res, &buffer, &len))) return D3DXERR_INVALIDDATA; return D3DXCompileShader(buffer, len, defines, include, entrypoint, profile, flags, shader, error_messages, constant_table); @@ -464,13 +464,13 @@ HRESULT WINAPI D3DXCompileShaderFromResourceW(HMODULE module, const WCHAR *resou ID3DXInclude *include, const char *entrypoint, const char *profile, DWORD flags, ID3DXBuffer **shader, ID3DXBuffer **error_messages, ID3DXConstantTable **constant_table) { + void *buffer; HRSRC res; - LPCSTR buffer; DWORD len; if (!(res = FindResourceW(module, resource, (LPCWSTR)RT_RCDATA))) return D3DXERR_INVALIDDATA; - if (FAILED(load_resource_into_memory(module, res, (LPVOID *)&buffer, &len))) + if (FAILED(load_resource_into_memory(module, res, &buffer, &len))) return D3DXERR_INVALIDDATA; return D3DXCompileShader(buffer, len, defines, include, entrypoint, profile, flags, shader, error_messages, constant_table); @@ -534,13 +534,13 @@ HRESULT WINAPI D3DXPreprocessShaderFromFileW(const WCHAR *filename, const D3DXMA HRESULT WINAPI D3DXPreprocessShaderFromResourceA(HMODULE module, const char *resource, const D3DXMACRO *defines, ID3DXInclude *include, ID3DXBuffer **shader, ID3DXBuffer **error_messages) { + void *buffer; HRSRC res; - const char *buffer; DWORD len; if (!(res = FindResourceA(module, resource, (LPCSTR)RT_RCDATA))) return D3DXERR_INVALIDDATA; - if (FAILED(load_resource_into_memory(module, res, (LPVOID *)&buffer, &len))) + if (FAILED(load_resource_into_memory(module, res, &buffer, &len))) return D3DXERR_INVALIDDATA; return D3DXPreprocessShader(buffer, len, defines, include, shader, error_messages); @@ -549,13 +549,13 @@ HRESULT WINAPI D3DXPreprocessShaderFromResourceA(HMODULE module, const char *res HRESULT WINAPI D3DXPreprocessShaderFromResourceW(HMODULE module, const WCHAR *resource, const D3DXMACRO *defines, ID3DXInclude *include, ID3DXBuffer **shader, ID3DXBuffer **error_messages) { + void *buffer; HRSRC res; - const char *buffer; DWORD len; if (!(res = FindResourceW(module, resource, (const WCHAR *)RT_RCDATA))) return D3DXERR_INVALIDDATA; - if (FAILED(load_resource_into_memory(module, res, (void **)&buffer, &len))) + if (FAILED(load_resource_into_memory(module, res, &buffer, &len))) return D3DXERR_INVALIDDATA; return D3DXPreprocessShader(buffer, len, defines, include, shader, error_messages);

1 0

Henri Verbeet : d3dx9: Avoid LPCWSTR.
by Alexandre Julliard 30 Aug '13

30 Aug '13

Module: wine Branch: master Commit: 82710124e364953789426554481e82faef7be74c URL: http://source.winehq.org/git/wine.git/?a=commit;h=82710124e3649537894265544… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 30 08:42:48 2013 +0200 d3dx9: Avoid LPCWSTR. --- dlls/d3dx9_36/d3dx9_36_private.h | 2 +- dlls/d3dx9_36/shader.c | 12 ++++++++++-- dlls/d3dx9_36/surface.c | 13 +++++++------ dlls/d3dx9_36/util.c | 2 +- include/d3dx9core.h | 2 +- include/d3dx9tex.h | 4 ++-- 6 files changed, 22 insertions(+), 13 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36_private.h b/dlls/d3dx9_36/d3dx9_36_private.h index 08a73c2..451615b 100644 --- a/dlls/d3dx9_36/d3dx9_36_private.h +++ b/dlls/d3dx9_36/d3dx9_36_private.h @@ -67,7 +67,7 @@ struct pixel_format_desc { void (*to_rgba)(const struct vec4 *src, struct vec4 *dst, const PALETTEENTRY *palette); }; -HRESULT map_view_of_file(LPCWSTR filename, LPVOID *buffer, DWORD *length) DECLSPEC_HIDDEN; +HRESULT map_view_of_file(const WCHAR *filename, void **buffer, DWORD *length) DECLSPEC_HIDDEN; HRESULT load_resource_into_memory(HMODULE module, HRSRC resinfo, LPVOID *buffer, DWORD *length) DECLSPEC_HIDDEN; HRESULT write_buffer_to_file(const WCHAR *filename, ID3DXBuffer *buffer) DECLSPEC_HIDDEN; diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index e3f6d5c..66a38ab 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -347,7 +347,10 @@ HRESULT WINAPI D3DXAssembleShaderFromResourceW(HMODULE module, const WCHAR *reso HRSRC res; DWORD len; - if (!(res = FindResourceW(module, resource, (LPCWSTR)RT_RCDATA))) + TRACE("module %p, resource %s, defines %p, include %p, flags %#x, shader %p, error_messages %p.\n", + module, debugstr_w(resource), defines, include, flags, shader, error_messages); + + if (!(res = FindResourceW(module, resource, (const WCHAR *)RT_RCDATA))) return D3DXERR_INVALIDDATA; if (FAILED(load_resource_into_memory(module, res, &buffer, &len))) return D3DXERR_INVALIDDATA; @@ -468,7 +471,12 @@ HRESULT WINAPI D3DXCompileShaderFromResourceW(HMODULE module, const WCHAR *resou HRSRC res; DWORD len; - if (!(res = FindResourceW(module, resource, (LPCWSTR)RT_RCDATA))) + TRACE("module %p, resource %s, defines %p, include %p, entrypoint %s, profile %s, " + "flags %#x, shader %p, error_messages %p, constant_table %p.\n", + module, debugstr_w(resource), defines, include, debugstr_a(entrypoint), debugstr_a(profile), + flags, shader, error_messages, constant_table); + + if (!(res = FindResourceW(module, resource, (const WCHAR *)RT_RCDATA))) return D3DXERR_INVALIDDATA; if (FAILED(load_resource_into_memory(module, res, &buffer, &len))) return D3DXERR_INVALIDDATA; diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 9b76457..2f4499e 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -919,18 +919,19 @@ HRESULT WINAPI D3DXGetImageInfoFromFileA(LPCSTR file, D3DXIMAGE_INFO *info) return hr; } -HRESULT WINAPI D3DXGetImageInfoFromFileW(LPCWSTR file, D3DXIMAGE_INFO *info) +HRESULT WINAPI D3DXGetImageInfoFromFileW(const WCHAR *file, D3DXIMAGE_INFO *info) { + void *buffer; HRESULT hr; DWORD size; - LPVOID buffer; - TRACE("(%s, %p): relay\n", debugstr_w(file), info); + TRACE("file %s, info %p.\n", debugstr_w(file), info); - if( !file ) return D3DERR_INVALIDCALL; + if (!file) + return D3DERR_INVALIDCALL; - hr = map_view_of_file(file, &buffer, &size); - if(FAILED(hr)) return D3DXERR_INVALIDDATA; + if (FAILED(map_view_of_file(file, &buffer, &size))) + return D3DXERR_INVALIDDATA; hr = D3DXGetImageInfoFromFileInMemory(buffer, size, info); UnmapViewOfFile(buffer); diff --git a/dlls/d3dx9_36/util.c b/dlls/d3dx9_36/util.c index 5463e42..1fae956 100644 --- a/dlls/d3dx9_36/util.c +++ b/dlls/d3dx9_36/util.c @@ -108,7 +108,7 @@ static const struct pixel_format_desc formats[] = * The caller must UnmapViewOfFile when it doesn't need the data anymore * */ -HRESULT map_view_of_file(LPCWSTR filename, LPVOID *buffer, DWORD *length) +HRESULT map_view_of_file(const WCHAR *filename, void **buffer, DWORD *length) { HANDLE hfile, hmapping = NULL; diff --git a/include/d3dx9core.h b/include/d3dx9core.h index b6226d6..c28fe71 100644 --- a/include/d3dx9core.h +++ b/include/d3dx9core.h @@ -144,7 +144,7 @@ DECLARE_INTERFACE_(ID3DXFont, IUnknown) STDMETHOD(PreloadCharacters)(THIS_ UINT first, UINT last) PURE; STDMETHOD(PreloadGlyphs)(THIS_ UINT first, UINT last) PURE; STDMETHOD(PreloadTextA)(THIS_ LPCSTR string, INT count) PURE; - STDMETHOD(PreloadTextW)(THIS_ LPCWSTR string, INT count) PURE; + STDMETHOD(PreloadTextW)(THIS_ const WCHAR *string, INT count) PURE; STDMETHOD_(INT, DrawTextA)(THIS_ struct ID3DXSprite *sprite, const char *string, INT count, RECT *rect, DWORD format, D3DCOLOR color) PURE; diff --git a/include/d3dx9tex.h b/include/d3dx9tex.h index d10e01d..295a324 100644 --- a/include/d3dx9tex.h +++ b/include/d3dx9tex.h @@ -93,11 +93,11 @@ extern "C" { /* Image Information */ HRESULT WINAPI D3DXGetImageInfoFromFileA(LPCSTR file, D3DXIMAGE_INFO *info); -HRESULT WINAPI D3DXGetImageInfoFromFileW(LPCWSTR file, D3DXIMAGE_INFO *info); +HRESULT WINAPI D3DXGetImageInfoFromFileW(const WCHAR *file, D3DXIMAGE_INFO *info); #define D3DXGetImageInfoFromFile WINELIB_NAME_AW(D3DXGetImageInfoFromFile) HRESULT WINAPI D3DXGetImageInfoFromResourceA(HMODULE module, LPCSTR resource, D3DXIMAGE_INFO *info); -HRESULT WINAPI D3DXGetImageInfoFromResourceW(HMODULE module, LPCWSTR resource, D3DXIMAGE_INFO *info); +HRESULT WINAPI D3DXGetImageInfoFromResourceW(HMODULE module, const WCHAR *resource, D3DXIMAGE_INFO *info); #define D3DXGetImageInfoFromResource WINELIB_NAME_AW(D3DXGetImageInfoFromResource) HRESULT WINAPI D3DXGetImageInfoFromFileInMemory(LPCVOID data, UINT datasize, D3DXIMAGE_INFO *info);

1 0

Alexandre Julliard : patches: Allow specifying the directory that contains the patch data.
by Alexandre Julliard 30 Aug '13

30 Aug '13

Module: tools Branch: master Commit: 4fe66f8d3a5077f6e8f96d66b113994973fb11ee URL: http://source.winehq.org/git/tools.git/?a=commit;h=4fe66f8d3a5077f6e8f96d66… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 29 16:31:00 2013 +0200 patches: Allow specifying the directory that contains the patch data. --- patches/update | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/patches/update b/patches/update index baf2a2a..52d4d88 100755 --- a/patches/update +++ b/patches/update @@ -84,7 +84,7 @@ my @legend = "<li>The <a href=\"//testbot.winehq.org/\">testbot</a> detected new failures on Windows.</li></ul>" ], ); -my $dir = "$ENV{HOME}/patches"; +my $dir = $ARGV[0] || "$ENV{HOME}/patches"; my $dest = "/home/winehq/opt/source/patches"; my %patches;

1 0

Alexandre Julliard : testbot: Use https URLs when SSL is enabled.
by Alexandre Julliard 30 Aug '13

30 Aug '13

Module: tools Branch: master Commit: 0909a7476a8da51e7245659e736d92424be8bffc URL: http://source.winehq.org/git/tools.git/?a=commit;h=0909a7476a8da51e7245659e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 29 17:14:09 2013 +0200 testbot: Use https URLs when SSL is enabled. --- testbot/bin/WineSendLog.pl | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index ce69c21..aec2bee 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -424,6 +424,8 @@ EOF } } + my $WebSite = ($UseSSL ? "https://" : "http://") . $WebHostName; + if ($Messages) { open (SENDMAIL, "|/usr/sbin/sendmail -oi -t -odq"); @@ -440,7 +442,7 @@ Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at EOF - print SENDMAIL "http://$WebHostName/JobDetails.pl?Key=", + print SENDMAIL "$WebSite/JobDetails.pl?Key=", $Job->GetKey(), "\n\n"; print SENDMAIL "Your paranoid android.\n\n"; @@ -468,7 +470,7 @@ EOF { print $result "Status: " . ($Messages ? "Failed" : "OK") . "\n"; print $result "Job-ID: " . $Job->Id . "\n"; - print $result "URL: http://$WebHostName/JobDetails.pl?Key=" . $Job->GetKey() . "\n"; + print $result "URL: $WebSite/JobDetails.pl?Key=" . $Job->GetKey() . "\n"; foreach my $Key (@SortedKeys) {

1 0

Alexandre Julliard : patches: Add a link to the testbot job id if available .
by Alexandre Julliard 30 Aug '13

30 Aug '13

Module: tools Branch: master Commit: c0f93c48c30159c5b2359927e40dd0ee1d85a49c URL: http://source.winehq.org/git/tools.git/?a=commit;h=c0f93c48c30159c5b2359927… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 29 17:13:55 2013 +0200 patches: Add a link to the testbot job id if available. --- patches/update | 25 ++++++++++++++++++++++++- 1 files changed, 24 insertions(+), 1 deletions(-) diff --git a/patches/update b/patches/update index 52d4d88..4ccc910 100755 --- a/patches/update +++ b/patches/update @@ -115,7 +115,8 @@ print INDEX "<table class=\"main\"><tr><th class=\"id\">ID</th>", "<th class=\"status\">Status</th>", "<th class=\"author\">Author</th>", "<th class=\"subject\">Subject</th>", - "<th class=\"status\">Testbot</th></tr>\n"; + "<th class=\"status\">Testbot</th>", + "<th class=\"status\">Job ID</th></tr>\n"; opendir DIR, $dir; foreach my $file (readdir DIR) @@ -146,9 +147,21 @@ foreach my $file (readdir DIR) close ORDER; } $patch{"testbot"} = ""; + $patch{"testjob"} = ""; + $patch{"testurl"} = ""; if (-f "$dir/$file.testbot") { $patch{"testbot"} = "OK"; + if (open LOG, "<$dir/$file.testbot") + { + while (<LOG>) + { + last if /^$/; + if (/^Job-ID: (.*)$/) { $patch{"testjob"} = $1; } + elsif (/^URL: (.*)$/) { $patch{"testurl"} = $1; } + } + close LOG; + } } if (-f "$dir/$file.testfail") { @@ -175,6 +188,16 @@ foreach my $file (sort { $patches{$b}->{"order"} <=> $patches{$a}->{"order"} } k { printf INDEX "<td class=\"testbot\">%s</td>", $patch->{"testbot"}; } + if ($patch->{"testjob"} && $patch->{"testurl"}) + { + printf INDEX "<td class=\"%s\"><a href=\"%s\">%s</a></td>", + ($patch->{"testbot"} eq "Failed") ? " testbot botfail" : "testbot", + $patch->{"testurl"}, $patch->{"testjob"}; + } + else + { + print INDEX "<td></td>"; + } print INDEX "</tr>\n"; $row++; }

1 0

Alexandre Julliard : testbot: Add status and URL fields to the test result file.
by Alexandre Julliard 30 Aug '13

30 Aug '13

Module: tools Branch: master Commit: 1c345024e5706af0bffdf7286acb11971b9f8937 URL: http://source.winehq.org/git/tools.git/?a=commit;h=1c345024e5706af0bffdf728… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 29 16:33:46 2013 +0200 testbot: Add status and URL fields to the test result file. --- testbot/bin/WineSendLog.pl | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 3c3ff8c..ce69c21 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -466,6 +466,10 @@ EOF } if (open (my $result, ">", "$BaseName.testbot")) { + print $result "Status: " . ($Messages ? "Failed" : "OK") . "\n"; + print $result "Job-ID: " . $Job->Id . "\n"; + print $result "URL: http://$WebHostName/JobDetails.pl?Key=" . $Job->GetKey() . "\n"; + foreach my $Key (@SortedKeys) { my $StepTask = $StepsTasks->GetItem($Key);

1 0

Frédéric Delanoy : winedev: Assorted formatting & tagging fixes.
by Alexandre Julliard 30 Aug '13

30 Aug '13

Module: docs Branch: master Commit: 1a74d640104c7d516852ea77e74d04dea658d0ca URL: http://source.winehq.org/git/docs.git/?a=commit;h=1a74d640104c7d516852ea77e… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Aug 30 09:34:03 2013 +0200 winedev: Assorted formatting & tagging fixes. Note that OLE/COM chapter needs an overhaul but that's outside the scope of this patch. --- en/winedev-ole.sgml | 352 +++++++++++++++++++++++++++------------------------ 1 files changed, 185 insertions(+), 167 deletions(-) Diff: http://source.winehq.org/git/docs.git/?a=commitdiff;h=1a74d640104c7d516852e…

1 0

Jacek Caban : widl: Include string info in tlb custom data.
by Alexandre Julliard 29 Aug '13

29 Aug '13

Module: wine Branch: master Commit: 02775123509652d0d7d09003a070b7ce0f83f95e URL: http://source.winehq.org/git/wine.git/?a=commit;h=02775123509652d0d7d09003a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 29 15:08:51 2013 +0200 widl: Include string info in tlb custom data. --- tools/widl/write_msft.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 53e1feb..d938d00 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -1232,7 +1232,7 @@ static void write_value(msft_typelib_t* typelib, int *out, int vt, const void *v } static HRESULT set_custdata(msft_typelib_t *typelib, REFGUID guid, - int vt, int value, int *offset) + int vt, const void *value, int *offset) { MSFT_GuidEntry guidentry; int guidoffset; @@ -1246,7 +1246,7 @@ static HRESULT set_custdata(msft_typelib_t *typelib, REFGUID guid, guidentry.next_hash = -1; guidoffset = ctl2_alloc_guid(typelib, &guidentry); - write_value(typelib, &data_out, vt, &value); + write_value(typelib, &data_out, vt, value); custoffset = ctl2_alloc_segment(typelib, MSFT_SEG_CUSTDATAGUID, 12, 0); @@ -2567,8 +2567,10 @@ int create_msft_typelib(typelib_t *typelib) time_t cur_time; char *time_override; unsigned int version = 5 << 24 | 1 << 16 | 164; /* 5.01.0164 */ - GUID midl_time_guid = {0xde77ba63,0x517c,0x11d1,{0xa2,0xda,0x00,0x00,0xf8,0x77,0x3c,0xe9}}; - GUID midl_version_guid = {0xde77ba64,0x517c,0x11d1,{0xa2,0xda,0x00,0x00,0xf8,0x77,0x3c,0xe9}}; + GUID midl_time_guid = {0xde77ba63,0x517c,0x11d1,{0xa2,0xda,0x00,0x00,0xf8,0x77,0x3c,0xe9}}; + GUID midl_version_guid = {0xde77ba64,0x517c,0x11d1,{0xa2,0xda,0x00,0x00,0xf8,0x77,0x3c,0xe9}}; + GUID midl_info_guid = {0xde77ba65,0x517c,0x11d1,{0xa2,0xda,0x00,0x00,0xf8,0x77,0x3c,0xe9}}; + char info_string[128]; pointer_size = (typelib_kind == SYS_WIN64) ? 8 : 4; @@ -2615,8 +2617,10 @@ int create_msft_typelib(typelib_t *typelib) and midl's version number */ time_override = getenv( "WIDL_TIME_OVERRIDE"); cur_time = time_override ? atol( time_override) : time(NULL); - set_custdata(msft, &midl_time_guid, VT_UI4, cur_time, &msft->typelib_header.CustomDataOffset); - set_custdata(msft, &midl_version_guid, VT_UI4, version, &msft->typelib_header.CustomDataOffset); + sprintf(info_string, "Created by WIDL version %s at %s\n", PACKAGE_VERSION, ctime(&cur_time)); + set_custdata(msft, &midl_info_guid, VT_BSTR, info_string, &msft->typelib_header.CustomDataOffset); + set_custdata(msft, &midl_time_guid, VT_UI4, &cur_time, &msft->typelib_header.CustomDataOffset); + set_custdata(msft, &midl_version_guid, VT_UI4, &version, &msft->typelib_header.CustomDataOffset); if (typelib->stmts) LIST_FOR_EACH_ENTRY( stmt, typelib->stmts, const statement_t, entry )

1 0