April 2011 - Wine-commits - list.winehq.org

Francois Gouget : taskmgr: Implement the Help menu.
by Alexandre Julliard 08 Apr '11

08 Apr '11

Module: wine Branch: master Commit: 9668e1c0d4e97140e6f70cfccfc4a59f5d80615c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9668e1c0d4e97140e6f70cfcc… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Apr 8 12:01:43 2011 +0200 taskmgr: Implement the Help menu. --- programs/taskmgr/taskmgr.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/programs/taskmgr/taskmgr.c b/programs/taskmgr/taskmgr.c index 08acf71..dcab031 100644 --- a/programs/taskmgr/taskmgr.c +++ b/programs/taskmgr/taskmgr.c @@ -770,6 +770,7 @@ LPWSTR GetLastErrorText(LPWSTR lpwszBuf, DWORD dwSize) static INT_PTR CALLBACK TaskManagerWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { + static const WCHAR wszTaskmgr[] = {'t','a','s','k','m','g','r',0}; HDC hdc; PAINTSTRUCT ps; LPRECT pRC; @@ -904,6 +905,9 @@ TaskManagerWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) case ID_PROCESS_PAGE_DEBUGCHANNELS: ProcessPage_OnDebugChannels(); break; + case ID_HELP_TOPICS: + WinHelpW(hDlg, wszTaskmgr, HELP_FINDER, 0); + break; case ID_HELP_ABOUT: OnAbout(); break;

1 0

Francois Gouget : shell32: Fix the *CPLINFO* lData field type.
by Alexandre Julliard 08 Apr '11

08 Apr '11

Module: wine Branch: master Commit: 4cb9c161436fb7fd1223f257a18cf297596198ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cb9c161436fb7fd1223f257a… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Apr 8 12:03:39 2011 +0200 shell32: Fix the *CPLINFO* lData field type. --- include/cpl.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/cpl.h b/include/cpl.h index 5c382ff..adabeba 100644 --- a/include/cpl.h +++ b/include/cpl.h @@ -36,7 +36,7 @@ typedef struct tagCPLINFO { int idIcon; int idName; int idInfo; - LONG lData; + LONG_PTR lData; } CPLINFO, *LPCPLINFO; typedef struct tagNEWCPLINFOA @@ -44,7 +44,7 @@ typedef struct tagNEWCPLINFOA DWORD dwSize; DWORD dwFlags; DWORD dwHelpContext; - LONG lData; + LONG_PTR lData; HICON hIcon; CHAR szName[32]; CHAR szInfo[64]; @@ -56,7 +56,7 @@ typedef struct tagNEWCPLINFOW DWORD dwSize; DWORD dwFlags; DWORD dwHelpContext; - LONG lData; + LONG_PTR lData; HICON hIcon; WCHAR szName[32]; WCHAR szInfo[64];

1 0

Henri Verbeet : wined3d: Don't use IWineD3DDeviceImpl_GetSwapChain() in IWineD3DDeviceImpl_Present().
by Alexandre Julliard 08 Apr '11

08 Apr '11

Module: wine Branch: master Commit: 617efafecff9083b2ed2cc4ec7e3a417635491bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=617efafecff9083b2ed2cc4ec… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 7 18:45:57 2011 +0200 wined3d: Don't use IWineD3DDeviceImpl_GetSwapChain() in IWineD3DDeviceImpl_Present(). It adds COM overhead and validation of the swapchain index, but we already know the index is valid. --- dlls/wined3d/device.c | 24 +++++++++++------------- 1 files changed, 11 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 44b81c4..4623494 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4778,22 +4778,20 @@ static HRESULT WINAPI IWineD3DDeviceImpl_EndScene(IWineD3DDevice *iface) return WINED3D_OK; } -static HRESULT WINAPI IWineD3DDeviceImpl_Present(IWineD3DDevice *iface, - const RECT *pSourceRect, const RECT *pDestRect, - HWND hDestWindowOverride, const RGNDATA *pDirtyRegion) +static HRESULT WINAPI IWineD3DDeviceImpl_Present(IWineD3DDevice *iface, const RECT *src_rect, + const RECT *dst_rect, HWND dst_window_override, const RGNDATA *dirty_region) { - IWineD3DSwapChain *swapChain = NULL; - int i; - int swapchains = IWineD3DDeviceImpl_GetNumberOfSwapChains(iface); - - TRACE("iface %p.\n", iface); + IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *)iface; + UINT i; - for(i = 0 ; i < swapchains ; i ++) { + TRACE("iface %p, src_rect %s, dst_rect %s, dst_window_override %p, dirty_region %p.\n", + iface, wine_dbgstr_rect(src_rect), wine_dbgstr_rect(dst_rect), + dst_window_override, dirty_region); - IWineD3DDeviceImpl_GetSwapChain(iface, i, &swapChain); - TRACE("Presenting chain %d, %p.\n", i, swapChain); - IWineD3DSwapChain_Present(swapChain, pSourceRect, pDestRect, hDestWindowOverride, pDirtyRegion, 0); - IWineD3DSwapChain_Release(swapChain); + for (i = 0; i < device->swapchain_count; ++i) + { + IWineD3DSwapChain_Present((IWineD3DSwapChain *)device->swapchains[i], + src_rect, dst_rect, dst_window_override, dirty_region, 0); } return WINED3D_OK;

1 0

Henri Verbeet : wined3d: Merge swapchain_gdi.c into swapchain.c.
by Alexandre Julliard 08 Apr '11

08 Apr '11

Module: wine Branch: master Commit: 0a174ae542df47c864c31c52540919e3d2488bfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a174ae542df47c864c31c525… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 7 18:45:58 2011 +0200 wined3d: Merge swapchain_gdi.c into swapchain.c. --- dlls/wined3d/Makefile.in | 1 - dlls/wined3d/swapchain.c | 270 +++++++++++++++++++++++++++++++++++++--- dlls/wined3d/swapchain_gdi.c | 273 ---------------------------------------- dlls/wined3d/wined3d_private.h | 1 - 4 files changed, 253 insertions(+), 292 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0a174ae542df47c864c31…

1 0

Jacek Caban : urlmon: Use winetest data. php URLs for regular http binding tests.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: master Commit: 777b06fb9e85a73ffc5299a663014ba1d0374f5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=777b06fb9e85a73ffc5299a66… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 7 15:46:01 2011 +0200 urlmon: Use winetest data.php URLs for regular http binding tests. --- dlls/urlmon/tests/url.c | 21 +++++++++++---------- 1 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index f236fa1..7202052 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -146,11 +146,12 @@ DEFINE_EXPECT(GetWindow_IHttpSecurity); DEFINE_EXPECT(GetWindow_IWindowForBindingUI); DEFINE_EXPECT(OnSecurityProblem); -static const WCHAR TEST_URL_1[] = {'h','t','t','p',':','/','/','w','w','w','.','w','i','n','e','h','q','.','o','r','g','/','\0'}; -static const WCHAR TEST_PART_URL_1[] = {'/','t','e','s','t','/','\0'}; +static const WCHAR winetest_data_urlW[] = + {'h','t','t','p',':','/','/','t','e','s','t','.','w','i','n','e','h','q','.','o','r','g','/', + 't','e','s','t','s','/','d','a','t','a','.','p','h','p',0}; + +static const WCHAR TEST_PART_URL_1[] = {'/','t','e','s','t','s','/','d','a','t','a','.','p','h','p','\0'}; -static const WCHAR WINE_ABOUT_URL[] = {'h','t','t','p',':','/','/','w','w','w','.','w','i','n','e','h','q','.', - 'o','r','g','/','s','i','t','e','/','a','b','o','u','t',0}; static const WCHAR SHORT_RESPONSE_URL[] = {'h','t','t','p',':','/','/','c','r','o','s','s','o','v','e','r','.', 'c','o','d','e','w','e','a','v','e','r','s','.','c','o','m','/', @@ -205,7 +206,7 @@ static BOOL only_check_prot_args = FALSE; static BOOL invalid_cn_accepted = FALSE; static LPCWSTR urls[] = { - WINE_ABOUT_URL, + winetest_data_urlW, ABOUT_BLANK, INDEX_HTML, ITS_URL, @@ -314,7 +315,7 @@ static void test_create(void) IBindCtx *bctx; HRESULT hr; - test_CreateURLMoniker(TEST_URL_1, TEST_PART_URL_1); + test_CreateURLMoniker(winetest_data_urlW, TEST_PART_URL_1); mon = (void*)0xdeadbeef; hr = CreateURLMoniker(NULL, relativeW, &mon); @@ -339,7 +340,7 @@ static void test_create(void) IMoniker_Release(mon); mon = (void*)0xdaedbeef; - hr = CreateURLMoniker(NULL, TEST_URL_1, &mon); + hr = CreateURLMoniker(NULL, winetest_data_urlW, &mon); ok(hr == S_OK, "got 0x%08x\n", hr); stream = (void*)0xdeadbeef; @@ -511,7 +512,7 @@ static DWORD WINAPI thread_proc(PVOID arg) SET_EXPECT(Obj_OnProgress_REDIRECTING); else SET_EXPECT(OnProgress_REDIRECTING); - hres = IInternetProtocolSink_ReportProgress(protocol_sink, BINDSTATUS_REDIRECTING, WINE_ABOUT_URL); + hres = IInternetProtocolSink_ReportProgress(protocol_sink, BINDSTATUS_REDIRECTING, winetest_data_urlW); ok(hres == S_OK, "ReportProgress(BINDSTATUS_REFIRECTING) failed: %08x\n", hres); WaitForSingleObject(complete_event, INFINITE); if(bind_to_object) @@ -1609,7 +1610,7 @@ static HRESULT WINAPI statusclb_OnProgress(IBindStatusCallbackEx *iface, ULONG u CHECK_EXPECT(Obj_OnProgress_REDIRECTING); else CHECK_EXPECT(OnProgress_REDIRECTING); - ok(!lstrcmpW(szStatusText, WINE_ABOUT_URL), "unexpected status text %s\n", + ok(!lstrcmpW(szStatusText, winetest_data_urlW), "unexpected status text %s\n", wine_dbgstr_w(szStatusText)); if(emulate_protocol && (test_protocol == HTTP_TEST || test_protocol == HTTPS_TEST || test_protocol == WINETEST_TEST) && (!bind_to_object || iface == &objbsc)) @@ -2687,7 +2688,7 @@ static void init_bind_test(int protocol, DWORD flags, DWORD t) if(flags & BINDTEST_HTTPRESPONSE) urls[HTTP_TEST] = SHORT_RESPONSE_URL; else - urls[HTTP_TEST] = WINE_ABOUT_URL; + urls[HTTP_TEST] = winetest_data_urlW; if(flags & BINDTEST_INVALID_CN) urls[HTTPS_TEST] = https_invalid_cn_urlW; else

1 0

Juan Lang : wininet: Honor security flags specified when opening a connection.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: master Commit: 0b8bfd97361fc68358608b03cdf71c2875c4a451 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b8bfd97361fc68358608b03c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Apr 7 08:05:36 2011 -0700 wininet: Honor security flags specified when opening a connection. --- dlls/wininet/http.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index b2b7bd9..801357c 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2832,6 +2832,10 @@ static DWORD HTTP_HttpOpenRequestW(http_session_t *session, if ((res = NETCON_init(&request->netConnection, dwFlags & INTERNET_FLAG_SECURE)) != ERROR_SUCCESS) goto lend; + if (dwFlags & INTERNET_FLAG_IGNORE_CERT_CN_INVALID) + request->netConnection.security_flags |= SECURITY_FLAG_IGNORE_CERT_CN_INVALID; + if (dwFlags & INTERNET_FLAG_IGNORE_CERT_DATE_INVALID) + request->netConnection.security_flags |= SECURITY_FLAG_IGNORE_CERT_DATE_INVALID; if (lpszObjectName && *lpszObjectName) { HRESULT rc;

1 0

Dmitry Timoshkov : kernel32: Constify some data.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: master Commit: 08f8f508949928a11fb078f2dfa40d41dec926ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=08f8f508949928a11fb078f2d… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Apr 7 15:01:40 2011 +0900 kernel32: Constify some data. --- dlls/kernel32/tests/codepage.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/codepage.c b/dlls/kernel32/tests/codepage.c index 13f9b75..795e313 100644 --- a/dlls/kernel32/tests/codepage.c +++ b/dlls/kernel32/tests/codepage.c @@ -356,7 +356,7 @@ static void test_string_conversion(LPBOOL bUsedDefaultChar) static void test_undefined_byte_char(void) { - struct tag_testset { + static const struct tag_testset { INT codepage; LPCSTR str; BOOL is_error;

1 0

Vincent Povirk : gdiplus: Validate MatrixOrder in matrix functions.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: master Commit: 14f925d5af42bf29b7d7ce72059fdeaa6078c27c URL: http://source.winehq.org/git/wine.git/?a=commit;h=14f925d5af42bf29b7d7ce720… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Apr 6 16:54:53 2011 -0500 gdiplus: Validate MatrixOrder in matrix functions. --- dlls/gdiplus/matrix.c | 20 +++++++++++++++----- 1 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/matrix.c b/dlls/gdiplus/matrix.c index 3798bd2..1035cc2 100644 --- a/dlls/gdiplus/matrix.c +++ b/dlls/gdiplus/matrix.c @@ -231,8 +231,10 @@ GpStatus WINGDIPAPI GdipMultiplyMatrix(GpMatrix *matrix, GDIPCONST GpMatrix* mat if(order == MatrixOrderAppend) matrix_multiply(matrix->matrix, matrix2->matrix, matrix->matrix); - else + else if (order == MatrixOrderPrepend) matrix_multiply(matrix2->matrix, matrix->matrix, matrix->matrix); + else + return InvalidParameter; return Ok; } @@ -260,8 +262,10 @@ GpStatus WINGDIPAPI GdipRotateMatrix(GpMatrix *matrix, REAL angle, if(order == MatrixOrderAppend) matrix_multiply(matrix->matrix, rotate, matrix->matrix); - else + else if (order == MatrixOrderPrepend) matrix_multiply(rotate, matrix->matrix, matrix->matrix); + else + return InvalidParameter; return Ok; } @@ -285,8 +289,10 @@ GpStatus WINGDIPAPI GdipScaleMatrix(GpMatrix *matrix, REAL scaleX, REAL scaleY, if(order == MatrixOrderAppend) matrix_multiply(matrix->matrix, scale, matrix->matrix); - else + else if (order == MatrixOrderPrepend) matrix_multiply(scale, matrix->matrix, matrix->matrix); + else + return InvalidParameter; return Ok; } @@ -330,8 +336,10 @@ GpStatus WINGDIPAPI GdipShearMatrix(GpMatrix *matrix, REAL shearX, REAL shearY, if(order == MatrixOrderAppend) matrix_multiply(matrix->matrix, shear, matrix->matrix); - else + else if (order == MatrixOrderPrepend) matrix_multiply(shear, matrix->matrix, matrix->matrix); + else + return InvalidParameter; return Ok; } @@ -410,8 +418,10 @@ GpStatus WINGDIPAPI GdipTranslateMatrix(GpMatrix *matrix, REAL offsetX, if(order == MatrixOrderAppend) matrix_multiply(matrix->matrix, translate, matrix->matrix); - else + else if (order == MatrixOrderPrepend) matrix_multiply(translate, matrix->matrix, matrix->matrix); + else + return InvalidParameter; return Ok; }

1 0

Rico Schüller : d3dx9: Fix return values.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: master Commit: 651e044590e4c5f2a34c5502cd6beea640b52a5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=651e044590e4c5f2a34c5502c… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Apr 7 11:06:48 2011 +0200 d3dx9: Fix return values. --- dlls/d3dx9_36/effect.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 3f89eb8..b2cc197 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -2328,7 +2328,7 @@ static HRESULT d3dx9_parse_effect(struct ID3DXBaseEffectImpl *base, const char * /* todo: Parse techniques */ - return S_OK; + return D3D_OK; } static HRESULT d3dx9_base_effect_init(struct ID3DXBaseEffectImpl *base, @@ -2361,14 +2361,14 @@ static HRESULT d3dx9_base_effect_init(struct ID3DXBaseEffectImpl *base, TRACE("Offset: %x\n", offset); hr = d3dx9_parse_effect(base, ptr, data_size, offset); - if (hr != S_OK) + if (hr != D3D_OK) { FIXME("Failed to parse effect.\n"); return hr; } } - return S_OK; + return D3D_OK; } static HRESULT d3dx9_effect_init(struct ID3DXEffectImpl *effect, LPDIRECT3DDEVICE9 device, @@ -2397,7 +2397,7 @@ static HRESULT d3dx9_effect_init(struct ID3DXEffectImpl *effect, LPDIRECT3DDEVIC } hr = d3dx9_base_effect_init(object, data, data_size, effect); - if (hr != S_OK) + if (hr != D3D_OK) { FIXME("Failed to parse effect.\n"); goto err_out; @@ -2405,7 +2405,7 @@ static HRESULT d3dx9_effect_init(struct ID3DXEffectImpl *effect, LPDIRECT3DDEVIC effect->base_effect = &object->ID3DXBaseEffect_iface; - return S_OK; + return D3D_OK; err_out: @@ -2499,7 +2499,7 @@ static HRESULT d3dx9_effect_compiler_init(struct ID3DXEffectCompilerImpl *compil } hr = d3dx9_base_effect_init(object, data, data_size, NULL); - if (hr != S_OK) + if (hr != D3D_OK) { FIXME("Failed to parse effect.\n"); goto err_out; @@ -2507,7 +2507,7 @@ static HRESULT d3dx9_effect_compiler_init(struct ID3DXEffectCompilerImpl *compil compiler->base_effect = &object->ID3DXBaseEffect_iface; - return S_OK; + return D3D_OK; err_out:

1 0

Rico Schüller : d3dx9: Start effect parameter parsing.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: master Commit: 9a7720fc1d5f1ab305d84401ff620387aee41bb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a7720fc1d5f1ab305d84401f… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Apr 7 11:06:56 2011 +0200 d3dx9: Start effect parameter parsing. --- dlls/d3dx9_36/effect.c | 205 +++++++++++++++++++++++++++++++++++++++++++++++- include/d3dx9effect.h | 4 + 2 files changed, 208 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index b2cc197..1e3de0c 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -30,6 +30,16 @@ static const struct ID3DXEffectVtbl ID3DXEffect_Vtbl; static const struct ID3DXBaseEffectVtbl ID3DXBaseEffect_Vtbl; static const struct ID3DXEffectCompilerVtbl ID3DXEffectCompiler_Vtbl; +struct d3dx_parameter +{ + struct ID3DXBaseEffectImpl *base; + + UINT annotation_count; + DWORD flags; + + D3DXHANDLE *annotation_handles; +}; + struct ID3DXBaseEffectImpl { ID3DXBaseEffect ID3DXBaseEffect_iface; @@ -39,6 +49,8 @@ struct ID3DXBaseEffectImpl UINT parameter_count; UINT technique_count; + + D3DXHANDLE *parameter_handles; }; struct ID3DXEffectImpl @@ -79,6 +91,56 @@ static void skip_dword_unknown(const char **ptr, unsigned int count) } } +struct d3dx_parameter *get_parameter_struct(D3DXHANDLE handle) +{ + return (struct d3dx_parameter *) handle; +} + +D3DXHANDLE get_parameter_handle(struct d3dx_parameter *parameter) +{ + return (D3DXHANDLE) parameter; +} + +static void free_parameter(D3DXHANDLE handle) +{ + unsigned int i; + struct d3dx_parameter *param = get_parameter_struct(handle); + + TRACE("Free parameter %p\n", param); + + if (!param) + { + return; + } + + if (param->annotation_handles) + { + for (i = 0; i < param->annotation_count; ++i) + { + free_parameter(param->annotation_handles[i]); + } + HeapFree(GetProcessHeap(), 0, param->annotation_handles); + } + + HeapFree(GetProcessHeap(), 0, param); +} + +static void free_base_effect(struct ID3DXBaseEffectImpl *base) +{ + unsigned int i; + + TRACE("Free base effect %p\n", base); + + if (base->parameter_handles) + { + for (i = 0; i < base->parameter_count; ++i) + { + free_parameter(base->parameter_handles[i]); + } + HeapFree(GetProcessHeap(), 0, base->parameter_handles); + } +} + static void free_effect(struct ID3DXEffectImpl *effect) { TRACE("Free effect %p\n", effect); @@ -154,6 +216,7 @@ static ULONG WINAPI ID3DXBaseEffectImpl_Release(ID3DXBaseEffect *iface) if (!ref) { + free_base_effect(This); HeapFree(GetProcessHeap(), 0, This); } @@ -2312,9 +2375,102 @@ static const struct ID3DXEffectCompilerVtbl ID3DXEffectCompiler_Vtbl = ID3DXEffectCompilerImpl_CompileShader, }; +static HRESULT d3dx9_parse_effect_annotation(struct d3dx_parameter *anno, const char *data, const char **ptr) +{ + DWORD offset; + + read_dword(ptr, &offset); + TRACE("Typedef offset: %#x\n", offset); + /* todo: Parse typedef */ + + read_dword(ptr, &offset); + TRACE("Value offset: %#x\n", offset); + /* todo: Parse value */ + + anno->flags &= D3DX_PARAMETER_ANNOTATION; + + return D3D_OK; +} + +static HRESULT d3dx9_parse_effect_parameter(struct d3dx_parameter *param, const char *data, const char **ptr) +{ + DWORD offset; + HRESULT hr; + unsigned int i; + D3DXHANDLE *annotation_handles = NULL; + + read_dword(ptr, &offset); + TRACE("Typedef offset: %#x\n", offset); + /* todo: Parse typedef */ + + read_dword(ptr, &offset); + TRACE("Value offset: %#x\n", offset); + /* todo: Parse value */ + + read_dword(ptr, &param->flags); + TRACE("Flags: %#x\n", param->flags); + + read_dword(ptr, &param->annotation_count); + TRACE("Annotation count: %u\n", param->annotation_count); + + if (param->annotation_count) + { + annotation_handles = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*annotation_handles) * param->annotation_count); + if (!annotation_handles) + { + ERR("Out of memory\n"); + hr = E_OUTOFMEMORY; + goto err_out; + } + + for (i = 0; i < param->annotation_count; ++i) + { + struct d3dx_parameter *annotation; + + annotation = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*annotation)); + if (!annotation) + { + ERR("Out of memory\n"); + hr = E_OUTOFMEMORY; + goto err_out; + } + + annotation_handles[i] = get_parameter_handle(annotation); + annotation->base = param->base; + + hr = d3dx9_parse_effect_annotation(annotation, data, ptr); + if (hr != D3D_OK) + { + WARN("Failed to parse annotation\n"); + goto err_out; + } + } + } + + param->annotation_handles = annotation_handles; + + return D3D_OK; + +err_out: + + if (annotation_handles) + { + for (i = 0; i < param->annotation_count; ++i) + { + free_parameter(annotation_handles[i]); + } + HeapFree(GetProcessHeap(), 0, annotation_handles); + } + + return hr; +} + static HRESULT d3dx9_parse_effect(struct ID3DXBaseEffectImpl *base, const char *data, UINT data_size, DWORD start) { const char *ptr = data + start; + D3DXHANDLE *parameter_handles = NULL; + HRESULT hr; + unsigned int i; read_dword(&ptr, &base->parameter_count); TRACE("Parameter count: %u\n", base->parameter_count); @@ -2324,11 +2480,58 @@ static HRESULT d3dx9_parse_effect(struct ID3DXBaseEffectImpl *base, const char * skip_dword_unknown(&ptr, 2); - /* todo: Parse parameter */ + if (base->parameter_count) + { + parameter_handles = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*parameter_handles) * base->parameter_count); + if (!parameter_handles) + { + ERR("Out of memory\n"); + hr = E_OUTOFMEMORY; + goto err_out; + } + + for (i = 0; i < base->parameter_count; ++i) + { + struct d3dx_parameter *parameter; + + parameter = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*parameter)); + if (!parameter) + { + ERR("Out of memory\n"); + hr = E_OUTOFMEMORY; + goto err_out; + } + + parameter_handles[i] = get_parameter_handle(parameter); + parameter->base = base; + + hr = d3dx9_parse_effect_parameter(parameter, data, &ptr); + if (hr != D3D_OK) + { + WARN("Failed to parse parameter\n"); + goto err_out; + } + } + } /* todo: Parse techniques */ + base->parameter_handles = parameter_handles; + return D3D_OK; + +err_out: + + if (parameter_handles) + { + for (i = 0; i < base->parameter_count; ++i) + { + free_parameter(parameter_handles[i]); + } + HeapFree(GetProcessHeap(), 0, parameter_handles); + } + + return hr; } static HRESULT d3dx9_base_effect_init(struct ID3DXBaseEffectImpl *base, diff --git a/include/d3dx9effect.h b/include/d3dx9effect.h index d014559..e0d1de5 100644 --- a/include/d3dx9effect.h +++ b/include/d3dx9effect.h @@ -21,6 +21,10 @@ #ifndef __D3DX9EFFECT_H__ #define __D3DX9EFFECT_H__ +#define D3DX_PARAMETER_SHARED 1 +#define D3DX_PARAMETER_LITERAL 2 +#define D3DX_PARAMETER_ANNOTATION 4 + typedef struct _D3DXEFFECT_DESC { LPCSTR Creator; UINT Parameters;

1 0