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

Henri Verbeet : d3d10: Implement ID3D10Effect::GetTechniqueByIndex().
by Alexandre Julliard 02 Mar '09

02 Mar '09

Module: wine Branch: master Commit: aea8f66202db8e08dacc6d13e6b7960ab2298668 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aea8f66202db8e08dacc6d13e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 2 08:52:49 2009 +0100 d3d10: Implement ID3D10Effect::GetTechniqueByIndex(). --- dlls/d3d10/effect.c | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 9f1b77e..96eb2f3 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -566,9 +566,22 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_GetVariableB static struct ID3D10EffectTechnique * STDMETHODCALLTYPE d3d10_effect_GetTechniqueByIndex(ID3D10Effect *iface, UINT index) { - FIXME("iface %p, index %u stub!\n", iface, index); + struct d3d10_effect *This = (struct d3d10_effect *)iface; + struct d3d10_effect_technique *t; - return NULL; + TRACE("iface %p, index %u\n", iface, index); + + if (index >= This->technique_count) + { + WARN("Invalid index specified\n"); + return NULL; + } + + t = &This->techniques[index]; + + TRACE("Returning technique %p, \"%s\"\n", t, t->name); + + return (ID3D10EffectTechnique *)t; } static struct ID3D10EffectTechnique * STDMETHODCALLTYPE d3d10_effect_GetTechniqueByName(ID3D10Effect *iface,

1 0

Henri Verbeet : d3d10: Implement ID3D10EffectTechnique::GetPassByName().
by Alexandre Julliard 02 Mar '09

02 Mar '09

Module: wine Branch: master Commit: 5d5ae0c42127adbd868c238455b043619902b371 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d5ae0c42127adbd868c23845… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 2 08:52:49 2009 +0100 d3d10: Implement ID3D10EffectTechnique::GetPassByName(). --- dlls/d3d10/d3d10_private.h | 3 + dlls/d3d10/effect.c | 107 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 108 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index a832c83..956d5ae 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -44,8 +44,11 @@ struct d3d10_effect_variable DWORD idx_offset; }; +/* ID3D10EffectPass */ struct d3d10_effect_pass { + const struct ID3D10EffectPassVtbl *vtbl; + char *name; DWORD start; DWORD variable_count; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 96eb2f3..88cf8bb 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -31,6 +31,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d10); #define TAG_FX10 MAKE_TAG('F', 'X', '1', '0') static const struct ID3D10EffectTechniqueVtbl d3d10_effect_technique_vtbl; +static const struct ID3D10EffectPassVtbl d3d10_effect_pass_vtbl; static inline void read_dword(const char **ptr, DWORD *d) { @@ -158,7 +159,11 @@ static HRESULT parse_fx10_technique_index(struct d3d10_effect_technique *t, cons for (i = 0; i < t->pass_count; ++i) { - hr = parse_fx10_pass_index(&t->passes[i], ptr); + struct d3d10_effect_pass *p = &t->passes[i]; + + p->vtbl = &d3d10_effect_pass_vtbl; + + hr = parse_fx10_pass_index(p, ptr); if (FAILED(hr)) break; } @@ -685,7 +690,20 @@ static struct ID3D10EffectPass * STDMETHODCALLTYPE d3d10_effect_technique_GetPas static struct ID3D10EffectPass * STDMETHODCALLTYPE d3d10_effect_technique_GetPassByName(ID3D10EffectTechnique *iface, LPCSTR name) { - FIXME("iface %p, name \"%s\" stub!\n", iface, name); + struct d3d10_effect_technique *This = (struct d3d10_effect_technique *)iface; + unsigned int i; + + TRACE("iface %p, name \"%s\"\n", iface, name); + + for (i = 0; i < This->pass_count; ++i) + { + struct d3d10_effect_pass *p = &This->passes[i]; + if (!strcmp(p->name, name)) + { + TRACE("Returning pass %p\n", p); + return (ID3D10EffectPass *)p; + } + } return NULL; } @@ -709,3 +727,88 @@ static const struct ID3D10EffectTechniqueVtbl d3d10_effect_technique_vtbl = d3d10_effect_technique_GetPassByName, d3d10_effect_technique_ComputeStateBlockMask, }; + +/* ID3D10EffectPass methods */ + +static BOOL STDMETHODCALLTYPE d3d10_effect_pass_IsValid(ID3D10EffectPass *iface) +{ + FIXME("iface %p stub!\n", iface); + + return FALSE; +} + +static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_GetDesc(ID3D10EffectPass *iface, D3D10_PASS_DESC *desc) +{ + FIXME("iface %p, desc %p stub!\n", iface, desc); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_GetVertexShaderDesc(ID3D10EffectPass *iface, + D3D10_PASS_SHADER_DESC *desc) +{ + FIXME("iface %p, desc %p stub!\n", iface, desc); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_GetGeometryShaderDesc(ID3D10EffectPass *iface, + D3D10_PASS_SHADER_DESC *desc) +{ + FIXME("iface %p, desc %p stub!\n", iface, desc); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_GetPixelShaderDesc(ID3D10EffectPass *iface, + D3D10_PASS_SHADER_DESC *desc) +{ + FIXME("iface %p, desc %p stub!\n", iface, desc); + + return E_NOTIMPL; +} + +static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_pass_GetAnnotationByIndex(ID3D10EffectPass *iface, + UINT index) +{ + FIXME("iface %p, index %u stub!\n", iface, index); + + return NULL; +} + +static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_pass_GetAnnotationByName(ID3D10EffectPass *iface, + LPCSTR name) +{ + FIXME("iface %p, name \"%s\" stub!\n", iface, name); + + return NULL; +} + +static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_Apply(ID3D10EffectPass *iface, UINT flags) +{ + FIXME("iface %p, flags %#x stub!\n", iface, flags); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_ComputeStateBlockMask(ID3D10EffectPass *iface, + D3D10_STATE_BLOCK_MASK *mask) +{ + FIXME("iface %p, mask %p stub!\n", iface, mask); + + return E_NOTIMPL; +} + +static const struct ID3D10EffectPassVtbl d3d10_effect_pass_vtbl = +{ + /* ID3D10EffectPass methods */ + d3d10_effect_pass_IsValid, + d3d10_effect_pass_GetDesc, + d3d10_effect_pass_GetVertexShaderDesc, + d3d10_effect_pass_GetGeometryShaderDesc, + d3d10_effect_pass_GetPixelShaderDesc, + d3d10_effect_pass_GetAnnotationByIndex, + d3d10_effect_pass_GetAnnotationByName, + d3d10_effect_pass_Apply, + d3d10_effect_pass_ComputeStateBlockMask, +};

1 0

Henri Verbeet : d3d10: Implement ID3D10EffectTechnique::GetPassByIndex().
by Alexandre Julliard 02 Mar '09

02 Mar '09

Module: wine Branch: master Commit: f5f87b89be22dc1637fae3245f1250368d0ed763 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5f87b89be22dc1637fae3245… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 2 08:52:49 2009 +0100 d3d10: Implement ID3D10EffectTechnique::GetPassByIndex(). --- dlls/d3d10/effect.c | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 88cf8bb..61b4a6f 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -682,9 +682,22 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_technique_Ge static struct ID3D10EffectPass * STDMETHODCALLTYPE d3d10_effect_technique_GetPassByIndex(ID3D10EffectTechnique *iface, UINT index) { - FIXME("iface %p, index %u stub!\n", iface, index); + struct d3d10_effect_technique *This = (struct d3d10_effect_technique *)iface; + struct d3d10_effect_pass *p; - return NULL; + TRACE("iface %p, index %u\n", iface, index); + + if (index >= This->pass_count) + { + WARN("Invalid index specified\n"); + return NULL; + } + + p = &This->passes[index]; + + TRACE("Returning pass %p, \"%s\"\n", p, p->name); + + return (ID3D10EffectPass *)p; } static struct ID3D10EffectPass * STDMETHODCALLTYPE d3d10_effect_technique_GetPassByName(ID3D10EffectTechnique *iface,

1 0

Dmitry Timoshkov : gdi32: Fix the font rotation direction.
by Alexandre Julliard 02 Mar '09

02 Mar '09

Module: wine Branch: master Commit: d15619b215c2eb6828acb21732a56396e08b5233 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d15619b215c2eb6828acb2173… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Mar 2 17:23:31 2009 +0800 gdi32: Fix the font rotation direction. Apparently at some point either freetype got fixed, or other gdi32 changes made the matrix members usage match freetype. This patch makes my test application match the Windows behaviour in font rotation direction. --- dlls/gdi32/freetype.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 54bb999..99626d0 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4492,8 +4492,8 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format, { FT_Matrix worldMat; worldMat.xx = FT_FixedFromFloat(font->font_desc.matrix.eM11); - worldMat.xy = FT_FixedFromFloat(font->font_desc.matrix.eM21); - worldMat.yx = FT_FixedFromFloat(font->font_desc.matrix.eM12); + worldMat.xy = FT_FixedFromFloat(font->font_desc.matrix.eM12); + worldMat.yx = FT_FixedFromFloat(font->font_desc.matrix.eM21); worldMat.yy = FT_FixedFromFloat(font->font_desc.matrix.eM22); pFT_Matrix_Multiply(&worldMat, &transMat); pFT_Matrix_Multiply(&worldMat, &transMatUnrotated); @@ -4505,8 +4505,8 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format, { FT_Matrix extraMat; extraMat.xx = FT_FixedFromFIXED(lpmat->eM11); - extraMat.xy = FT_FixedFromFIXED(lpmat->eM21); - extraMat.yx = FT_FixedFromFIXED(lpmat->eM12); + extraMat.xy = FT_FixedFromFIXED(lpmat->eM12); + extraMat.yx = FT_FixedFromFIXED(lpmat->eM21); extraMat.yy = FT_FixedFromFIXED(lpmat->eM22); pFT_Matrix_Multiply(&extraMat, &transMat); pFT_Matrix_Multiply(&extraMat, &transMatUnrotated);

1 0

Michael Stefaniuc : user32: Remove superfluous pointer casts.
by Alexandre Julliard 02 Mar '09

02 Mar '09

Module: wine Branch: master Commit: 214b40b10908d007db05a51e504533d337edcf65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=214b40b10908d007db05a51e5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Mar 2 10:24:30 2009 +0100 user32: Remove superfluous pointer casts. --- dlls/user32/class.c | 8 +++--- dlls/user32/cursoricon.c | 18 +++++++--------- dlls/user32/dde_client.c | 2 +- dlls/user32/dde_misc.c | 8 +++--- dlls/user32/ddeml16.c | 2 +- dlls/user32/desktop.c | 2 +- dlls/user32/dialog.c | 12 +++++----- dlls/user32/exticon.c | 4 +- dlls/user32/hook.c | 2 +- dlls/user32/listbox.c | 2 +- dlls/user32/mdi.c | 5 +-- dlls/user32/menu.c | 10 ++++---- dlls/user32/message.c | 4 +- dlls/user32/msgbox.c | 4 +- dlls/user32/resource.c | 8 ++---- dlls/user32/scroll.c | 4 +- dlls/user32/static.c | 4 +- dlls/user32/sysparams.c | 50 +++++++++++++++++++++++----------------------- dlls/user32/uitools.c | 6 ++-- dlls/user32/win.c | 2 +- dlls/user32/winpos.c | 6 ++-- dlls/user32/winproc.c | 12 +++++----- 22 files changed, 85 insertions(+), 90 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=214b40b10908d007db05a…

1 0

James Hawkins : msi: Handle reading from a NULL stream.
by Alexandre Julliard 02 Mar '09

02 Mar '09

Module: wine Branch: master Commit: 9540d762ad67cedb0c32510b2da2061bff975758 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9540d762ad67cedb0c32510b2… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Mar 2 02:34:32 2009 -0800 msi: Handle reading from a NULL stream. --- dlls/msi/record.c | 6 ++++++ dlls/msi/tests/db.c | 7 ++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/msi/record.c b/dlls/msi/record.c index 2b7131a..d484cb8 100644 --- a/dlls/msi/record.c +++ b/dlls/msi/record.c @@ -765,6 +765,12 @@ UINT MSI_RecordReadStream(MSIRECORD *rec, UINT iField, char *buf, LPDWORD sz) if( iField > rec->count) return ERROR_INVALID_PARAMETER; + if ( rec->fields[iField].type == MSIFIELD_NULL ) + { + *sz = 0; + return ERROR_INVALID_DATA; + } + if( rec->fields[iField].type != MSIFIELD_STREAM ) return ERROR_INVALID_DATATYPE; diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index e1e9fb7..b2c7d06 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -6077,12 +6077,9 @@ static void test_storages_table(void) size = MAX_PATH; lstrcpyA(buf, "apple"); r = MsiRecordReadStream(hrec, 2, buf, &size); + ok(r == ERROR_INVALID_DATA, "Expected ERROR_INVALID_DATA, got %d\n", r); ok(!lstrcmp(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf); - todo_wine - { - ok(r == ERROR_INVALID_DATA, "Expected ERROR_INVALID_DATA, got %d\n", r); - ok(size == 0, "Expected 0, got %d\n", size); - } + ok(size == 0, "Expected 0, got %d\n", size); MsiCloseHandle(hrec);

1 0

Dmitry Timoshkov : winex11.drv: Take into account current world transform when caching glyphs.
by Alexandre Julliard 02 Mar '09

02 Mar '09

Module: wine Branch: master Commit: 0abee3d23ca67c22c53cd62bfe2a2b92338095f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0abee3d23ca67c22c53cd62bf… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Mar 2 17:22:59 2009 +0800 winex11.drv: Take into account current world transform when caching glyphs. This patch basically duplicates the logic for caching fonts from gdi32, and fixes the problem with a test application which rotates a text string. --- dlls/winex11.drv/xrender.c | 18 ++++++++++++++---- 1 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index a7414a6..f4b68ff 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -54,6 +54,7 @@ static XRenderPictFormat *pict_formats[2]; typedef struct { LOGFONTW lf; + XFORM xform; SIZE devsize; /* size in device coords */ DWORD hash; } LFANDSIZE; @@ -268,8 +269,9 @@ static BOOL fontcmp(LFANDSIZE *p1, LFANDSIZE *p2) { if(p1->hash != p2->hash) return TRUE; if(memcmp(&p1->devsize, &p2->devsize, sizeof(p1->devsize))) return TRUE; + if(memcmp(&p1->xform, &p2->xform, sizeof(p1->xform))) return TRUE; if(memcmp(&p1->lf, &p2->lf, offsetof(LOGFONTW, lfFaceName))) return TRUE; - return strcmpW(p1->lf.lfFaceName, p2->lf.lfFaceName); + return strcmpiW(p1->lf.lfFaceName, p2->lf.lfFaceName); } #if 0 @@ -549,18 +551,24 @@ static void dec_ref_cache(int index) static void lfsz_calc_hash(LFANDSIZE *plfsz) { - DWORD hash = 0, *ptr; + DWORD hash = 0, *ptr, two_chars; + WORD *pwc; int i; hash ^= plfsz->devsize.cx; hash ^= plfsz->devsize.cy; + for(i = 0, ptr = (DWORD*)&plfsz->xform; i < sizeof(XFORM)/sizeof(DWORD); i++, ptr++) + hash ^= *ptr; for(i = 0, ptr = (DWORD*)&plfsz->lf; i < 7; i++, ptr++) hash ^= *ptr; for(i = 0, ptr = (DWORD*)plfsz->lf.lfFaceName; i < LF_FACESIZE/2; i++, ptr++) { - WCHAR *pwc = (WCHAR *)ptr; + two_chars = *ptr; + pwc = (WCHAR *)&two_chars; if(!*pwc) break; - hash ^= *ptr; + *pwc = toupperW(*pwc); pwc++; + *pwc = toupperW(*pwc); + hash ^= two_chars; if(!*pwc) break; } plfsz->hash = hash; @@ -592,8 +600,10 @@ BOOL X11DRV_XRender_SelectFont(X11DRV_PDEVICE *physDev, HFONT hfont) TRACE("h=%d w=%d weight=%d it=%d charset=%d name=%s\n", lfsz.lf.lfHeight, lfsz.lf.lfWidth, lfsz.lf.lfWeight, lfsz.lf.lfItalic, lfsz.lf.lfCharSet, debugstr_w(lfsz.lf.lfFaceName)); + lfsz.lf.lfWidth = abs( lfsz.lf.lfWidth ); lfsz.devsize.cx = X11DRV_XWStoDS( physDev, lfsz.lf.lfWidth ); lfsz.devsize.cy = X11DRV_YWStoDS( physDev, lfsz.lf.lfHeight ); + GetWorldTransform( physDev->hdc, &lfsz.xform ); lfsz_calc_hash(&lfsz); EnterCriticalSection(&xrender_cs);

1 0

James Hawkins : msi: Don't treat carriage returns as spaces.
by Alexandre Julliard 02 Mar '09

02 Mar '09

Module: wine Branch: master Commit: 2f1eacfcad489fcc36a1c7d80bc76315de7167a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f1eacfcad489fcc36a1c7d80… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Mar 2 02:34:24 2009 -0800 msi: Don't treat carriage returns as spaces. --- dlls/msi/tests/db.c | 36 ++++++++---------------------------- dlls/msi/tokenize.c | 4 ++-- 2 files changed, 10 insertions(+), 30 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index e5ada2b..e1e9fb7 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -5344,11 +5344,8 @@ static void test_carriagereturn(void) query = "CREATE TABLE `Table`\r ( `A` CHAR(72) NOT NULL PRIMARY KEY `A` )"; r = run_query(hdb, 0, query); - todo_wine - { - ok(r == ERROR_BAD_QUERY_SYNTAX, - "Expected ERROR_BAD_QUERY_SYNTAX, got %d\n", r); - } + ok(r == ERROR_BAD_QUERY_SYNTAX, + "Expected ERROR_BAD_QUERY_SYNTAX, got %d\n", r); query = "CREATE TABLE `Table` \r( `A` CHAR(72) NOT NULL PRIMARY KEY `A` )"; r = run_query(hdb, 0, query); @@ -5449,11 +5446,8 @@ static void test_carriagereturn(void) query = "CREATE TABLE `Four` ( `A` CHAR(72\r) NOT NULL PRIMARY KEY `A` )"; r = run_query(hdb, 0, query); - todo_wine - { - ok(r == ERROR_BAD_QUERY_SYNTAX, - "Expected ERROR_BAD_QUERY_SYNTAX, got %d\n", r); - } + ok(r == ERROR_BAD_QUERY_SYNTAX, + "Expected ERROR_BAD_QUERY_SYNTAX, got %d\n", r); query = "CREATE TABLE `Four` ( `A` CHAR(\r72) NOT NULL PRIMARY KEY `A` )"; r = run_query(hdb, 0, query); @@ -5487,10 +5481,7 @@ static void test_carriagereturn(void) size = MAX_PATH; r = MsiRecordGetStringA(hrec, 1, buf, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine - { - ok(!lstrcmpA(buf, "\rOne"), "Expected \"\\rOne\", got \"%s\"\n", buf); - } + ok(!lstrcmpA(buf, "\rOne"), "Expected \"\\rOne\", got \"%s\"\n", buf); MsiCloseHandle(hrec); @@ -5500,10 +5491,7 @@ static void test_carriagereturn(void) size = MAX_PATH; r = MsiRecordGetStringA(hrec, 1, buf, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine - { - ok(!lstrcmpA(buf, "Tw\ro"), "Expected \"Tw\\ro\", got \"%s\"\n", buf); - } + ok(!lstrcmpA(buf, "Tw\ro"), "Expected \"Tw\\ro\", got \"%s\"\n", buf); MsiCloseHandle(hrec); @@ -5513,20 +5501,12 @@ static void test_carriagereturn(void) size = MAX_PATH; r = MsiRecordGetStringA(hrec, 1, buf, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine - { - ok(!lstrcmpA(buf, "Three\r"), - "Expected \"Three\r\", got \"%s\"\n", buf); - } + ok(!lstrcmpA(buf, "Three\r"), "Expected \"Three\r\", got \"%s\"\n", buf); MsiCloseHandle(hrec); r = MsiViewFetch(hview, &hrec); - todo_wine - { - ok(r == ERROR_NO_MORE_ITEMS, - "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); - } + ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); MsiViewClose(hview); MsiCloseHandle(hview); diff --git a/dlls/msi/tokenize.c b/dlls/msi/tokenize.c index b92e2a0..0482456 100644 --- a/dlls/msi/tokenize.c +++ b/dlls/msi/tokenize.c @@ -193,8 +193,8 @@ static const char isIdChar[] = { int sqliteGetToken(const WCHAR *z, int *tokenType){ int i; switch( *z ){ - case ' ': case '\t': case '\n': case '\f': case '\r': { - for(i=1; isspace(z[i]); i++){} + case ' ': case '\t': case '\n': case '\f': { + for(i=1; isspace(z[i]) && z[i] != '\r'; i++){} *tokenType = TK_SPACE; return i; }

1 0

James Hawkins : msi: Use a SQL marker to query the _Property table when fetching a property.
by Alexandre Julliard 02 Mar '09

02 Mar '09

Module: wine Branch: master Commit: 293bdffa29f5daba1195ad761de7e646bf6c1db0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=293bdffa29f5daba1195ad761… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Mar 2 02:33:56 2009 -0800 msi: Use a SQL marker to query the _Property table when fetching a property. --- dlls/msi/package.c | 24 ++++++++++++++++++++++-- 1 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index f662fe0..7172ff4 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1403,16 +1403,36 @@ UINT WINAPI MsiSetPropertyW( MSIHANDLE hInstall, LPCWSTR szName, LPCWSTR szValue static MSIRECORD *MSI_GetPropertyRow( MSIPACKAGE *package, LPCWSTR name ) { + MSIQUERY *view; + MSIRECORD *rec, *row = NULL; + UINT r; + static const WCHAR query[]= { 'S','E','L','E','C','T',' ','`','V','a','l','u','e','`',' ', 'F','R','O','M',' ' ,'`','_','P','r','o','p','e','r','t','y','`', ' ','W','H','E','R','E',' ' ,'`','_','P','r','o','p','e','r','t','y','`', - '=','\'','%','s','\'',0}; + '=','?',0}; if (!name || !*name) return NULL; - return MSI_QueryGetRecord( package->db, query, name ); + rec = MSI_CreateRecord(1); + if (!rec) + return NULL; + + MSI_RecordSetStringW(rec, 1, name); + + r = MSI_DatabaseOpenViewW(package->db, query, &view); + if (r == ERROR_SUCCESS) + { + MSI_ViewExecute(view, rec); + MSI_ViewFetch(view, &row); + MSI_ViewClose(view); + msiobj_release(&view->hdr); + } + + msiobj_release(&rec->hdr); + return row; } /* internal function, not compatible with MsiGetPropertyW */

1 0

James Hawkins : msi: Add missing calls to MsiViewClose.
by Alexandre Julliard 02 Mar '09

02 Mar '09

Module: wine Branch: master Commit: e821f9d724959bcfb393af6d6497528a1beb87e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e821f9d724959bcfb393af6d6… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Mar 2 02:34:08 2009 -0800 msi: Add missing calls to MsiViewClose. --- dlls/msi/tests/db.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index ab10da9..29a87f6 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -1070,8 +1070,8 @@ static MSIHANDLE get_column_info(MSIHANDLE hdb, const char *query, MSICOLINFO ty if( r == ERROR_SUCCESS ) { MsiViewGetColumnInfo( hview, type, &rec ); - MsiViewClose(hview); } + MsiViewClose(hview); MsiCloseHandle(hview); return rec; } @@ -1101,9 +1101,8 @@ static UINT get_columns_table_type(MSIHANDLE hdb, const char *table, UINT field) type = MsiRecordGetInteger( rec, 4 ); MsiCloseHandle( rec ); } - - MsiViewClose(hview); } + MsiViewClose(hview); MsiCloseHandle(hview); return type; } @@ -1325,6 +1324,7 @@ static void test_longstrings(void) r = MsiViewFetch(hview, &hrec); ok(r == ERROR_SUCCESS, "MsiViewFetch failed\n"); + MsiViewClose(hview); MsiCloseHandle(hview); r = MsiRecordGetString(hrec, 2, NULL, &len); @@ -1425,6 +1425,7 @@ static void test_streamtable(void) ok( r == ERROR_SUCCESS, "Failed to execute view: %d\n", r); MsiCloseHandle( rec ); + MsiViewClose( view ); MsiCloseHandle( view ); r = MsiDatabaseOpenView( hdb, @@ -1453,6 +1454,7 @@ static void test_streamtable(void) r = MsiViewFetch( view, &rec ); ok( r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); + MsiViewClose( view ); MsiCloseHandle( view ); MsiCloseHandle( hdb ); DeleteFile(msifile); @@ -1714,6 +1716,7 @@ static void test_msiimport(void) ok(i == -2147483640, "Expected -2147483640, got %d\n", i); MsiCloseHandle(rec); + MsiViewClose(view); MsiCloseHandle(view); query = "SELECT * FROM `TwoPrimary`"; @@ -2042,6 +2045,7 @@ static void test_handle_limit(void) for (i=0; i<MY_NVIEWS; i++) { if (hviews[i] != 0 && hviews[i] != 0xdeadbeeb) { + MsiViewClose(hviews[i]); r = MsiCloseHandle(hviews[i]); if (r != ERROR_SUCCESS) break; @@ -2529,6 +2533,7 @@ static void test_try_transform(void) ok(r == ERROR_NO_MORE_ITEMS, "view fetch succeeded\n"); MsiCloseHandle(hrec); + MsiViewClose(hview); MsiCloseHandle(hview); /* check that the property was added */ @@ -3317,6 +3322,7 @@ static void test_temporary_table(void) ok( 0 == strcmp("j2", buf), "wrong column type\n"); MsiCloseHandle( rec ); + MsiViewClose( view ); MsiCloseHandle( view ); /* query the table data */ @@ -5295,6 +5301,7 @@ static void test_quotes(void) ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); } + MsiViewClose(hview); MsiCloseHandle(hview); write_file("import.idt", import_dat, (sizeof(import_dat) - 1) * sizeof(char)); @@ -5325,8 +5332,8 @@ static void test_quotes(void) r = MsiViewFetch(hview, &hrec); ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); + MsiViewClose(hview); MsiCloseHandle(hview); - MsiCloseHandle(hdb); DeleteFileA(msifile); } @@ -5731,8 +5738,6 @@ static void test_noquotes(void) MsiViewClose(hview); MsiCloseHandle(hview); - - MsiCloseHandle(hdb); DeleteFileA(msifile); }

1 0