July 2008 - Wine-Commits - list.winehq.org

Stefan Dösinger : wined3d: Coalesce the nvrc and nvts+nvrc state template.
by Alexandre Julliard July 17, 2008

July 17, 2008

Module: wine Branch: master Commit: ed49f9a848c3a52614e65aeda19e90c93fdb7b86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed49f9a848c3a52614e65aeda… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jul 5 15:20:10 2008 -0500 wined3d: Coalesce the nvrc and nvts+nvrc state template. --- dlls/wined3d/nvidia_texture_shader.c | 142 ++++------------------------------ 1 files changed, 15 insertions(+), 127 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ed49f9a848c3a52614e65…

1 0

James Hawkins : kernel32: Return the default value if lpKeyName is empty.
by Alexandre Julliard July 17, 2008

July 17, 2008

Module: wine Branch: master Commit: 3fb196fb57fadc94979f8354e2603a38d5b08708 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fb196fb57fadc94979f8354e… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Wed Jul 16 16:27:17 2008 -0500 kernel32: Return the default value if lpKeyName is empty. --- dlls/kernel32/profile.c | 4 ++-- dlls/kernel32/tests/profile.c | 24 ++++++------------------ 2 files changed, 8 insertions(+), 20 deletions(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index ad43677..8209a2a 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -964,8 +964,8 @@ static INT PROFILE_GetString( LPCWSTR section, LPCWSTR key_name, { if (!key_name[0]) { - /* Win95 returns 0 on keyname "". Tested with Likse32 bon 000227 */ - return 0; + PROFILE_CopyEntry(buffer, def_val, len, TRUE); + return strlenW(buffer); } key = PROFILE_Find( &CurProfile->section, section, key_name, FALSE, FALSE); PROFILE_CopyEntry( buffer, (key && key->value) ? key->value : def_val, diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index 414b596..91ff982 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -447,11 +447,8 @@ static void test_GetPrivateProfileString(void) lstrcpyA(buf, "kumquat"); ret = GetPrivateProfileStringA("section1", "", "default", buf, MAX_PATH, filename); - todo_wine - { - ok(ret == 7, "Expected 7, got %d\n", ret); - ok(!lstrcmpA(buf, "default"), "Expected \"default\", got \"%s\"\n", buf); - } + ok(ret == 7, "Expected 7, got %d\n", ret); + ok(!lstrcmpA(buf, "default"), "Expected \"default\", got \"%s\"\n", buf); /* lpKeyName is missing */ lstrcpyA(buf, "kumquat"); @@ -465,30 +462,21 @@ static void test_GetPrivateProfileString(void) ret = GetPrivateProfileStringA("section1", "", NULL, buf, MAX_PATH, filename); ok(ret == 0, "Expected 0, got %d\n", ret); - todo_wine - { - ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf); - } + ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf); /* lpKeyName is empty, lpDefault is empty */ lstrcpyA(buf, "kumquat"); ret = GetPrivateProfileStringA("section1", "", "", buf, MAX_PATH, filename); ok(ret == 0, "Expected 0, got %d\n", ret); - todo_wine - { - ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf); - } + ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf); /* lpKeyName is empty, lpDefault has trailing blank characters */ lstrcpyA(buf, "kumquat"); ret = GetPrivateProfileStringA("section1", "", "default ", buf, MAX_PATH, filename); - todo_wine - { - ok(ret == 7, "Expected 7, got %d\n", ret); - ok(!lstrcmpA(buf, "default"), "Expected \"default\", got \"%s\"\n", buf); - } + ok(ret == 7, "Expected 7, got %d\n", ret); + ok(!lstrcmpA(buf, "default"), "Expected \"default\", got \"%s\"\n", buf); if (0) /* crashes */ {

1 0

James Hawkins : kernel32: Fix removing trailing spaces from lpDefault for GetPrivateProfileString.
by Alexandre Julliard July 17, 2008

July 17, 2008

Module: wine Branch: master Commit: 7e9df53f38bf0089151eea5a99f1509a9012cdf6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e9df53f38bf0089151eea5a9… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Wed Jul 16 16:25:54 2008 -0500 kernel32: Fix removing trailing spaces from lpDefault for GetPrivateProfileString. --- dlls/kernel32/profile.c | 19 ++++++++----------- dlls/kernel32/tests/profile.c | 14 ++++---------- 2 files changed, 12 insertions(+), 21 deletions(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index 9b6b1a1..ad43677 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -1084,17 +1084,14 @@ static int PROFILE_GetPrivateProfileString( LPCWSTR section, LPCWSTR entry, /* strip any trailing ' ' of def_val. */ if (def_val) { - LPCWSTR p = &def_val[strlenW(def_val)]; /* even "" works ! */ + LPCWSTR p = &def_val[strlenW(def_val) - 1]; - while (p > def_val) - { - p--; - if ((*p) != ' ') - break; - } - if (*p == ' ') /* ouch, contained trailing ' ' */ - { - int len = (int)(p - def_val); + while (p > def_val && *p == ' ') + p--; + + if (p >= def_val) + { + int len = (int)(p - def_val) + 1; defval_tmp = HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR)); memcpy(defval_tmp, def_val, len * sizeof(WCHAR)); diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index 81999dc..414b596 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -418,21 +418,15 @@ static void test_GetPrivateProfileString(void) lstrcpyA(buf, "kumquat"); ret = GetPrivateProfileStringA("", "name1", "default ", buf, MAX_PATH, filename); - todo_wine - { - ok(ret == 7, "Expected 7, got %d\n", ret); - ok(!lstrcmpA(buf, "default"), "Expected \"default\", got \"%s\"\n", buf); - } + ok(ret == 7, "Expected 7, got %d\n", ret); + ok(!lstrcmpA(buf, "default"), "Expected \"default\", got \"%s\"\n", buf); /* lpAppName is empty, many blank characters in lpDefault */ lstrcpyA(buf, "kumquat"); ret = GetPrivateProfileStringA("", "name1", "one two ", buf, MAX_PATH, filename); - todo_wine - { - ok(ret == 7, "Expected 7, got %d\n", ret); - ok(!lstrcmpA(buf, "one two"), "Expected \"one two\", got \"%s\"\n", buf); - } + ok(ret == 7, "Expected 7, got %d\n", ret); + ok(!lstrcmpA(buf, "one two"), "Expected \"one two\", got \"%s\"\n", buf); /* lpAppName is empty, blank character but not trailing in lpDefault */ lstrcpyA(buf, "kumquat");

1 0

James Hawkins : kernel32: Add tests for GetPrivateProfileString.
by Alexandre Julliard July 17, 2008

July 17, 2008

Module: wine Branch: master Commit: e5705eae840f7ad23a097020853af58f91dbc3d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5705eae840f7ad23a0970208… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Wed Jul 16 16:25:02 2008 -0500 kernel32: Add tests for GetPrivateProfileString. --- dlls/kernel32/tests/profile.c | 272 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 272 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e5705eae840f7ad23a097…

1 0

James Hawkins : fusion: The cases are tokens, not table indices.
by Alexandre Julliard July 17, 2008

July 17, 2008

Module: wine Branch: master Commit: 9dfd90fb98ce5b86b04acf770d10cca10cbf02ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dfd90fb98ce5b86b04acf770… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Wed Jul 16 16:19:42 2008 -0500 fusion: The cases are tokens, not table indices. --- dlls/fusion/assembly.c | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/fusion/assembly.c b/dlls/fusion/assembly.c index 9fcde8f..240c47c 100644 --- a/dlls/fusion/assembly.c +++ b/dlls/fusion/assembly.c @@ -248,7 +248,7 @@ static inline ULONG get_table_size(ASSEMBLY *assembly, DWORD index) size += (tables > MAX_TABLES_3BIT_ENCODE) ? sizeof(WORD) : 0; break; } - case 0x0B: /* FIXME */ + case 0x0B000000: /* FIXME */ { size = sizeof(CONSTANTTABLE) + (assembly->blobsz - sizeof(WORD)); @@ -289,7 +289,7 @@ static inline ULONG get_table_size(ASSEMBLY *assembly, DWORD index) size += (tables > MAX_TABLES_3BIT_ENCODE) ? sizeof(WORD) : 0; break; } - case 0x0D: /* FIXME */ + case 0x0D000000: /* FIXME */ { size = sizeof(FIELDMARSHALTABLE) + (assembly->blobsz - sizeof(WORD)); @@ -310,14 +310,14 @@ static inline ULONG get_table_size(ASSEMBLY *assembly, DWORD index) size += (tables > MAX_TABLES_2BIT_ENCODE) ? sizeof(WORD) : 0; break; } - case 0x0F: /* FIXME */ + case 0x0F000000: /* FIXME */ { size = sizeof(CLASSLAYOUTTABLE); size += (assembly->tables[TableFromToken(mdtTypeDef)].rows > MAX_TABLES_WORD) ? sizeof(WORD) : 0; break; } - case 0x10: /* FIXME */ + case 0x10000000: /* FIXME */ { size = sizeof(FIELDLAYOUTTABLE); size += (assembly->tables[TableFromToken(mdtFieldDef)].rows > @@ -329,7 +329,7 @@ static inline ULONG get_table_size(ASSEMBLY *assembly, DWORD index) size = sizeof(STANDALONESIGTABLE) + (assembly->blobsz - sizeof(WORD)); break; } - case 0x12: /* FIXME */ + case 0x12000000: /* FIXME */ { size = sizeof(EVENTMAPTABLE); size += (assembly->tables[TableFromToken(mdtTypeDef)].rows > @@ -349,7 +349,7 @@ static inline ULONG get_table_size(ASSEMBLY *assembly, DWORD index) size += (tables > MAX_TABLES_2BIT_ENCODE) ? sizeof(WORD) : 0; break; } - case 0x15:/* FIXME */ + case 0x15000000:/* FIXME */ { size = sizeof(PROPERTYMAPTABLE); size += (assembly->tables[TableFromToken(mdtTypeDef)].rows > @@ -364,7 +364,7 @@ static inline ULONG get_table_size(ASSEMBLY *assembly, DWORD index) (assembly->blobsz - sizeof(WORD)); break; } - case 0x18: /* FIXME */ + case 0x18000000: /* FIXME */ { size = sizeof(METHODSEMANTICSTABLE); @@ -377,7 +377,7 @@ static inline ULONG get_table_size(ASSEMBLY *assembly, DWORD index) MAX_TABLES_WORD) ? sizeof(WORD) : 0; break; } - case 0x19: /* FIXME */ + case 0x19000000: /* FIXME */ { size = sizeof(METHODIMPLTABLE); @@ -400,7 +400,7 @@ static inline ULONG get_table_size(ASSEMBLY *assembly, DWORD index) size = sizeof(TYPESPECTABLE) + (assembly->blobsz - sizeof(WORD)); break; } - case 0x1C: /* FIXME */ + case 0x1C000000: /* FIXME */ { size = sizeof(IMPLMAPTABLE) + (assembly->stringsz - sizeof(WORD)); @@ -413,7 +413,7 @@ static inline ULONG get_table_size(ASSEMBLY *assembly, DWORD index) MAX_TABLES_WORD) ? sizeof(WORD) : 0; break; } - case 0x1D: /* FIXME */ + case 0x1D000000: /* FIXME */ { size = sizeof(FIELDRVATABLE); size += (assembly->tables[TableFromToken(mdtFieldDef)].rows > @@ -426,12 +426,12 @@ static inline ULONG get_table_size(ASSEMBLY *assembly, DWORD index) (assembly->blobsz - sizeof(WORD)); break; } - case 0x21: /* FIXME */ + case 0x20000001: /* FIXME */ { size = sizeof(ASSEMBLYPROCESSORTABLE); break; } - case 0x22: /* FIXME */ + case 0x22000000: /* FIXME */ { size = sizeof(ASSEMBLYOSTABLE); break; @@ -442,14 +442,14 @@ static inline ULONG get_table_size(ASSEMBLY *assembly, DWORD index) 2 * (assembly->blobsz - sizeof(WORD)); break; } - case 0x24: /* FIXME */ + case 0x24000000: /* FIXME */ { size = sizeof(ASSEMBLYREFPROCESSORTABLE); size += (assembly->tables[TableFromToken(mdtAssemblyRef)].rows > MAX_TABLES_WORD) ? sizeof(WORD) : 0; break; } - case 0x25: /* FIXME */ + case 0x25000000: /* FIXME */ { size = sizeof(ASSEMBLYREFOSTABLE); size += (assembly->tables[TableFromToken(mdtAssemblyRef)].rows > @@ -482,7 +482,7 @@ static inline ULONG get_table_size(ASSEMBLY *assembly, DWORD index) size += (tables > MAX_TABLES_2BIT_ENCODE) ? sizeof(WORD) : 0; break; } - case 0x29: /* FIXME */ + case 0x29000000: /* FIXME */ { size = sizeof(NESTEDCLASSTABLE); size += (assembly->tables[TableFromToken(mdtTypeDef)].rows >

1 0

H. Verbeet : d3d9: Use color_match() in vshader_version_varying_test().
by Alexandre Julliard July 17, 2008

July 17, 2008

Module: wine Branch: master Commit: f902b044d307015a3043dd1dd96f42e2f59ae7ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=f902b044d307015a3043dd1dd… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Wed Jul 16 22:45:51 2008 +0200 d3d9: Use color_match() in vshader_version_varying_test(). Also fixes the range on the test, 0x19 plus 1 equals 0x1a, and 0x003c0000 should've been 0x004c0000. --- dlls/d3d9/tests/visual.c | 14 ++++---------- 1 files changed, 4 insertions(+), 10 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 1522523..c625214 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -5473,19 +5473,13 @@ static void vshader_version_varying_test(IDirect3DDevice9 *device) { ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %08x\n", hr); color = getPixelColor(device, 160, 120); - ok((color & 0x00ff0000) >= 0x00190000 && (color & 0x00ff0000) <= 0x00210000 && - (color & 0x0000ff00) >= 0x00003300 && (color & 0x0000ff00) <= 0x00003500 && - (color & 0x000000ff) >= 0x00000066 && (color & 0x000000ff) <= 0x00000068, - "vs_3_0 returned color 0x%08x, expected 0x00203366\n", color); + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0x1a, 0x34, 0x67), 1), + "vs_3_0 returned color 0x%08x, expected 0x00193366\n", color); color = getPixelColor(device, 160, 360); - ok((color & 0x00ff0000) >= 0x003c0000 && (color & 0x00ff0000) <= 0x004e0000 && - (color & 0x0000ff00) >= 0x00000000 && (color & 0x0000ff00) <= 0x00000000 && - (color & 0x000000ff) >= 0x00000066 && (color & 0x000000ff) <= 0x00000068, + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0x4d, 0x00, 0x67), 1), "vs_1_1 returned color 0x%08x, expected 0x004c0066\n", color); color = getPixelColor(device, 480, 360); - ok((color & 0x00ff0000) >= 0x003c0000 && (color & 0x00ff0000) <= 0x004e0000 && - (color & 0x0000ff00) >= 0x00000000 && (color & 0x0000ff00) <= 0x00000000 && - (color & 0x000000ff) >= 0x00000066 && (color & 0x000000ff) <= 0x00000068, + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0x4d, 0x00, 0x67), 1), "vs_2_0 returned color 0x%08x, expected 0x004c0066\n", color); /* cleanup */

1 0

Juan Lang : crypt32: Reorganize root store creation code.
by Alexandre Julliard July 17, 2008

July 17, 2008

Module: wine Branch: master Commit: 5fff29cded1ff6089f5efb09ddae058dc8edf845 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fff29cded1ff6089f5efb09d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jul 16 13:34:36 2008 -0700 crypt32: Reorganize root store creation code. --- dlls/crypt32/rootstore.c | 43 ++++++++++++++++++++++++++----------------- 1 files changed, 26 insertions(+), 17 deletions(-) diff --git a/dlls/crypt32/rootstore.c b/dlls/crypt32/rootstore.c index 88b544a..b1bbe9f 100644 --- a/dlls/crypt32/rootstore.c +++ b/dlls/crypt32/rootstore.c @@ -676,20 +676,36 @@ static void add_ms_root_certs(HCERTSTORE to) WARN("adding root cert %d failed: %08x\n", i, GetLastError()); } -/* Reads certificates from the list of known locations. Stops when any - * location contains any certificates, to prevent spending unnecessary time +/* Reads certificates from the list of known locations into store. Stops when + * any location contains any certificates, to prevent spending unnecessary time * adding redundant certificates, e.g. when both a certificate bundle and * individual certificates exist in the same directory. */ -static PWINECRYPT_CERTSTORE CRYPT_RootOpenStoreFromKnownLocations(void) +static void read_trusted_roots_from_known_locations(HCERTSTORE store) { - HCERTSTORE root = NULL; HCERTSTORE from = CertOpenStore(CERT_STORE_PROV_MEMORY, X509_ASN_ENCODING, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); - HCERTSTORE to = CertOpenStore(CERT_STORE_PROV_MEMORY, + + if (from) + { + DWORD i; + BOOL ret = FALSE; + + for (i = 0; !ret && + i < sizeof(CRYPT_knownLocations) / sizeof(CRYPT_knownLocations[0]); + i++) + ret = import_certs_from_path(CRYPT_knownLocations[i], from, TRUE); + check_and_store_certs(from, store); + } +} + +static HCERTSTORE create_root_store(void) +{ + HCERTSTORE root = NULL; + HCERTSTORE memStore = CertOpenStore(CERT_STORE_PROV_MEMORY, X509_ASN_ENCODING, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); - if (from && to) + if (memStore) { CERT_STORE_PROV_INFO provInfo = { sizeof(CERT_STORE_PROV_INFO), @@ -699,18 +715,11 @@ static PWINECRYPT_CERTSTORE CRYPT_RootOpenStoreFromKnownLocations(void) 0, NULL }; - DWORD i; - BOOL ret = FALSE; - for (i = 0; !ret && - i < sizeof(CRYPT_knownLocations) / sizeof(CRYPT_knownLocations[0]); - i++) - ret = import_certs_from_path(CRYPT_knownLocations[i], from, TRUE); - check_and_store_certs(from, to); - add_ms_root_certs(to); - root = CRYPT_ProvCreateStore(0, to, &provInfo); + read_trusted_roots_from_known_locations(memStore); + add_ms_root_certs(memStore); + root = CRYPT_ProvCreateStore(0, memStore, &provInfo); } - CertCloseStore(from, 0); TRACE("returning %p\n", root); return root; } @@ -740,7 +749,7 @@ PWINECRYPT_CERTSTORE CRYPT_RootOpenStore(HCRYPTPROV hCryptProv, DWORD dwFlags) } if (!CRYPT_rootStore) { - HCERTSTORE root = CRYPT_RootOpenStoreFromKnownLocations(); + HCERTSTORE root = create_root_store(); InterlockedCompareExchangePointer((PVOID *)&CRYPT_rootStore, root, NULL);

1 0

H. Verbeet : wined3d: Store the texture in a local variable in sampler_texmatrix().
by Alexandre Julliard July 17, 2008

July 17, 2008

Module: wine Branch: master Commit: c72c70d609e6543f72ea2f560b4b07d2185caf7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c72c70d609e6543f72ea2f560… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Wed Jul 16 22:45:45 2008 +0200 wined3d: Store the texture in a local variable in sampler_texmatrix(). Slightly improves readability. --- dlls/wined3d/state.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 106fb55..fc7b80d 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -2308,8 +2308,9 @@ static void tex_bumpenvloffset(DWORD state, IWineD3DStateBlockImpl *stateblock, static void sampler_texmatrix(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { BOOL texIsPow2 = FALSE; DWORD sampler = state - STATE_SAMPLER(0); + IWineD3DBaseTexture *texture = stateblock->textures[sampler]; - if(!stateblock->textures[sampler]) return; + if(!texture) return; /* The fixed function np2 texture emulation uses the texture matrix to fix up the coordinates * IWineD3DBaseTexture::ApplyStateChanges multiplies the set matrix with a fixup matrix. Before the * scaling is reapplied or removed, the texture matrix has to be reapplied @@ -2320,12 +2321,12 @@ static void sampler_texmatrix(DWORD state, IWineD3DStateBlockImpl *stateblock, W if(!GL_SUPPORT(ARB_TEXTURE_NON_POWER_OF_TWO) && sampler < MAX_TEXTURES) { if(stateblock->textureDimensions[sampler] == GL_TEXTURE_2D || stateblock->textureDimensions[sampler] == GL_TEXTURE_RECTANGLE_ARB) { - if(((IWineD3DTextureImpl *) stateblock->textures[sampler])->baseTexture.pow2Matrix[0] != 1.0 || - ((IWineD3DTextureImpl *) stateblock->textures[sampler])->baseTexture.pow2Matrix[5] != 1.0 ) { + if(((IWineD3DTextureImpl *)texture)->baseTexture.pow2Matrix[0] != 1.0 || + ((IWineD3DTextureImpl *)texture)->baseTexture.pow2Matrix[5] != 1.0 ) { texIsPow2 = TRUE; } } else if(stateblock->textureDimensions[sampler] == GL_TEXTURE_CUBE_MAP_ARB) { - if(((IWineD3DCubeTextureImpl *) stateblock->textures[sampler])->baseTexture.pow2Matrix[0] != 1.0) { + if(((IWineD3DCubeTextureImpl *)texture)->baseTexture.pow2Matrix[0] != 1.0) { texIsPow2 = TRUE; } }

1 0

Jacek Caban : msi: Added Session::Message implementation.
by Alexandre Julliard July 17, 2008

July 17, 2008

Module: wine Branch: master Commit: 014b96ef15db221af72bb5de408dbdca4363b7f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=014b96ef15db221af72bb5de4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 16 18:47:08 2008 +0200 msi: Added Session::Message implementation. --- dlls/msi/automation.c | 14 ++++++++++++++ dlls/msi/msiserver.idl | 40 ++++++++++++++++++++++++++++++++++++++++ dlls/msi/msiserver_dispids.h | 1 + dlls/msi/tests/automation.c | 30 +++++++++++++++++++++++++++++- 4 files changed, 84 insertions(+), 1 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index e919b0d..c15126a 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -1388,6 +1388,20 @@ static HRESULT WINAPI SessionImpl_Invoke( else return DISP_E_MEMBERNOTFOUND; break; + case DISPID_SESSION_MESSAGE: + if(!(wFlags & DISPATCH_METHOD)) + return DISP_E_MEMBERNOTFOUND; + + hr = DispGetParam(pDispParams, 0, VT_I4, &varg0, puArgErr); + if (FAILED(hr)) return hr; + hr = DispGetParam(pDispParams, 1, VT_DISPATCH, &varg1, puArgErr); + if (FAILED(hr)) return hr; + + V_VT(pVarResult) = VT_I4; + V_I4(pVarResult) = + MsiProcessMessage(This->msiHandle, V_I4(&varg0), ((AutomationObject *)V_DISPATCH(&varg1))->msiHandle); + break; + case DISPID_SESSION_SETINSTALLLEVEL: if (wFlags & DISPATCH_METHOD) { hr = DispGetParam(pDispParams, 0, VT_I4, &varg0, puArgErr); diff --git a/dlls/msi/msiserver.idl b/dlls/msi/msiserver.idl index 37aa91e..ac442db 100644 --- a/dlls/msi/msiserver.idl +++ b/dlls/msi/msiserver.idl @@ -325,6 +325,42 @@ library WindowsInstaller msiEvaluateConditionError = 3 } _MsiEvaluateCondition; /* Added underscore to avoid conflict with function name */ + typedef enum { + msiMessageStatusError = -1, + msiMessageStatusNone = 0, + msiMessageStatusOk = 1, + msiMessageStatusCancel = 2, + msiMessageStatusAbort = 3, + msiMessageStatusRetry = 4, + msiMessageStatusIgnore = 5, + msiMessageStatusYes = 6, + msiMessageStatusNo = 7 + } MsiMessageStatus; + + typedef enum { + msiMessageTypeFatalExit = 0, + msiMessageTypeError = 0x01000000, + msiMessageTypeWarning = 0x02000000, + msiMessageTypeUser = 0x03000000, + msiMessageTypeInfo = 0x04000000, + msiMessageTypeFilesInUse = 0x05000000, + msiMessageTypeResolveSource = 0x06000000, + msiMessageTypeOutOfDiskSpace = 0x07000000, + msiMessageTypeActionStart = 0x08000000, + msiMessageTypeActionData = 0x09000000, + msiMessageTypeProgress = 0x0a000000, + msiMessageTypeCommonData = 0x0b000000, + msiMessageTypeOk = 0, + msiMessageTypeOkCancel = 1, + msiMessageTypeAbortRetryIgnore = 2, + msiMessageTypeYesNoCancel = 3, + msiMessageTypeYesNo = 4, + msiMessageTypeRetryCancel = 5, + msiMessageTypeDefault1 = 0, + msiMessageTypeDefault2 = 256, + msiMessageTypeDefault3 = 512 + } MsiMessageType; + [ uuid(000C109E-0000-0000-C000-000000000046) ] dispinterface Session { @@ -352,6 +388,10 @@ library WindowsInstaller MsiDoActionStatus DoAction([in] BSTR Action); [id(DISPID_SESSION_EVALUATECONDITION)] _MsiEvaluateCondition EvaluateCondition([in] BSTR Expression); + [id(DISPID_SESSION_MESSAGE)] + MsiMessageStatus Message( + [in] MsiMessageType Kind, + [in] Record *Record); [id(DISPID_SESSION_FEATURECURRENTSTATE), propget] MsiInstallState FeatureCurrentState([in] BSTR Feature); [id(DISPID_SESSION_FEATUREREQUESTSTATE), propget] diff --git a/dlls/msi/msiserver_dispids.h b/dlls/msi/msiserver_dispids.h index 3a58f6a..e6078fd 100644 --- a/dlls/msi/msiserver_dispids.h +++ b/dlls/msi/msiserver_dispids.h @@ -51,6 +51,7 @@ #define DISPID_SESSION_DATABASE 5 #define DISPID_SESSION_DOACTION 8 #define DISPID_SESSION_EVALUATECONDITION 10 +#define DISPID_SESSION_MESSAGE 12 #define DISPID_SESSION_FEATURECURRENTSTATE 13 #define DISPID_SESSION_FEATUREREQUESTSTATE 14 #define DISPID_SESSION_SETINSTALLLEVEL 19 diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index 2c741e8..683de7a 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -1075,6 +1075,27 @@ static HRESULT Session_EvaluateCondition(IDispatch *pSession, LPCWSTR szConditio return hr; } +static HRESULT Session_Message(IDispatch *pSession, long kind, IDispatch *record, int *ret) +{ + VARIANT varresult; + VARIANTARG vararg[2]; + DISPPARAMS dispparams = {vararg, NULL, sizeof(vararg)/sizeof(VARIANTARG), 0}; + HRESULT hr; + + VariantInit(&varresult); + V_VT(vararg) = VT_DISPATCH; + V_DISPATCH(vararg) = record; + V_VT(vararg+1) = VT_I4; + V_I4(vararg+1) = kind; + + hr = invoke(pSession, "Message", DISPATCH_METHOD, &dispparams, &varresult, VT_I4); + + ok(V_VT(&varresult) == VT_I4, "V_VT(varresult) = %d\n", V_VT(&varresult)); + *ret = V_I4(&varresult); + + return hr; +} + static HRESULT Session_SetInstallLevel(IDispatch *pSession, long iInstallLevel) { VARIANT varresult; @@ -1649,7 +1670,7 @@ static void test_Session(IDispatch *pSession) UINT len; BOOL bool; int myint; - IDispatch *pDatabase = NULL, *pInst = NULL; + IDispatch *pDatabase = NULL, *pInst = NULL, *record = NULL; HRESULT hr; /* Session::Installer */ @@ -1746,6 +1767,13 @@ static void test_Session(IDispatch *pSession) ok(hr == S_OK, "Session_FeatureCurrentState failed, hresult 0x%08x\n", hr); ok(myint == INSTALLSTATE_UNKNOWN, "Feature current state was %d but expected %d\n", myint, INSTALLSTATE_UNKNOWN); + /* Session::Message */ + hr = Installer_CreateRecord(0, &record); + ok(hr == S_OK, "Installer_CreateRecord failed: %08x\n", hr); + hr = Session_Message(pSession, INSTALLMESSAGE_INFO, record, &myint); + ok(hr == S_OK, "Session_Message failed: %08x\n", hr); + ok(myint == 0, "Session_Message returned %x\n", myint); + /* Session::EvaluateCondition */ hr = Session_EvaluateCondition(pSession, szOneStateFalse, &myint); ok(hr == S_OK, "Session_EvaluateCondition failed, hresult 0x%08x\n", hr);

1 0

Alexander Dorofeyev : ddraw/tests: Add tests for surface caps memory flags.
by Alexandre Julliard July 17, 2008

July 17, 2008

Module: wine Branch: master Commit: 2be93ce6b0374ef7ae3c3195c3efd8216d3a8bbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=2be93ce6b0374ef7ae3c3195c… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Tue Jul 15 00:58:17 2008 +0300 ddraw/tests: Add tests for surface caps memory flags. --- dlls/ddraw/tests/dsurface.c | 134 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 134 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 7dba28b..da66e2e 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -5,6 +5,7 @@ * Copyright (C) 2005 Christian Costa * Copyright 2005 Ivan Leo Puoti * Copyright (C) 2007 Stefan D�singer + * Copyright (C) 2008 Alexander Dorofeyev * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -2609,6 +2610,138 @@ static void StructSizeTest(void) IDirectDrawSurface_Release(surface1); } +static void SurfaceCapsTest(void) +{ + DDSURFACEDESC create; + DDSURFACEDESC desc; + HRESULT hr; + IDirectDrawSurface *surface1 = NULL; + DDSURFACEDESC2 create2, desc2; + IDirectDrawSurface7 *surface7 = NULL; + IDirectDraw7 *dd7 = NULL; + DWORD create_caps[] = { + DDSCAPS_OFFSCREENPLAIN, + DDSCAPS_TEXTURE, + DDSCAPS_TEXTURE | DDSCAPS_ALLOCONLOAD, + 0, + DDSCAPS_TEXTURE | DDSCAPS_ALLOCONLOAD | DDSCAPS_SYSTEMMEMORY, + DDSCAPS_PRIMARYSURFACE, + DDSCAPS_PRIMARYSURFACE | DDSCAPS_SYSTEMMEMORY + }; + DWORD expected_caps[] = { + DDSCAPS_OFFSCREENPLAIN | DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM, + DDSCAPS_TEXTURE | DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM, + DDSCAPS_TEXTURE | DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM | DDSCAPS_ALLOCONLOAD, + DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM, + DDSCAPS_TEXTURE | DDSCAPS_ALLOCONLOAD | DDSCAPS_SYSTEMMEMORY, + DDSCAPS_PRIMARYSURFACE | DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM | DDSCAPS_VISIBLE, + DDSCAPS_PRIMARYSURFACE | DDSCAPS_SYSTEMMEMORY | DDSCAPS_VISIBLE + }; + UINT i; + DDCAPS ddcaps; + + /* Tests various surface flags, what changes do they undergo during surface creation. Forsaken + * engine expects texture surfaces without memory flag to get a video memory flag right after + * creation. Currently, Wine adds DDSCAPS_FRONTBUFFER to primary surface, but native doesn't do this + * for single buffered primaries. Because of this primary surface creation tests are todo_wine. No real + * app is known so far to care about this. */ + ddcaps.dwSize = sizeof(DDCAPS); + hr = IDirectDraw_GetCaps(lpDD, &ddcaps, NULL); + ok(hr == DD_OK, "IDirectDraw_GetCaps failed with %08x\n", hr); + + if (!(ddcaps.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY)) + { + skip("DDraw reported no VIDEOMEMORY cap. Broken video driver? Skipping surface caps tests.\n"); + return ; + } + + for (i = 0; i < sizeof(create_caps) / sizeof(DWORD); i++) + { + memset(&create, 0, sizeof(create)); + create.dwSize = sizeof(create); + create.ddsCaps.dwCaps = create_caps[i]; + create.dwFlags = DDSD_CAPS; + + if (!(create.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE)) + { + create.dwFlags |= DDSD_HEIGHT | DDSD_WIDTH; + create.dwHeight = 128; + create.dwWidth = 128; + } + + hr = IDirectDraw_CreateSurface(lpDD, &create, &surface1, NULL); + ok(hr == DD_OK, "IDirectDraw_CreateSurface failed with %08x\n", hr); + + if (SUCCEEDED(hr)) + { + memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(DDSURFACEDESC); + hr = IDirectDrawSurface_GetSurfaceDesc(surface1, &desc); + ok(hr == DD_OK, "IDirectDrawSurface_GetSurfaceDesc failed with %08x\n", hr); + + if (!(create_caps[i] & DDSCAPS_PRIMARYSURFACE)) + ok(desc.ddsCaps.dwCaps == expected_caps[i], + "GetSurfaceDesc returned caps %x, expected %x\n", desc.ddsCaps.dwCaps, + expected_caps[i]); + else + todo_wine ok(desc.ddsCaps.dwCaps == expected_caps[i], + "GetSurfaceDesc returned caps %x, expected %x\n", desc.ddsCaps.dwCaps, + expected_caps[i]); + + IDirectDrawSurface_Release(surface1); + } + } + + /* Test for differences in ddraw 7 */ + hr = IDirectDraw_QueryInterface(lpDD, &IID_IDirectDraw7, (void **) &dd7); + ok(hr == DD_OK, "IDirectDraw_QueryInterface returned %08x\n", hr); + if (FAILED(hr)) + { + skip("Failed to get IDirectDraw7 interface, skipping tests\n"); + } + else + { + for (i = 0; i < sizeof(create_caps) / sizeof(DWORD); i++) + { + memset(&create2, 0, sizeof(create2)); + create2.dwSize = sizeof(create2); + create2.ddsCaps.dwCaps = create_caps[i]; + create2.dwFlags = DDSD_CAPS; + + if (!(create2.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE)) + { + create2.dwFlags |= DDSD_HEIGHT | DDSD_WIDTH; + create2.dwHeight = 128; + create2.dwWidth = 128; + } + + hr = IDirectDraw7_CreateSurface(dd7, &create2, &surface7, NULL); + ok(hr==DD_OK,"CreateSurface returned: %x\n",hr); + + if (SUCCEEDED(hr)) + { + memset(&desc2, 0, sizeof(desc2)); + desc2.dwSize = sizeof(DDSURFACEDESC2); + hr = IDirectDrawSurface7_GetSurfaceDesc(surface7, &desc2); + ok(hr == DD_OK, "IDirectDrawSurface_GetSurfaceDesc failed with %08x\n", hr); + + if (!(create_caps[i] & DDSCAPS_PRIMARYSURFACE)) + ok(desc2.ddsCaps.dwCaps == expected_caps[i], + "GetSurfaceDesc returned caps %x, expected %x\n", desc2.ddsCaps.dwCaps, + expected_caps[i]); + else + todo_wine ok(desc2.ddsCaps.dwCaps == expected_caps[i], + "GetSurfaceDesc returned caps %x, expected %x\n", desc2.ddsCaps.dwCaps, + expected_caps[i]); + + IDirectDrawSurface7_Release(surface7); + } + } + + IDirectDraw7_Release(dd7); + } +} + START_TEST(dsurface) { if (!CreateDirectDraw()) @@ -2631,5 +2764,6 @@ START_TEST(dsurface) BltParamTest(); StructSizeTest(); PaletteTest(); + SurfaceCapsTest(); ReleaseDirectDraw(); }

1 0