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

Ken Sharp : winedbg: Correct slight typo in winedbg dialog.
by Alexandre Julliard 24 Apr '09

24 Apr '09

Module: wine Branch: master Commit: 3ab52c209733efd7eb3892ddf91af648b844dd31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ab52c209733efd7eb3892ddf… Author: Ken Sharp <kennybobs(a)o2.co.uk> Date: Fri Apr 24 01:39:42 2009 +0100 winedbg: Correct slight typo in winedbg dialog. --- programs/winedbg/rsrc_En.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/rsrc_En.rc b/programs/winedbg/rsrc_En.rc index f50e51b..3d580c4 100644 --- a/programs/winedbg/rsrc_En.rc +++ b/programs/winedbg/rsrc_En.rc @@ -38,7 +38,7 @@ BEGIN to close. We are sorry for the inconvenience.", IDC_STATIC_TXT1,27,10,224,30 LTEXT "This can be caused by a problem in the program or a deficiency in Wine. \ - You may want to check http:/*appdb.winehq.org for tips about running \ + You may want to check http://appdb.winehq.org for tips about running \ this application.\n\n\ If this problem is not present under Windows and has not been reported \ yet, you can report it at http://bugs.winehq.org.",IDC_STATIC_TXT2,27,60,224,100

1 0

David Adam : wined3d: SetDepthStencilSurface is always called when AutoDepthStencil is enabled.
by Alexandre Julliard 24 Apr '09

24 Apr '09

Module: wine Branch: master Commit: 33eb939390e8782c7512a174bd0b210aa3b896a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33eb939390e8782c7512a174b… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Thu Apr 23 08:33:21 2009 +0200 wined3d: SetDepthStencilSurface is always called when AutoDepthStencil is enabled. --- dlls/d3d8/tests/device.c | 6 +++--- dlls/d3d9/tests/device.c | 6 +++--- dlls/wined3d/device.c | 21 +++++++++++++++++++-- 3 files changed, 25 insertions(+), 8 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 6f410fd..0cd741d 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -1388,13 +1388,13 @@ static void test_depth_stencil_reset(void) present_parameters.AutoDepthStencilFormat = D3DFMT_D24S8; hr = IDirect3DDevice8_Reset(device, &present_parameters); - todo_wine ok(hr == D3D_OK, "IDirect3DDevice8_Reset failed with 0x%08x\n", hr); + ok(hr == D3D_OK, "IDirect3DDevice8_Reset failed with 0x%08x\n", hr); if (FAILED(hr)) goto cleanup; hr = IDirect3DDevice8_GetDepthStencilSurface(device, &surface); - todo_wine ok(hr == D3D_OK, "GetDepthStencilSurface failed with 0x%08x\n", hr); - todo_wine ok(surface != NULL, "Depth stencil should not be NULL\n"); + ok(hr == D3D_OK, "GetDepthStencilSurface failed with 0x%08x\n", hr); + ok(surface != NULL, "Depth stencil should not be NULL\n"); if (surface) IDirect3DSurface8_Release(surface); cleanup: diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index fe4318e..2f5bbc8 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -1079,13 +1079,13 @@ static void test_reset(void) d3dpp.AutoDepthStencilFormat = D3DFMT_D24S8; hr = IDirect3DDevice9_Reset(pDevice, &d3dpp); - todo_wine ok(hr == D3D_OK, "IDirect3DDevice9_Reset failed with 0x%08x\n", hr); + ok(hr == D3D_OK, "IDirect3DDevice9_Reset failed with 0x%08x\n", hr); if (FAILED(hr)) goto cleanup; hr = IDirect3DDevice9_GetDepthStencilSurface(pDevice, &surface); - todo_wine ok(hr == D3D_OK, "GetDepthStencilSurface failed with 0x%08x\n", hr); - todo_wine ok(surface != NULL, "Depth stencil should not be NULL\n"); + ok(hr == D3D_OK, "GetDepthStencilSurface failed with 0x%08x\n", hr); + ok(surface != NULL, "Depth stencil should not be NULL\n"); if (surface) IDirect3DSurface9_Release(surface); cleanup: diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 90940f8..253afa8 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -7612,8 +7612,25 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice* iface, WINED3DPRE ERR("Cannot change the device window yet\n"); } if (pPresentationParameters->EnableAutoDepthStencil && !This->auto_depth_stencil_buffer) { - WARN("Auto depth stencil enabled, but no auto depth stencil present, returning WINED3DERR_INVALIDCALL\n"); - return WINED3DERR_INVALIDCALL; + HRESULT hrc; + + TRACE("Creating the depth stencil buffer\n"); + + hrc = IWineD3DDeviceParent_CreateDepthStencilSurface(This->device_parent, + This->parent, + pPresentationParameters->BackBufferWidth, + pPresentationParameters->BackBufferHeight, + pPresentationParameters->AutoDepthStencilFormat, + pPresentationParameters->MultiSampleType, + pPresentationParameters->MultiSampleQuality, + FALSE, + &This->auto_depth_stencil_buffer); + + if (FAILED(hrc)) { + ERR("Failed to create the depth stencil buffer\n"); + IWineD3DSwapChain_Release((IWineD3DSwapChain *) swapchain); + return WINED3DERR_INVALIDCALL; + } } /* Reset the depth stencil */

1 0

Aric Stewart : ole32: CoGetTreatAsClass should return S_FALSE if it cannot even find the key for the requested CLSID .
by Alexandre Julliard 24 Apr '09

24 Apr '09

Module: wine Branch: master Commit: 46da8ef18b1337bee05569d3b9b59ea496848418 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46da8ef18b1337bee05569d3b… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Apr 23 10:19:33 2009 -0500 ole32: CoGetTreatAsClass should return S_FALSE if it cannot even find the key for the requested CLSID. --- dlls/ole32/compobj.c | 3 +++ dlls/ole32/tests/compobj.c | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 3eb0182..4a57009 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -2922,7 +2922,10 @@ HRESULT WINAPI CoGetTreatAsClass(REFCLSID clsidOld, LPCLSID clsidNew) res = COM_OpenKeyForCLSID(clsidOld, wszTreatAs, KEY_READ, &hkey); if (FAILED(res)) + { + res = S_FALSE; goto done; + } if (RegQueryValueW(hkey, NULL, szClsidNew, &len)) { res = S_FALSE; diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index a332d27..d0c6281 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -38,6 +38,7 @@ HRESULT (WINAPI * pCoInitializeEx)(LPVOID lpReserved, DWORD dwCoInit); HRESULT (WINAPI * pCoGetObjectContext)(REFIID riid, LPVOID *ppv); HRESULT (WINAPI * pCoSwitchCallContext)(IUnknown *pObject, IUnknown **ppOldObject); +HRESULT (WINAPI * pCoGetTreatAsClass)(REFCLSID clsidOld, LPCLSID pClsidNew); #define ok_ole_success(hr, func) ok(hr == S_OK, func " failed with error 0x%08x\n", hr) #define ok_more_than_one_lock() ok(cLocks > 0, "Number of locks should be > 0, but actually is %d\n", cLocks) @@ -1141,6 +1142,22 @@ static void test_CoGetCallContext(void) CoUninitialize(); } +static void test_CoGetTreatAsClass(void) +{ + HRESULT hr; + CLSID out; + static GUID deadbeef = {0xdeadbeef,0xdead,0xbeef,{0xde,0xad,0xbe,0xef,0xde,0xad,0xbe,0xef}}; + + if (!pCoGetTreatAsClass) + { + win_skip("CoGetTreatAsClass not present\n"); + return; + } + hr = pCoGetTreatAsClass(&deadbeef,&out); + ok (hr == S_FALSE, "expected S_FALSE got %x\n",hr); + ok (IsEqualGUID(&out,&deadbeef), "expected to get same clsid back\n"); +} + static void test_CoInitializeEx(void) { HRESULT hr; @@ -1167,6 +1184,7 @@ START_TEST(compobj) HMODULE hOle32 = GetModuleHandle("ole32"); pCoGetObjectContext = (void*)GetProcAddress(hOle32, "CoGetObjectContext"); pCoSwitchCallContext = (void*)GetProcAddress(hOle32, "CoSwitchCallContext"); + pCoGetTreatAsClass = (void*)GetProcAddress(hOle32,"CoGetTreatAsClass"); if (!(pCoInitializeEx = (void*)GetProcAddress(hOle32, "CoInitializeEx"))) { trace("You need DCOM95 installed to run this test\n"); @@ -1192,5 +1210,6 @@ START_TEST(compobj) test_CoFreeUnusedLibraries(); test_CoGetObjectContext(); test_CoGetCallContext(); + test_CoGetTreatAsClass(); test_CoInitializeEx(); }

1 0

Aric Stewart : msctf/tests: Use ITfInputProcessorProfiles:: GetCurrentLanguage to get gLangid.
by Alexandre Julliard 24 Apr '09

24 Apr '09

Module: wine Branch: master Commit: 32924bd662450304c9e1d8503582987980007cbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=32924bd662450304c9e1d8503… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Apr 23 16:35:25 2009 -0500 msctf/tests: Use ITfInputProcessorProfiles::GetCurrentLanguage to get gLangid. --- dlls/msctf/tests/inputprocessor.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 3556922..ba6d1ee 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -105,6 +105,10 @@ static void test_Register(void) static const WCHAR szDesc[] = {'F','a','k','e',' ','W','i','n','e',' ','S','e','r','v','i','c','e',0}; static const WCHAR szFile[] = {'F','a','k','e',' ','W','i','n','e',' ','S','e','r','v','i','c','e',' ','F','i','l','e',0}; + hr = ITfInputProcessorProfiles_GetCurrentLanguage(g_ipp,&gLangid); + ok(SUCCEEDED(hr),"Unable to get current language id\n"); + trace("Current Language %x\n",gLangid); + hr = RegisterTextService(&CLSID_FakeService); ok(SUCCEEDED(hr),"Unable to register COM for TextService\n"); hr = ITfInputProcessorProfiles_Register(g_ipp, &CLSID_FakeService); @@ -609,7 +613,6 @@ START_TEST(inputprocessor) { if (SUCCEEDED(initialize())) { - gLangid = GetUserDefaultLCID(); test_Register(); test_RegisterCategory(); test_EnumInputProcessorInfo();

1 0

Austin English : ole32: Rename a macro to prevent a conflict on NetBSD.
by Alexandre Julliard 24 Apr '09

24 Apr '09

Module: wine Branch: master Commit: 2fe86fb7cd9cac04e6ba5e555f6c8d10107f6575 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fe86fb7cd9cac04e6ba5e555… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Apr 23 11:17:49 2009 -0500 ole32: Rename a macro to prevent a conflict on NetBSD. --- dlls/ole32/stg_prop.c | 2 +- dlls/ole32/storage32.c | 6 +++--- dlls/ole32/storage32.h | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index 4b1c9c5..381e079 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -967,7 +967,7 @@ static void PropertyStorage_PropertyDestroy(void *k, void *d, void *extra) #ifdef WORDS_BIGENDIAN /* Swaps each character in str to or from little endian; assumes the conversion - * is symmetric, that is, that le16toh is equivalent to htole16. + * is symmetric, that is, that lendian16toh is equivalent to htole16. */ static void PropertyStorage_ByteSwapString(LPWSTR str, size_t len) { diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 2111b90..90328f0 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -3472,7 +3472,7 @@ static BOOL StorageImpl_ReadDWordFromBigBlock( ulOffset.u.LowPart += offset; StorageImpl_ReadAt(This, ulOffset, &tmp, sizeof(DWORD), &read); - *value = le32toh(tmp); + *value = lendian32toh(tmp); return (read == sizeof(DWORD)); } @@ -4250,7 +4250,7 @@ void StorageUtl_ReadWord(const BYTE* buffer, ULONG offset, WORD* value) WORD tmp; memcpy(&tmp, buffer+offset, sizeof(WORD)); - *value = le16toh(tmp); + *value = lendian16toh(tmp); } void StorageUtl_WriteWord(BYTE* buffer, ULONG offset, WORD value) @@ -4264,7 +4264,7 @@ void StorageUtl_ReadDWord(const BYTE* buffer, ULONG offset, DWORD* value) DWORD tmp; memcpy(&tmp, buffer+offset, sizeof(DWORD)); - *value = le32toh(tmp); + *value = lendian32toh(tmp); } void StorageUtl_WriteDWord(BYTE* buffer, ULONG offset, DWORD value) diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index 1e40b3a..1e42afb 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -376,15 +376,15 @@ StgStreamImpl* StgStreamImpl_Construct( #define htole32(x) RtlUlongByteSwap(x) #define htole16(x) RtlUshortByteSwap(x) -#define le32toh(x) RtlUlongByteSwap(x) -#define le16toh(x) RtlUshortByteSwap(x) +#define lendian32toh(x) RtlUlongByteSwap(x) +#define lendian16toh(x) RtlUshortByteSwap(x) #else #define htole32(x) (x) #define htole16(x) (x) -#define le32toh(x) (x) -#define le16toh(x) (x) +#define lendian32toh(x) (x) +#define lendian16toh(x) (x) #endif

1 0

Juan Lang : crypt32: Fix a test failure on Windows 98.
by Alexandre Julliard 24 Apr '09

24 Apr '09

Module: wine Branch: master Commit: 9b56e5013ef866dd0149bf08540ddda24a3115c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b56e5013ef866dd0149bf085… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Apr 23 09:41:43 2009 -0700 crypt32: Fix a test failure on Windows 98. --- dlls/crypt32/tests/msg.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 66b09f3..8ab5625 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -3153,8 +3153,8 @@ static void test_msg_get_and_verify_signer(void) ret = CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING, v1CertWithValidPubKey, sizeof(v1CertWithValidPubKey), CERT_STORE_ADD_ALWAYS, NULL); - ok(ret, "CertAddEncodedCertificateToStore failed: 0x%08x\n", - GetLastError()); + ok(ret || broken(GetLastError() == OSS_DATA_ERROR /* Win98 */), + "CertAddEncodedCertificateToStore failed: 0x%08x\n", GetLastError()); /* Specifying CMSG_TRUSTED_SIGNER_FLAG with a cert store that contains * the signer succeeds. */

1 0

Dylan Smith : richedit: Null terminate streamed out rich text.
by Alexandre Julliard 24 Apr '09

24 Apr '09

Module: wine Branch: master Commit: 234f167d9d5c4274ff4f4fdaa0ed8e30db0e4e10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=234f167d9d5c4274ff4f4fdaa… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Fri Apr 24 03:25:46 2009 -0400 richedit: Null terminate streamed out rich text. --- dlls/riched20/writer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index d1d9990..b6c3ed6 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -904,7 +904,7 @@ ME_StreamOutRTF(ME_TextEditor *editor, ME_OutStream *pStream, int nStart, int nC break; p = ME_FindItemFwd(p, diRunOrParagraphOrEnd); } - if (!ME_StreamOutPrint(pStream, "}")) + if (!ME_StreamOutMove(pStream, "}\0", 2)) return FALSE; return TRUE; }

1 0

Henri Verbeet : wined3d: Handle the opcode specific control shift in the frontend rather than the backend .
by Alexandre Julliard 24 Apr '09

24 Apr '09

Module: wine Branch: master Commit: 35499d0c3ca77963111f9542288bf7519cb6e559 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35499d0c3ca77963111f95422… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 24 09:17:58 2009 +0200 wined3d: Handle the opcode specific control shift in the frontend rather than the backend. --- dlls/wined3d/baseshader.c | 6 +++--- dlls/wined3d/glsl_shader.c | 3 +-- dlls/wined3d/wined3d_private.h | 4 ---- dlls/wined3d/wined3d_private_types.h | 4 ++-- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index d4da80b..1cb5a12 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -967,7 +967,7 @@ void shader_generate_main(IWineD3DBaseShader *iface, SHADER_BUFFER* buffer, } ins.handler_idx = curOpcode->handler_idx; - ins.flags = opcode_token & WINED3D_OPCODESPECIFICCONTROL_MASK; + ins.flags = (opcode_token & WINED3D_OPCODESPECIFICCONTROL_MASK) >> WINED3D_OPCODESPECIFICCONTROL_SHIFT; ins.coissue = opcode_token & WINED3DSI_COISSUE; /* Destination token */ @@ -1146,7 +1146,7 @@ void shader_trace_init(const DWORD *pFunction, const SHADER_OPCODE *opcode_table if (curOpcode->opcode == WINED3DSIO_IFC || curOpcode->opcode == WINED3DSIO_BREAKC) { - DWORD op = (opcode_token & INST_CONTROLS_MASK) >> INST_CONTROLS_SHIFT; + DWORD op = (opcode_token & WINED3D_OPCODESPECIFICCONTROL_MASK) >> WINED3D_OPCODESPECIFICCONTROL_SHIFT; switch (op) { @@ -1161,7 +1161,7 @@ void shader_trace_init(const DWORD *pFunction, const SHADER_OPCODE *opcode_table } else if (curOpcode->opcode == WINED3DSIO_TEX && shader_version >= WINED3DPS_VERSION(2,0) - && (opcode_token & WINED3DSI_TEXLD_PROJECT)) + && (opcode_token & (WINED3DSI_TEXLD_PROJECT << WINED3D_OPCODESPECIFICCONTROL_SHIFT))) { TRACE("p"); } diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index dcb0763..35adc50 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1351,9 +1351,8 @@ void shader_glsl_add_instruction_modifiers(const struct wined3d_shader_instructi } } -static inline const char *shader_get_comp_op(DWORD flags) +static inline const char *shader_get_comp_op(DWORD op) { - DWORD op = (flags & INST_CONTROLS_MASK) >> INST_CONTROLS_SHIFT; switch (op) { case COMPARISON_GT: return ">"; case COMPARISON_EQ: return "=="; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 50e0dac..ab61630 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2253,10 +2253,6 @@ typedef struct local_constant { DWORD value[4]; } local_constant; -/* Undocumented opcode controls */ -#define INST_CONTROLS_SHIFT 16 -#define INST_CONTROLS_MASK 0x00ff0000 - typedef enum COMPARISON_TYPE { COMPARISON_GT = 1, COMPARISON_EQ = 2, diff --git a/dlls/wined3d/wined3d_private_types.h b/dlls/wined3d/wined3d_private_types.h index 379f3f3..9f62a9c 100644 --- a/dlls/wined3d/wined3d_private_types.h +++ b/dlls/wined3d/wined3d_private_types.h @@ -213,8 +213,8 @@ typedef enum _WINED3DSHADER_INSTRUCTION_OPCODE_TYPE { } WINED3DSHADER_INSTRUCTION_OPCODE_TYPE; /* Undocumented opcode control to identify projective texture lookups in ps 2.0 and later */ -#define WINED3DSI_TEXLD_PROJECT 0x00010000 -#define WINED3DSI_TEXLD_BIAS 0x00020000 +#define WINED3DSI_TEXLD_PROJECT 1 +#define WINED3DSI_TEXLD_BIAS 2 /** Shader version tokens, and shader end tokens **/

1 0

Henri Verbeet : wined3d: Use a more reasonable limit for the number of mipmap levels.
by Alexandre Julliard 24 Apr '09

24 Apr '09

Module: wine Branch: master Commit: 2dcfdd5b553fa124dbc3e7c5ad8d293329283268 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2dcfdd5b553fa124dbc3e7c5a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 24 09:17:58 2009 +0200 wined3d: Use a more reasonable limit for the number of mipmap levels. 256 is quite ridiculous, considering the dimensions are only UINTs. Perhaps these arrays should be dynamically allocated in the first place though. --- dlls/wined3d/wined3d_private.h | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ab61630..65640b3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -167,7 +167,6 @@ void hash_table_remove(struct hash_table_t *table, void *key); #define MAX_COMBINED_SAMPLERS (MAX_FRAGMENT_SAMPLERS + MAX_VERTEX_SAMPLERS) #define MAX_ACTIVE_LIGHTS 8 #define MAX_CLIPPLANES WINED3DMAXUSERCLIPPLANES -#define MAX_LEVELS 256 #define MAX_CONST_I 16 #define MAX_CONST_B 16 @@ -634,8 +633,7 @@ extern int num_lock; /* DirectX Device Limits */ /* --------------------- */ -#define MAX_LEVELS 256 /* Maximum number of mipmap levels. Guessed at 256 */ - +#define MAX_MIP_LEVELS 32 /* Maximum number of mipmap levels. */ #define MAX_STREAMS 16 /* Maximum possible streams - used for fixed size arrays See MaxStreams in MSDN under GetDeviceCaps */ #define HIGHEST_TRANSFORMSTATE WINED3DTS_WORLDMATRIX(255) /* Highest value in WINED3DTRANSFORMSTATETYPE */ @@ -1519,7 +1517,7 @@ typedef struct IWineD3DTextureImpl IWineD3DBaseTextureClass baseTexture; /* IWineD3DTexture */ - IWineD3DSurface *surfaces[MAX_LEVELS]; + IWineD3DSurface *surfaces[MAX_MIP_LEVELS]; UINT target; BOOL cond_np2; @@ -1538,7 +1536,7 @@ typedef struct IWineD3DCubeTextureImpl IWineD3DBaseTextureClass baseTexture; /* IWineD3DCubeTexture */ - IWineD3DSurface *surfaces[6][MAX_LEVELS]; + IWineD3DSurface *surfaces[6][MAX_MIP_LEVELS]; } IWineD3DCubeTextureImpl; extern const IWineD3DCubeTextureVtbl IWineD3DCubeTexture_Vtbl; @@ -1584,7 +1582,7 @@ typedef struct IWineD3DVolumeTextureImpl IWineD3DBaseTextureClass baseTexture; /* IWineD3DVolumeTexture */ - IWineD3DVolume *volumes[MAX_LEVELS]; + IWineD3DVolume *volumes[MAX_MIP_LEVELS]; } IWineD3DVolumeTextureImpl; extern const IWineD3DVolumeTextureVtbl IWineD3DVolumeTexture_Vtbl;

1 0

Henri Verbeet : wined3d: The first shader token should be the version token .
by Alexandre Julliard 24 Apr '09

24 Apr '09

Module: wine Branch: master Commit: e63bd2ce21ba7b2f5fc254209e19124a07eb97fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=e63bd2ce21ba7b2f5fc254209… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 24 09:17:58 2009 +0200 wined3d: The first shader token should be the version token. --- dlls/wined3d/baseshader.c | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 1cb5a12..a7c2a50 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -911,17 +911,16 @@ void shader_generate_main(IWineD3DBaseShader *iface, SHADER_BUFFER* buffer, ins.src = src_param; This->baseShader.parse_state.current_row = 0; + if (!shader_is_version_token(*pToken++)) + { + ERR("First token is not a version token, invalid shader.\n"); + return; + } + while (WINED3DPS_END() != *pToken) { DWORD opcode_token; - /* Skip version token */ - if (shader_is_version_token(*pToken)) - { - ++pToken; - continue; - } - /* Skip comment tokens */ if (shader_is_comment(*pToken)) {

1 0