wine-commits April 2009

wine-commits@winehq.org

2 participants
664 discussions

Nicolas Le Cam : msi: Fix ACTION_AppSearchDr on empty path.
by Alexandre Julliard 23 Apr '09

23 Apr '09

Module: wine Branch: master Commit: b91fc465ff493f31238696c7e829b688c8cdf92c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b91fc465ff493f31238696c7e… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Tue Apr 21 02:11:23 2009 +0200 msi: Fix ACTION_AppSearchDr on empty path. --- dlls/msi/appsearch.c | 7 +++++-- dlls/msi/tests/package.c | 1 - 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index ff54be0..9cc1592 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -969,7 +969,10 @@ static UINT ACTION_AppSearchDr(MSIPACKAGE *package, LPWSTR *appValue, MSISIGNATU else depth = MSI_RecordGetInteger(row,4); - ACTION_ExpandAnyPath(package, path, expanded, MAX_PATH); + if (sz) + ACTION_ExpandAnyPath(package, path, expanded, MAX_PATH); + else + strcpyW(expanded, path); if (parent) { @@ -984,7 +987,7 @@ static UINT ACTION_AppSearchDr(MSIPACKAGE *package, LPWSTR *appValue, MSISIGNATU strcpyW(path, parent); strcatW(path, expanded); } - else + else if (sz) strcpyW(path, expanded); PathAddBackslashW(path); diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 8766260..12127ee 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -8818,7 +8818,6 @@ static void test_appsearch_drlocator(void) search_absolute_directory(path, ""); r = MsiGetPropertyA(hpkg, "SIGPROP11", prop, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine ok(!lstrcmpA(prop, path), "Expected \"%s\", got \"%s\"\n", path, prop); DeleteFileA("FileName1");

1 0

Nicolas Le Cam : msi/tests: Add empty dir test for the DrLocator part of the AppSearch action.
by Alexandre Julliard 23 Apr '09

23 Apr '09

Module: wine Branch: master Commit: 34202629c92f3a723fd85d7b5f6591beecaa264c URL: http://source.winehq.org/git/wine.git/?a=commit;h=34202629c92f3a723fd85d7b5… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Tue Apr 21 02:09:24 2009 +0200 msi/tests: Add empty dir test for the DrLocator part of the AppSearch action. --- dlls/msi/tests/package.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 51 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index c5c3b67..8766260 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -8555,6 +8555,42 @@ static void test_appsearch_inilocator(void) DeleteFileA(msifile); } +/* + * MSI AppSearch action on DrLocator table always returns absolute paths. + * If a relative path was set, it returns the first absolute path that + * matches or an empty string if it didn't find anything. + * This helper function replicates this behaviour. + */ +static void search_absolute_directory(LPSTR absolute, LPCSTR relative) +{ + int i, size; + DWORD attr, drives; + + size = lstrlenA(relative); + drives = GetLogicalDrives(); + lstrcpyA(absolute, "A:\\"); + for (i = 0; i < 26; absolute[0] = '\0', i++) + { + if (!(drives & (1 << i))) + continue; + + absolute[0] = 'A' + i; + if (GetDriveType(absolute) != DRIVE_FIXED) + continue; + + lstrcpynA(absolute + 3, relative, size + 1); + attr = GetFileAttributesA(absolute); + if (attr != INVALID_FILE_ATTRIBUTES && + (attr & FILE_ATTRIBUTE_DIRECTORY)) + { + if (absolute[3 + size - 1] != '\\') + lstrcatA(absolute, "\\"); + break; + } + absolute[3] = '\0'; + } +} + static void test_appsearch_drlocator(void) { MSIHANDLE hpkg, hdb; @@ -8617,6 +8653,9 @@ static void test_appsearch_drlocator(void) r = add_appsearch_entry(hdb, "'SIGPROP10', 'NewSignature10'"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + r = add_appsearch_entry(hdb, "'SIGPROP11', 'NewSignature11'"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + r = create_drlocator_table(hdb); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); @@ -8670,6 +8709,11 @@ static void test_appsearch_drlocator(void) r = add_drlocator_entry(hdb, path); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + /* no parent, relative empty path, depth 0, no signature */ + sprintf(path, "'NewSignature11', '', '', 0"); + r = add_drlocator_entry(hdb, path); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + r = create_signature_table(hdb); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); @@ -8770,6 +8814,13 @@ static void test_appsearch_drlocator(void) ok(!lstrcmpA(prop, ""), "Expected \"\", got \"%s\"\n", prop); } + size = MAX_PATH; + search_absolute_directory(path, ""); + r = MsiGetPropertyA(hpkg, "SIGPROP11", prop, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + todo_wine + ok(!lstrcmpA(prop, path), "Expected \"%s\", got \"%s\"\n", path, prop); + DeleteFileA("FileName1"); DeleteFileA("FileName3.dll"); DeleteFileA("FileName4.dll");

1 0

Nicolas Le Cam : msi: Enfore use of GetFileAttributes return value.
by Alexandre Julliard 23 Apr '09

23 Apr '09

Module: wine Branch: master Commit: 03afdb0217068d3fb8869ccfce5f60cbcd3f0a45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03afdb0217068d3fb8869ccfc… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Tue Apr 21 02:08:31 2009 +0200 msi: Enfore use of GetFileAttributes return value. --- dlls/msi/appsearch.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index 18a031c..ff54be0 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -178,7 +178,8 @@ static LPWSTR app_search_file(LPWSTR path, MSISIGNATURE *sig) } attr = GetFileAttributesW(path); - if (attr == INVALID_FILE_ATTRIBUTES || attr == FILE_ATTRIBUTE_DIRECTORY) + if (attr == INVALID_FILE_ATTRIBUTES || + (attr & FILE_ATTRIBUTE_DIRECTORY)) return NULL; size = GetFileVersionInfoSizeW(path, &handle); @@ -298,7 +299,8 @@ static UINT ACTION_AppSearchComponents(MSIPACKAGE *package, LPWSTR *appValue, MS lstrcatW(path, MSI_RecordGetString(rec, 2)); attr = GetFileAttributesW(path); - if (attr != INVALID_FILE_ATTRIBUTES && attr != FILE_ATTRIBUTE_DIRECTORY) + if (attr != INVALID_FILE_ATTRIBUTES && + !(attr & FILE_ATTRIBUTE_DIRECTORY)) *appValue = strdupW(path); } @@ -901,7 +903,8 @@ static UINT ACTION_SearchDirectory(MSIPACKAGE *package, MSISIGNATURE *sig, } attr = GetFileAttributesW(val); - if ((attr & FILE_ATTRIBUTE_DIRECTORY) && + if (attr != INVALID_FILE_ATTRIBUTES && + (attr & FILE_ATTRIBUTE_DIRECTORY) && val && val[lstrlenW(val) - 1] != '\\') { val = msi_realloc(val, (lstrlenW(val) + 2) * sizeof(WCHAR)); @@ -933,7 +936,7 @@ static UINT ACTION_AppSearchDr(MSIPACKAGE *package, LPWSTR *appValue, MSISIGNATU WCHAR expanded[MAX_PATH]; MSIRECORD *row; int depth; - DWORD sz; + DWORD sz, attr; UINT rc; TRACE("%s\n", debugstr_w(sig->Name)); @@ -970,7 +973,9 @@ static UINT ACTION_AppSearchDr(MSIPACKAGE *package, LPWSTR *appValue, MSISIGNATU if (parent) { - if (!(GetFileAttributesW(parent) & FILE_ATTRIBUTE_DIRECTORY)) + attr = GetFileAttributesW(parent); + if (attr != INVALID_FILE_ATTRIBUTES && + !(attr & FILE_ATTRIBUTE_DIRECTORY)) { PathRemoveFileSpecW(parent); PathAddBackslashW(parent);

1 0

Huw Davies : ole32/tests: For win9x and winme the size of the data on the clipboard may be larger than expected .
by Alexandre Julliard 23 Apr '09

23 Apr '09

Module: wine Branch: master Commit: 11cb788f354e0787920120c5c463aa7881a5466c URL: http://source.winehq.org/git/wine.git/?a=commit;h=11cb788f354e0787920120c5c… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 23 10:52:16 2009 +0100 ole32/tests: For win9x and winme the size of the data on the clipboard may be larger than expected. --- dlls/ole32/tests/clipboard.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index a64fa23..a4f9307 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -767,8 +767,10 @@ static void test_cf_dataobject(IDataObject *data) ok(DataObjectImpl_GetDataHere_calls == 1, "got %d\n", DataObjectImpl_GetDataHere_calls); ptr = GlobalLock(h); size = GlobalSize(h); - ok(size == strlen(cmpl_stm_data), "expected %d got %d\n", lstrlenA(cmpl_stm_data), size); - ok(!memcmp(ptr, cmpl_stm_data, size), "mismatch\n"); + ok(size == strlen(cmpl_stm_data) || + broken(size > strlen(cmpl_stm_data)), /* win9x, winme */ + "expected %d got %d\n", lstrlenA(cmpl_stm_data), size); + ok(!memcmp(ptr, cmpl_stm_data, strlen(cmpl_stm_data)), "mismatch\n"); GlobalUnlock(h); } else if(cf == cf_global) @@ -782,8 +784,10 @@ static void test_cf_dataobject(IDataObject *data) ok(DataObjectImpl_GetDataHere_calls == 0, "got %d\n", DataObjectImpl_GetDataHere_calls); ptr = GlobalLock(h); size = GlobalSize(h); - ok(size == strlen(cmpl_text_data) + 1, "expected %d got %d\n", lstrlenA(cmpl_text_data) + 1, size); - ok(!memcmp(ptr, cmpl_text_data, size), "mismatch\n"); + ok(size == strlen(cmpl_text_data) + 1 || + broken(size > strlen(cmpl_text_data) + 1), /* win9x, winme */ + "expected %d got %d\n", lstrlenA(cmpl_text_data) + 1, size); + ok(!memcmp(ptr, cmpl_text_data, strlen(cmpl_text_data) + 1), "mismatch\n"); GlobalUnlock(h); } } while(cf);

1 0

Nikolay Sivov : comctl32/tests: Remove tests failing on most platforms.
by Alexandre Julliard 23 Apr '09

23 Apr '09

Module: wine Branch: master Commit: 946936c2742849e77d71f3d566afedfab60ec183 URL: http://source.winehq.org/git/wine.git/?a=commit;h=946936c2742849e77d71f3d56… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Apr 23 11:51:41 2009 +0400 comctl32/tests: Remove tests failing on most platforms. --- dlls/comctl32/tests/listview.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 61dca76..6482c74 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -994,11 +994,6 @@ static void test_create(void) ok(!IsWindow(hHeader), "Header shouldn't be created\n"); ok(NULL == GetDlgItem(hList, 0), "NULL dialog item expected\n"); - expect(0, rect.left); - expect(0, rect.right); - expect(0, rect.top); - expect(0, rect.bottom); - DestroyWindow(hList); }

1 0

Henri Verbeet : wined3d: Get rid of the shared_handle parameter.
by Alexandre Julliard 23 Apr '09

23 Apr '09

Module: wine Branch: master Commit: 6f33b97c947935d051916fedb5f23eb80cd5583f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f33b97c947935d051916fedb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 23 09:24:27 2009 +0200 wined3d: Get rid of the shared_handle parameter. I don't expect us to support this in the near future, and right now it's just dead code. --- dlls/d3d10core/device.c | 2 +- dlls/d3d8/device.c | 18 ++++++++---------- dlls/d3d9/cubetexture.c | 3 +-- dlls/d3d9/device.c | 6 +++--- dlls/d3d9/indexbuffer.c | 3 +-- dlls/d3d9/texture.c | 2 +- dlls/d3d9/vertexbuffer.c | 3 +-- dlls/d3d9/volumetexture.c | 4 ++-- dlls/ddraw/ddraw.c | 43 +++++++++---------------------------------- dlls/ddraw/direct3d.c | 14 +++++--------- dlls/wined3d/device.c | 43 ++++++++++++++++++++++--------------------- dlls/wined3d/surface_base.c | 21 +++++---------------- include/wine/wined3d.idl | 7 ------- 13 files changed, 59 insertions(+), 110 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6f33b97c947935d051916…

1 0

Henri Verbeet : wined3d: Downgrade an ERR to a WARN.
by Alexandre Julliard 23 Apr '09

23 Apr '09

Module: wine Branch: master Commit: f88bd17ef6546be5b8129a0fd48e0bad028161d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f88bd17ef6546be5b8129a0fd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 23 09:24:26 2009 +0200 wined3d: Downgrade an ERR to a WARN. --- dlls/wined3d/surface_gdi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface_gdi.c b/dlls/wined3d/surface_gdi.c index 0ed350e..0ad65e0 100644 --- a/dlls/wined3d/surface_gdi.c +++ b/dlls/wined3d/surface_gdi.c @@ -130,7 +130,7 @@ IWineGDISurfaceImpl_LockRect(IWineD3DSurface *iface, /* Already locked? */ if(This->Flags & SFLAG_LOCKED) { - ERR("(%p) Surface already locked\n", This); + WARN("(%p) Surface already locked\n", This); /* What should I return here? */ return WINED3DERR_INVALIDCALL; }

1 0

Henri Verbeet : wined3d: Move frontend specfic constants to baseshader.c.
by Alexandre Julliard 23 Apr '09

23 Apr '09

Module: wine Branch: master Commit: fba6f871cfafb093c640718d923c19d1a1fa8a3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fba6f871cfafb093c640718d9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 23 09:24:26 2009 +0200 wined3d: Move frontend specfic constants to baseshader.c. --- dlls/wined3d/baseshader.c | 58 ++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private_types.h | 57 --------------------------------- 2 files changed, 58 insertions(+), 57 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 6380b5d..d4da80b 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -32,6 +32,64 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); WINE_DECLARE_DEBUG_CHANNEL(d3d); +/* DCL usage masks */ +#define WINED3DSP_DCL_USAGE_SHIFT 0 +#define WINED3DSP_DCL_USAGE_MASK (0xf << WINED3DSP_DCL_USAGE_SHIFT) +#define WINED3DSP_DCL_USAGEINDEX_SHIFT 16 +#define WINED3DSP_DCL_USAGEINDEX_MASK (0xf << WINED3DSP_DCL_USAGEINDEX_SHIFT) + +/* Opcode-related masks */ +#define WINED3DSI_OPCODE_MASK 0x0000ffff + +#define WINED3D_OPCODESPECIFICCONTROL_SHIFT 16 +#define WINED3D_OPCODESPECIFICCONTROL_MASK (0xff << WINED3D_OPCODESPECIFICCONTROL_SHIFT) + +#define WINED3DSI_INSTLENGTH_SHIFT 24 +#define WINED3DSI_INSTLENGTH_MASK (0xf << WINED3DSI_INSTLENGTH_SHIFT) + +#define WINED3DSI_COISSUE (1 << 30) + +#define WINED3DSI_COMMENTSIZE_SHIFT 16 +#define WINED3DSI_COMMENTSIZE_MASK (0x7fff << WINED3DSI_COMMENTSIZE_SHIFT) + +#define WINED3DSHADER_INSTRUCTION_PREDICATED (1 << 28) + +/* Register number mask */ +#define WINED3DSP_REGNUM_MASK 0x000007ff + +/* Register type masks */ +#define WINED3DSP_REGTYPE_SHIFT 28 +#define WINED3DSP_REGTYPE_MASK (0x7 << WINED3DSP_REGTYPE_SHIFT) +#define WINED3DSP_REGTYPE_SHIFT2 8 +#define WINED3DSP_REGTYPE_MASK2 (0x18 << WINED3DSP_REGTYPE_SHIFT2) + +/* Relative addressing mask */ +#define WINED3DSHADER_ADDRESSMODE_SHIFT 13 +#define WINED3DSHADER_ADDRESSMODE_MASK (1 << WINED3DSHADER_ADDRESSMODE_SHIFT) + +/* Destination modifier mask */ +#define WINED3DSP_DSTMOD_SHIFT 20 +#define WINED3DSP_DSTMOD_MASK (0xf << WINED3DSP_DSTMOD_SHIFT) + +/* Destination shift mask */ +#define WINED3DSP_DSTSHIFT_SHIFT 24 +#define WINED3DSP_DSTSHIFT_MASK (0xf << WINED3DSP_DSTSHIFT_SHIFT) + +/* Swizzle mask */ +#define WINED3DSP_SWIZZLE_SHIFT 16 +#define WINED3DSP_SWIZZLE_MASK (0xff << WINED3DSP_SWIZZLE_SHIFT) + +/* Source modifier mask */ +#define WINED3DSP_SRCMOD_SHIFT 24 +#define WINED3DSP_SRCMOD_MASK (0xf << WINED3DSP_SRCMOD_SHIFT) + +typedef enum _WINED3DSHADER_ADDRESSMODE_TYPE +{ + WINED3DSHADER_ADDRMODE_ABSOLUTE = 0 << WINED3DSHADER_ADDRESSMODE_SHIFT, + WINED3DSHADER_ADDRMODE_RELATIVE = 1 << WINED3DSHADER_ADDRESSMODE_SHIFT, + WINED3DSHADER_ADDRMODE_FORCE_DWORD = 0x7fffffff, +} WINED3DSHADER_ADDRESSMODE_TYPE; + static void shader_dump_param(const DWORD param, const DWORD addr_token, int input, DWORD shader_version); static inline BOOL shader_is_version_token(DWORD token) { diff --git a/dlls/wined3d/wined3d_private_types.h b/dlls/wined3d/wined3d_private_types.h index ebe2779..379f3f3 100644 --- a/dlls/wined3d/wined3d_private_types.h +++ b/dlls/wined3d/wined3d_private_types.h @@ -31,12 +31,6 @@ #define WINED3DFMT_FLAG_RENDERTARGET 0x10 #define WINED3DFMT_FLAG_FOURCC 0x20 -/** DCL usage masks **/ -#define WINED3DSP_DCL_USAGE_SHIFT 0 -#define WINED3DSP_DCL_USAGE_MASK 0x0000000f -#define WINED3DSP_DCL_USAGEINDEX_SHIFT 16 -#define WINED3DSP_DCL_USAGEINDEX_MASK 0x000f0000 - /** DCL sampler texture type **/ #define WINED3DSP_TEXTURETYPE_SHIFT 27 #define WINED3DSP_TEXTURETYPE_MASK 0x78000000 @@ -51,15 +45,6 @@ typedef enum _WINED3DSAMPLER_TEXTURE_TYPE { WINED3DSTT_FORCE_DWORD = 0x7FFFFFFF } WINED3DSAMPLER_TEXTURE_TYPE; -/** Register number mask **/ -#define WINED3DSP_REGNUM_MASK 0x000007FF - -/** Register type masks **/ -#define WINED3DSP_REGTYPE_SHIFT 28 -#define WINED3DSP_REGTYPE_SHIFT2 8 -#define WINED3DSP_REGTYPE_MASK (0x7 << WINED3DSP_REGTYPE_SHIFT) -#define WINED3DSP_REGTYPE_MASK2 0x00001800 - /** Register types **/ typedef enum _WINED3DSHADER_PARAM_REGISTER_TYPE { WINED3DSPR_TEMP = 0, @@ -97,15 +82,8 @@ typedef enum _WINED3DVS_RASTOUT_OFFSETS { WINED3DSRO_FORCE_DWORD = 0x7FFFFFFF } WINED3DVS_RASTOUT_OFFSETS; -/** Source register modifiers **/ -#define WINED3DSP_SWIZZLE_SHIFT 16 -#define WINED3DSP_SWIZZLE_MASK (0xFF << WINED3DSP_SWIZZLE_SHIFT) - #define WINED3DSP_NOSWIZZLE (0 | (1 << 2) | (2 << 4) | (3 << 6)) -#define WINED3DSP_SRCMOD_SHIFT 24 -#define WINED3DSP_SRCMOD_MASK (0xF << WINED3DSP_SRCMOD_SHIFT) - typedef enum _WINED3DSHADER_PARAM_SRCMOD_TYPE { WINED3DSPSM_NONE = 0, WINED3DSPSM_NEG = 1, @@ -132,9 +110,6 @@ typedef enum _WINED3DSHADER_PARAM_SRCMOD_TYPE { #define WINED3DSP_WRITEMASK_3 0x00080000 /* .w a */ #define WINED3DSP_WRITEMASK_ALL 0x000F0000 /* all */ -#define WINED3DSP_DSTMOD_SHIFT 20 -#define WINED3DSP_DSTMOD_MASK (0xF << WINED3DSP_DSTMOD_SHIFT) - typedef enum _WINED3DSHADER_PARAM_DSTMOD_TYPE { WINED3DSPDM_NONE = 0, WINED3DSPDM_SATURATE = 1, @@ -144,20 +119,6 @@ typedef enum _WINED3DSHADER_PARAM_DSTMOD_TYPE { WINED3DSPDM_FORCE_DWORD = 0x7FFFFFFF } WINED3DSHADER_PARAM_DSTMOD_TYPE; -#define WINED3DSP_DSTSHIFT_SHIFT 24 -#define WINED3DSP_DSTSHIFT_MASK (0xF << WINED3DSP_DSTSHIFT_SHIFT) - -/** Register addressing modes **/ -#define WINED3DSHADER_ADDRESSMODE_SHIFT 13 -#define WINED3DSHADER_ADDRESSMODE_MASK (1 << WINED3DSHADER_ADDRESSMODE_SHIFT) - -typedef enum _WINED3DSHADER_ADDRESSMODE_TYPE { - WINED3DSHADER_ADDRMODE_ABSOLUTE = 0 << WINED3DSHADER_ADDRESSMODE_SHIFT, - WINED3DSHADER_ADDRMODE_RELATIVE = 1 << WINED3DSHADER_ADDRESSMODE_SHIFT, - - WINED3DSHADER_ADDRMODE_FORCE_DWORD = 0x7FFFFFFF -} WINED3DSHADER_ADDRESSMODE_TYPE; - /** Opcode types */ typedef enum _WINED3DSHADER_INSTRUCTION_OPCODE_TYPE { WINED3DSIO_NOP = 0, @@ -251,24 +212,6 @@ typedef enum _WINED3DSHADER_INSTRUCTION_OPCODE_TYPE { WINED3DSIO_FORCE_DWORD = 0X7FFFFFFF /** for 32-bit alignment */ } WINED3DSHADER_INSTRUCTION_OPCODE_TYPE; -/** opcode-related masks **/ - -#define WINED3D_OPCODESPECIFICCONTROL_MASK 0x00ff0000 -#define WINED3D_OPCODESPECIFICCONTROL_SHIFT 16 - -#define WINED3DSI_OPCODE_MASK 0x0000FFFF -#define WINED3DSI_INSTLENGTH_MASK 0x0F000000 -#define WINED3DSI_INSTLENGTH_SHIFT 24 - -#define WINED3DSI_COISSUE 0x40000000 - -#define WINED3DSI_COMMENTSIZE_SHIFT 16 -#define WINED3DSI_COMMENTSIZE_MASK (0x7FFF << WINED3DSI_COMMENTSIZE_SHIFT) -#define WINED3DSHADER_COMMENT(commentSize) \ - ((((commentSize) << WINED3DSI_COMMENTSIZE_SHIFT) & WINED3DSI_COMMENTSIZE_MASK) | WINED3DSIO_COMMENT) - -#define WINED3DSHADER_INSTRUCTION_PREDICATED (1 << 28) - /* Undocumented opcode control to identify projective texture lookups in ps 2.0 and later */ #define WINED3DSI_TEXLD_PROJECT 0x00010000 #define WINED3DSI_TEXLD_BIAS 0x00020000

1 0

Henri Verbeet : wined3d: Move some frontend specfic code to baseshader.c.
by Alexandre Julliard 23 Apr '09

23 Apr '09

Module: wine Branch: master Commit: d6494ad00c0735ca818a9e16f5fd16429e2ca205 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6494ad00c0735ca818a9e16f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 23 09:24:26 2009 +0200 wined3d: Move some frontend specfic code to baseshader.c. --- dlls/wined3d/baseshader.c | 18 +++++++++++++++++- dlls/wined3d/wined3d_private.h | 15 --------------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 7fcf769..6380b5d 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -105,7 +105,23 @@ void shader_init(struct IWineD3DBaseShaderClass *shader, list_init(&shader->linked_programs); } -const SHADER_OPCODE *shader_get_opcode(const SHADER_OPCODE *opcode_table, DWORD shader_version, DWORD code) +static inline WINED3DSHADER_PARAM_REGISTER_TYPE shader_get_regtype(DWORD param) +{ + return ((param & WINED3DSP_REGTYPE_MASK) >> WINED3DSP_REGTYPE_SHIFT) + | ((param & WINED3DSP_REGTYPE_MASK2) >> WINED3DSP_REGTYPE_SHIFT2); +} + +static inline DWORD shader_get_writemask(DWORD param) +{ + return param & WINED3DSP_WRITEMASK_ALL; +} + +static inline BOOL shader_is_comment(DWORD token) +{ + return WINED3DSIO_COMMENT == (token & WINED3DSI_OPCODE_MASK); +} + +static const SHADER_OPCODE *shader_get_opcode(const SHADER_OPCODE *opcode_table, DWORD shader_version, DWORD code) { DWORD i = 0; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 758193e..50e0dac 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2300,8 +2300,6 @@ extern int shader_addline( const char* fmt, ...) PRINTF_ATTR(2,3); int shader_vaddline(SHADER_BUFFER *buffer, const char *fmt, va_list args); -const SHADER_OPCODE *shader_get_opcode(const SHADER_OPCODE *shader_ins, DWORD shader_version, DWORD code); - /* Vertex shader utility functions */ extern BOOL vshader_get_input( IWineD3DVertexShader* iface, @@ -2367,15 +2365,6 @@ void shader_trace_init(const DWORD *byte_code, const SHADER_OPCODE *opcode_table extern void shader_generate_main(IWineD3DBaseShader *iface, SHADER_BUFFER *buffer, const shader_reg_maps *reg_maps, const DWORD *pFunction); -static inline int shader_get_regtype(const DWORD param) { - return (((param & WINED3DSP_REGTYPE_MASK) >> WINED3DSP_REGTYPE_SHIFT) | - ((param & WINED3DSP_REGTYPE_MASK2) >> WINED3DSP_REGTYPE_SHIFT2)); -} - -static inline int shader_get_writemask(const DWORD param) { - return param & WINED3DSP_WRITEMASK_ALL; -} - static inline BOOL shader_is_pshader_version(DWORD token) { return 0xFFFF0000 == (token & 0xFFFF0000); } @@ -2384,10 +2373,6 @@ static inline BOOL shader_is_vshader_version(DWORD token) { return 0xFFFE0000 == (token & 0xFFFF0000); } -static inline BOOL shader_is_comment(DWORD token) { - return WINED3DSIO_COMMENT == (token & WINED3DSI_OPCODE_MASK); -} - static inline BOOL shader_is_scalar(WINED3DSHADER_PARAM_REGISTER_TYPE register_type, UINT register_idx) { switch (register_type)

1 0

Henri Verbeet : wined3d: Handle the destination modifier shift in the frontend rather than the backend .
by Alexandre Julliard 23 Apr '09

23 Apr '09

Module: wine Branch: master Commit: fc60083ed204ec88a5c29fbfe14348ec28397dc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc60083ed204ec88a5c29fbfe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 23 09:24:26 2009 +0200 wined3d: Handle the destination modifier shift in the frontend rather than the backend. --- dlls/wined3d/arb_program_shader.c | 4 ++-- dlls/wined3d/baseshader.c | 4 ++-- dlls/wined3d/wined3d_private_types.h | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 9b56958..1db1e46 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1000,10 +1000,10 @@ static void shader_hw_map2gl(const struct wined3d_shader_instruction *ins) partialprecision = mask & WINED3DSPDM_PARTIALPRECISION; mask &= ~(WINED3DSPDM_MSAMPCENTROID | WINED3DSPDM_PARTIALPRECISION | WINED3DSPDM_SATURATE); if (mask) - FIXME("Unrecognized modifier(%#x)\n", mask >> WINED3DSP_DSTMOD_SHIFT); + FIXME("Unrecognized modifier(%#x)\n", mask); if (centroid) - FIXME("Unhandled modifier(%#x)\n", mask >> WINED3DSP_DSTMOD_SHIFT); + FIXME("Unhandled modifier(%#x)\n", mask); } shift = dst->shift; modifier = (saturate && !shift) ? "_SAT" : ""; diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 31fffc5..7fcf769 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -234,7 +234,7 @@ static void shader_parse_dst_param(DWORD param, const struct wined3d_shader_src_ | ((param & WINED3DSP_REGTYPE_MASK2) >> WINED3DSP_REGTYPE_SHIFT2); dst->register_idx = param & WINED3DSP_REGNUM_MASK; dst->write_mask = param & WINED3DSP_WRITEMASK_ALL; - dst->modifiers = param & WINED3DSP_DSTMOD_MASK; + dst->modifiers = (param & WINED3DSP_DSTMOD_MASK) >> WINED3DSP_DSTMOD_SHIFT; dst->shift = (param & WINED3DSP_DSTSHIFT_MASK) >> WINED3DSP_DSTSHIFT_SHIFT; dst->rel_addr = rel_addr; } @@ -966,7 +966,7 @@ static void shader_dump_ins_modifiers(const DWORD output) mmask &= ~(WINED3DSPDM_SATURATE | WINED3DSPDM_PARTIALPRECISION | WINED3DSPDM_MSAMPCENTROID); if (mmask) - FIXME("_unrecognized_modifier(%#x)", mmask >> WINED3DSP_DSTMOD_SHIFT); + FIXME("_unrecognized_modifier(%#x)", mmask); } void shader_trace_init(const DWORD *pFunction, const SHADER_OPCODE *opcode_table) diff --git a/dlls/wined3d/wined3d_private_types.h b/dlls/wined3d/wined3d_private_types.h index 8a52e39..ebe2779 100644 --- a/dlls/wined3d/wined3d_private_types.h +++ b/dlls/wined3d/wined3d_private_types.h @@ -136,10 +136,10 @@ typedef enum _WINED3DSHADER_PARAM_SRCMOD_TYPE { #define WINED3DSP_DSTMOD_MASK (0xF << WINED3DSP_DSTMOD_SHIFT) typedef enum _WINED3DSHADER_PARAM_DSTMOD_TYPE { - WINED3DSPDM_NONE = 0 << WINED3DSP_DSTMOD_SHIFT, - WINED3DSPDM_SATURATE = 1 << WINED3DSP_DSTMOD_SHIFT, - WINED3DSPDM_PARTIALPRECISION = 2 << WINED3DSP_DSTMOD_SHIFT, - WINED3DSPDM_MSAMPCENTROID = 4 << WINED3DSP_DSTMOD_SHIFT, + WINED3DSPDM_NONE = 0, + WINED3DSPDM_SATURATE = 1, + WINED3DSPDM_PARTIALPRECISION = 2, + WINED3DSPDM_MSAMPCENTROID = 4, WINED3DSPDM_FORCE_DWORD = 0x7FFFFFFF } WINED3DSHADER_PARAM_DSTMOD_TYPE;

1 0

← Newer
1
...
17
18
19
20
21
22
23
...
67
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2009