wine-commits June 2013

wine-commits@winehq.org

2 participants
411 discussions

Christian Costa : d3dxof/tests: Add test for case sensitive 'indexColor' type.
by Alexandre Julliard 12 Jun '13

12 Jun '13

Module: wine Branch: master Commit: 66414c46c956f6597186fc318ae3eda3e2514565 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66414c46c956f6597186fc318… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Jun 11 22:09:07 2013 +0200 d3dxof/tests: Add test for case sensitive 'indexColor' type. --- dlls/d3dx9_36/tests/xfile.c | 35 ++++++++++++++++++++++++++++++++ dlls/d3dxof/tests/d3dxof.c | 47 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/xfile.c b/dlls/d3dx9_36/tests/xfile.c index 4ac521b..c47cffb 100644 --- a/dlls/d3dx9_36/tests/xfile.c +++ b/dlls/d3dx9_36/tests/xfile.c @@ -62,6 +62,24 @@ static char object_noname[] = "1; 2; 3;\n" "}\n"; +static char template_using_index_color_lower[] = +"xof 0302txt 0064\n" +"template MeshVertexColors\n" +"{\n" +"<1630B821-7842-11cf-8F52-0040333594A3>\n" +"DWORD nVertexColors;\n" +"array indexColor vertexColors[nVertexColors];\n" +"}\n"; + +static char template_using_index_color_upper[] = +"xof 0302txt 0064\n" +"template MeshVertexColors\n" +"{\n" +"<1630B821-7842-11cf-8F52-0040333594A3>\n" +"DWORD nVertexColors;\n" +"array IndexColor vertexColors[nVertexColors];\n" +"}\n"; + static void test_templates(void) { ID3DXFile *d3dxfile; @@ -207,7 +225,23 @@ static void test_getname(void) data_object->lpVtbl->Release(data_object); enum_object->lpVtbl->Release(enum_object); d3dxfile->lpVtbl->Release(d3dxfile); +} +static void test_type_index_color(void) +{ + ID3DXFile *d3dxfile; + HRESULT ret; + + ret = D3DXFileCreate(&d3dxfile); + ok(ret == S_OK, "D3DXCreateFile failed with %#x\n", ret); + + /* Test that 'indexColor' can be used (same as IndexedColor in standard templates) and is case sensitive */ + ret = d3dxfile->lpVtbl->RegisterTemplates(d3dxfile, template_using_index_color_lower, sizeof(template_using_index_color_lower) - 1); + todo_wine ok(ret == S_OK, "RegisterTemplates failed with %#x\n", ret); + ret = d3dxfile->lpVtbl->RegisterTemplates(d3dxfile, template_using_index_color_upper, sizeof(template_using_index_color_upper) - 1); + ok(ret == D3DXFERR_PARSEERROR, "RegisterTemplates returned %#x instead of %#x\n", ret, D3DXFERR_PARSEERROR); + + d3dxfile->lpVtbl->Release(d3dxfile); } static inline void debugstr_guid(char* buf, const GUID *id) @@ -361,5 +395,6 @@ START_TEST(xfile) test_templates(); test_lock_unlock(); test_getname(); + test_type_index_color(); test_dump(); } diff --git a/dlls/d3dxof/tests/d3dxof.c b/dlls/d3dxof/tests/d3dxof.c index ede23f8..d0f110d 100644 --- a/dlls/d3dxof/tests/d3dxof.c +++ b/dlls/d3dxof/tests/d3dxof.c @@ -376,6 +376,24 @@ static char object_complex[] = "3;;;, 3;;;, 1;;;, 2;;;,\n" "}\n"; +static char template_using_index_color_lower[] = +"xof 0302txt 0064\n" +"template MeshVertexColors\n" +"{\n" +"<1630B821-7842-11cf-8F52-0040333594A3>\n" +"DWORD nVertexColors;\n" +"array indexColor vertexColors[nVertexColors];\n" +"}\n"; + +static char template_using_index_color_upper[] = +"xof 0302txt 0064\n" +"template MeshVertexColors\n" +"{\n" +"<1630B821-7842-11cf-8F52-0040333594A3>\n" +"DWORD nVertexColors;\n" +"array IndexColor vertexColors[nVertexColors];\n" +"}\n"; + static void init_function_pointers(void) { /* We have to use LoadLibrary as no d3dxof functions are referenced directly */ @@ -1064,6 +1082,34 @@ static void test_standard_templates(void) IDirectXFile_Release(dxfile); } +static void test_type_index_color(void) +{ + HRESULT ret; + IDirectXFile *dxfile = NULL; + + if (!pDirectXFileCreate) + { + win_skip("DirectXFileCreate is not available\n"); + return; + } + + ret = pDirectXFileCreate(&dxfile); + ok(ret == DXFILE_OK, "DirectXFileCreate failed with %#x\n", ret); + if (!dxfile) + { + skip("Couldn't create DirectXFile interface\n"); + return; + } + + /* Test that 'indexColor' can be used (same as IndexedColor in standard templates) and is case sensitive */ + ret = IDirectXFile_RegisterTemplates(dxfile, template_using_index_color_lower, sizeof(template_using_index_color_lower) - 1); + todo_wine ok(ret == DXFILE_OK, "IDirectXFileImpl_RegisterTemplates failed with %#x\n", ret); + ret = IDirectXFile_RegisterTemplates(dxfile, template_using_index_color_upper, sizeof(template_using_index_color_upper) - 1); + ok(ret == DXFILEERR_PARSEERROR, "IDirectXFileImpl_RegisterTemplates returned %#x instead of %#x\n", ret, DXFILEERR_PARSEERROR); + + IDirectXFile_Release(dxfile); +} + /* Set it to 1 to expand the string when dumping the object. This is useful when there is * only one string in a sub-object (very common). Use with care, this may lead to a crash. */ #define EXPAND_STRING 0 @@ -1250,6 +1296,7 @@ START_TEST(d3dxof) test_syntax_semicolon_comma(); test_complex_object(); test_standard_templates(); + test_type_index_color(); test_dump(); FreeLibrary(hd3dxof);

1 0

Christian Costa : d3dxof: Fix string handling in binary mode + tests.
by Alexandre Julliard 12 Jun '13

12 Jun '13

Module: wine Branch: master Commit: 71986eb109bb3ff45d374d15174afbe442830873 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71986eb109bb3ff45d374d151… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Jun 11 22:08:59 2013 +0200 d3dxof: Fix string handling in binary mode + tests. --- dlls/d3dxof/parsing.c | 5 ----- dlls/d3dxof/tests/d3dxof.c | 23 +++++++++++++++++++++++ 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index 69fb992..fc7250c 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -811,7 +811,6 @@ static WORD parse_TOKEN(parse_buffer * buf) case TOKEN_STRING: { DWORD count; - WORD tmp_token; char *string = (char*)buf->value; if (!read_bytes(buf, &count, 4)) @@ -819,10 +818,6 @@ static WORD parse_TOKEN(parse_buffer * buf) if (!read_bytes(buf, string, count)) return TOKEN_ERROR; string[count] = 0; - if (!read_bytes(buf, &tmp_token, 2)) - return TOKEN_ERROR; - if ((tmp_token != TOKEN_COMMA) && (tmp_token != TOKEN_SEMICOLON)) - ERR("No comma or semicolon (got %d)\n", tmp_token); TRACE("string = %s\n", string); token = TOKEN_LPSTR; diff --git a/dlls/d3dxof/tests/d3dxof.c b/dlls/d3dxof/tests/d3dxof.c index 3a92ce9..ede23f8 100644 --- a/dlls/d3dxof/tests/d3dxof.c +++ b/dlls/d3dxof/tests/d3dxof.c @@ -30,6 +30,7 @@ #define I4(x) x,0,0,0 #define TOKEN_NAME I2(1) +#define TOKEN_STRING I2(2) #define TOKEN_INTEGER I2(3) #define TOKEN_INTEGER_LIST I2(6) #define TOKEN_OBRACE I2(10) @@ -328,6 +329,13 @@ static char object_syntax_string_with_separator[] = "\"foo;bar\";\n" "}\n"; +static char object_syntax_string_bin[] = { +'x','o','f',' ','0','3','0','2','b','i','n',' ','0','0','6','4', +TOKEN_NAME, /* size */ I4(8), /* name */ 'F','i','l','e','n','a','m','e', TOKEN_OBRACE, +TOKEN_STRING, /* size */ I4(6), /* string */ 'f','o','o','b','a','r', TOKEN_SEMICOLON, +TOKEN_CBRACE +}; + static char templates_complex_object[] = "xof 0302txt 0064\n" "template Vector\n" @@ -850,6 +858,21 @@ static void test_syntax(void) IDirectXFileData_Release(lpdxfd); IDirectXFileEnumObject_Release(lpdxfeo); + /* Test string in binary mode */ + dxflm.lpMemory = &object_syntax_string_bin; + dxflm.dSize = sizeof(object_syntax_string_bin); + hr = IDirectXFile_CreateEnumObject(lpDirectXFile, &dxflm, DXFILELOAD_FROMMEMORY, &lpdxfeo); + ok(hr == DXFILE_OK, "IDirectXFile_CreateEnumObject: %x\n", hr); + hr = IDirectXFileEnumObject_GetNextDataObject(lpdxfeo, &lpdxfd); + ok(hr == DXFILE_OK, "IDirectXFileEnumObject_GetNextDataObject: %x\n", hr); + hr = IDirectXFileData_GetData(lpdxfd, NULL, &size, (void**)&string); + ok(hr == DXFILE_OK, "IDirectXFileData_GetData: %x\n", hr); + ok(size == sizeof(char*), "Got wrong data size %d\n", size); + ok(!strcmp(*string, "foobar"), "Got string %s, expected foobar\n", *string); + if (hr == DXFILE_OK) + IDirectXFileData_Release(lpdxfd); + IDirectXFileEnumObject_Release(lpdxfeo); + IDirectXFile_Release(lpDirectXFile); }

1 0

Nikolay Sivov : comdlg32: Store client GUID with SetClientGuid().
by Alexandre Julliard 12 Jun '13

12 Jun '13

Module: wine Branch: master Commit: f92caf5ba77abadd8d8c67a14437e45184c5d175 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f92caf5ba77abadd8d8c67a14… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 8 16:55:00 2013 +0400 comdlg32: Store client GUID with SetClientGuid(). --- dlls/comdlg32/itemdlg.c | 9 +++++++-- dlls/comdlg32/tests/itemdlg.c | 26 ++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index 33398b5..2313b0a 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -125,6 +125,8 @@ typedef struct FileDialogImpl { HWND cctrls_hwnd; struct list cctrls; UINT_PTR cctrl_next_dlgid; + + GUID client_guid; } FileDialogImpl; /************************************************************************** @@ -2032,8 +2034,9 @@ static HRESULT WINAPI IFileDialog2_fnClose(IFileDialog2 *iface, HRESULT hr) static HRESULT WINAPI IFileDialog2_fnSetClientGuid(IFileDialog2 *iface, REFGUID guid) { FileDialogImpl *This = impl_from_IFileDialog2(iface); - FIXME("stub - %p (%s)\n", This, debugstr_guid(guid)); - return E_NOTIMPL; + TRACE("%p (%s)\n", This, debugstr_guid(guid)); + This->client_guid = *guid; + return S_OK; } static HRESULT WINAPI IFileDialog2_fnClearClientData(IFileDialog2 *iface) @@ -3627,6 +3630,8 @@ static HRESULT FileDialog_constructor(IUnknown *pUnkOuter, REFIID riid, void **p fdimpl->default_ext = NULL; fdimpl->custom_cancelbutton = fdimpl->custom_filenamelabel = NULL; + fdimpl->client_guid = GUID_NULL; + /* FIXME: The default folder setting should be restored for the * application if it was previously set. */ SHGetDesktopFolder(&psf); diff --git a/dlls/comdlg32/tests/itemdlg.c b/dlls/comdlg32/tests/itemdlg.c index 4e50926..bb7205f 100644 --- a/dlls/comdlg32/tests/itemdlg.c +++ b/dlls/comdlg32/tests/itemdlg.c @@ -1392,6 +1392,7 @@ static void test_customize(void) if(FAILED(hr)) { skip("Skipping IFileDialogCustomize tests.\n"); + IFileDialog_Release(pfod); return; } @@ -1897,6 +1898,30 @@ static void test_customize(void) ok(!ref, "Refcount not zero (%d).\n", ref); } +static void test_persistent_state(void) +{ + IFileDialog *fd; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_FileOpenDialog, NULL, CLSCTX_INPROC_SERVER, + &IID_IFileDialog, (void**)&fd); + ok(hr == S_OK, "got 0x%08x.\n", hr); + +if (0) +{ + /* crashes at least on Win8 */ + hr = IFileDialog_SetClientGuid(fd, NULL); +} + + hr = IFileDialog_SetClientGuid(fd, &IID_IUnknown); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IFileDialog_SetClientGuid(fd, &IID_NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + IFileDialog_Release(fd); +} + START_TEST(itemdlg) { OleInitialize(NULL); @@ -1908,6 +1933,7 @@ START_TEST(itemdlg) test_advise(); test_filename(); test_customize(); + test_persistent_state(); } else skip("Skipping all Item Dialog tests.\n");

1 0

Nikolay Sivov : riched20: Use helpers from header instead of internal functions.
by Alexandre Julliard 12 Jun '13

12 Jun '13

Module: wine Branch: master Commit: ed673ff947a330ed5755ac543816df09696ec028 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed673ff947a330ed5755ac543… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 8 16:53:45 2013 +0400 riched20: Use helpers from header instead of internal functions. --- dlls/riched20/richole.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 9c74cfe..6805873 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -300,7 +300,7 @@ IRichEditOle_fnGetClientSite(IRichEditOle *me, if(!lplpolesite) return E_INVALIDARG; *lplpolesite = &This->clientSite->IOleClientSite_iface; - IOleClientSite_fnAddRef(*lplpolesite); + IOleClientSite_AddRef(*lplpolesite); return S_OK; } @@ -448,21 +448,21 @@ ITextDocument_fnQueryInterface(ITextDocument* me, REFIID riid, void** ppvObject) { IRichEditOleImpl *This = impl_from_ITextDocument(me); - return IRichEditOle_fnQueryInterface(&This->IRichEditOle_iface, riid, ppvObject); + return IRichEditOle_QueryInterface(&This->IRichEditOle_iface, riid, ppvObject); } static ULONG WINAPI ITextDocument_fnAddRef(ITextDocument* me) { IRichEditOleImpl *This = impl_from_ITextDocument(me); - return IRichEditOle_fnAddRef(&This->IRichEditOle_iface); + return IRichEditOle_AddRef(&This->IRichEditOle_iface); } static ULONG WINAPI ITextDocument_fnRelease(ITextDocument* me) { IRichEditOleImpl *This = impl_from_ITextDocument(me); - return IRichEditOle_fnRelease(&This->IRichEditOle_iface); + return IRichEditOle_Release(&This->IRichEditOle_iface); } static HRESULT WINAPI

1 0

Nikolay Sivov : xmllite: It' s acceptable to have NULL length pointer in GetLocalName().
by Alexandre Julliard 12 Jun '13

12 Jun '13

Module: wine Branch: master Commit: 9997ef3fbcac33f4005c91174c2a4e600dbef08d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9997ef3fbcac33f4005c91174… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 12 13:06:24 2013 +0400 xmllite: It's acceptable to have NULL length pointer in GetLocalName(). --- dlls/xmllite/reader.c | 2 +- dlls/xmllite/tests/reader.c | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 8276b85..5256c35 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -2256,7 +2256,7 @@ static HRESULT WINAPI xmlreader_GetLocalName(IXmlReader* iface, LPCWSTR *name, U TRACE("(%p)->(%p %p)\n", This, name, len); *name = This->strvalues[StringValue_LocalName].str; - *len = This->strvalues[StringValue_LocalName].len; + if (len) *len = This->strvalues[StringValue_LocalName].len; return S_OK; } diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index fad3d41..46c6edd 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -1364,13 +1364,20 @@ static void test_read_cdata(void) ok(type == XmlNodeType_CDATA, "got %d for %s\n", type, test->xml); + str_exp = a2w(test->name); + len = 1; str = NULL; hr = IXmlReader_GetLocalName(reader, &str, &len); ok(hr == S_OK, "got 0x%08x\n", hr); ok(len == strlen(test->name), "got %u\n", len); - str_exp = a2w(test->name); ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); + + str = NULL; + hr = IXmlReader_GetLocalName(reader, &str, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); + free_str(str_exp); len = 1;

1 0

Hans Leidekker : wbemprox/tests: Mark a test result as broken.
by Alexandre Julliard 12 Jun '13

12 Jun '13

Module: wine Branch: master Commit: 97cc8bfcc7a6117667168e40ab47941b2c977419 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97cc8bfcc7a6117667168e40a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 12 11:09:06 2013 +0200 wbemprox/tests: Mark a test result as broken. --- dlls/wbemprox/tests/query.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 15fe6f8..f09da91 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -586,7 +586,7 @@ static void test_notification_query_async( IWbemServices *services ) ok( sink_refs > prev_sink_refs, "got %u refs\n", sink_refs ); hr = IWbemServices_CancelAsyncCall( services, &sink ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK || broken(hr == WBEM_E_NOT_FOUND), "got %08x\n", hr ); SysFreeString( wql ); SysFreeString( query );

1 0

Hans Leidekker : wininet/tests: Avoid proxy test failures on old wininet.
by Alexandre Julliard 12 Jun '13

12 Jun '13

Module: wine Branch: master Commit: 697cbc3605f0ea4b9ab1787e26663341ee6cf6dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=697cbc3605f0ea4b9ab1787e2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 12 11:08:42 2013 +0200 wininet/tests: Avoid proxy test failures on old wininet. --- dlls/wininet/tests/http.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 1682b05..5d4c28a 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2465,6 +2465,11 @@ static void test_proxy_direct(int port) ok(sz == lstrlenW(passwordW), "got %u\n", sz); r = HttpSendRequest(hr, NULL, 0, NULL, 0); + if (!r) + { + win_skip("skipping proxy tests on broken wininet\n"); + goto done; + } ok(r, "HttpSendRequest failed %u\n", GetLastError()); sz = sizeof buffer; r = HttpQueryInfo(hr, HTTP_QUERY_STATUS_CODE, buffer, &sz, NULL);

1 0

André Hentschel : winemaker: Don' t add -mno-cygwin to CXXEXTRA per default.
by Alexandre Julliard 11 Jun '13

11 Jun '13

Module: wine Branch: master Commit: b4b2656bc800c4c3b93c48444c8f002d8330b3cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4b2656bc800c4c3b93c48444… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jun 11 19:54:00 2013 +0200 winemaker: Don't add -mno-cygwin to CXXEXTRA per default. --- tools/winemaker | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index 9c5c6a0..c3921a1 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -1121,7 +1121,6 @@ sub source_scan_project_file($$$) if ((@$project_settings[$T_FLAGS] & $TF_NOMSVCRT) == 0) { push @{@$project_settings[$T_CEXTRA]},"-mno-cygwin"; - push @{@$project_settings[$T_CXXEXTRA]},"-mno-cygwin"; if ($opt_arch != $OPT_ARCH_DEFAULT) { push @{@$project_settings[$T_CEXTRA]},"-m$opt_arch"; push @{@$project_settings[$T_CXXEXTRA]},"-m$opt_arch"; @@ -1681,7 +1680,6 @@ sub source_scan_directory($$$$) if ((@$project_settings[$T_FLAGS] & $TF_NOMSVCRT) == 0) { push @{@$project_settings[$T_CEXTRA]},"-mno-cygwin"; - push @{@$project_settings[$T_CXXEXTRA]},"-mno-cygwin"; if ($opt_arch != $OPT_ARCH_DEFAULT) { push @{@$project_settings[$T_CEXTRA]},"-m$opt_arch"; push @{@$project_settings[$T_CXXEXTRA]},"-m$opt_arch";

1 0

Alistair Leslie-Hughes : dbs.idl: Add DBPROPVAL defines.
by Alexandre Julliard 11 Jun '13

11 Jun '13

Module: wine Branch: master Commit: 6fd87c4053fb063b84ecfbca8d8491d64f561197 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fd87c4053fb063b84ecfbca8… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jun 5 09:26:02 2013 +1000 dbs.idl: Add DBPROPVAL defines. --- include/dbs.idl | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/include/dbs.idl b/include/dbs.idl index ee8eacf..46deb6a 100644 --- a/include/dbs.idl +++ b/include/dbs.idl @@ -482,6 +482,32 @@ cpp_quote("#define DBPROMPT_COMPLETE 0x02") cpp_quote("#define DBPROMPT_COMPLETEREQUIRED 0x03") cpp_quote("#define DBPROMPT_NOPROMPT 0x04") +cpp_quote("#define DBPROPVAL_STGM_READ OF_READ") +cpp_quote("#define DBPROPVAL_STGM_WRITE OF_WRITE") +cpp_quote("#define DBPROPVAL_STGM_READWRITE OF_READWRITE") +cpp_quote("#define DBPROPVAL_STGM_SHARE_DENY_NONE OF_SHARE_DENY_NONE") +cpp_quote("#define DBPROPVAL_STGM_SHARE_DENY_READ OF_SHARE_DENY_READ") +cpp_quote("#define DBPROPVAL_STGM_SHARE_DENY_WRITE OF_SHARE_DENY_WRITE)") +cpp_quote("#define DBPROPVAL_STGM_SHARE_EXCLUSIVE OF_SHARE_EXCLUSIVE") +cpp_quote("#define DBPROPVAL_STGM_DIRECT 0x00010000") +cpp_quote("#define DBPROPVAL_STGM_TRANSACTED 0x00020000") +cpp_quote("#define DBPROPVAL_STGM_CREATE OF_CREATE") +cpp_quote("#define DBPROPVAL_STGM_CONVERT 0x00040000") +cpp_quote("#define DBPROPVAL_STGM_FAILIFTHERE 0x00080000") +cpp_quote("#define DBPROPVAL_STGM_PRIORITY 0x00100000") +cpp_quote("#define DBPROPVAL_STGM_DELETEONRELEASE 0x00200000") +cpp_quote("#define DBPROPVAL_GB_COLLATE __MSABI_LONG(0x00000010)") +cpp_quote("#define DBPROPVAL_CS_UNINITIALIZED __MSABI_LONG(0x00000000)") +cpp_quote("#define DBPROPVAL_CS_INITIALIZED __MSABI_LONG(0x00000001)") +cpp_quote("#define DBPROPVAL_CS_COMMUNICATIONFAILURE __MSABI_LONG(0x00000002)") + +cpp_quote("#define DBPROPVAL_RD_RESETALL __MSABI_LONG(0xffffffff)") +cpp_quote("#define DBPROPVAL_OS_RESOURCEPOOLING __MSABI_LONG(0x00000001)") +cpp_quote("#define DBPROPVAL_OS_TXNENLISTMENT __MSABI_LONG(0x00000002)") +cpp_quote("#define DBPROPVAL_OS_CLIENTCURSOR __MSABI_LONG(0x00000004)") +cpp_quote("#define DBPROPVAL_OS_ENABLEALL __MSABI_LONG(0xffffffff)") +cpp_quote("#define DBPROPVAL_BI_CROSSROWSET __MSABI_LONG(0x00000001)") + typedef struct tagDBCOLUMNACCESS {

1 0

Tatyana Fokina : kernel32: Check the size of the string in CompareStringA.
by Alexandre Julliard 11 Jun '13

11 Jun '13

Module: wine Branch: master Commit: aaed0e81d51678cbb43cdd4c1b774eaf1e4be71b URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaed0e81d51678cbb43cdd4c1… Author: Tatyana Fokina <tatyana(a)etersoft.ru> Date: Tue Jun 11 17:41:16 2013 +0400 kernel32: Check the size of the string in CompareStringA. --- dlls/kernel32/locale.c | 6 +++--- dlls/kernel32/tests/locale.c | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 86720ff..9ddf078 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -2979,7 +2979,7 @@ INT WINAPI CompareStringA(LCID lcid, DWORD flags, WCHAR *buf1W = NtCurrentTeb()->StaticUnicodeBuffer; WCHAR *buf2W = buf1W + 130; LPWSTR str1W, str2W; - INT len1W, len2W, ret; + INT len1W = 0, len2W = 0, ret; UINT locale_cp = CP_ACP; if (!str1 || !str2) @@ -2994,7 +2994,7 @@ INT WINAPI CompareStringA(LCID lcid, DWORD flags, if (len1) { - len1W = MultiByteToWideChar(locale_cp, 0, str1, len1, buf1W, 130); + if (len1 <= 130) len1W = MultiByteToWideChar(locale_cp, 0, str1, len1, buf1W, 130); if (len1W) str1W = buf1W; else @@ -3017,7 +3017,7 @@ INT WINAPI CompareStringA(LCID lcid, DWORD flags, if (len2) { - len2W = MultiByteToWideChar(locale_cp, 0, str2, len2, buf2W, 130); + if (len2 <= 130) len2W = MultiByteToWideChar(locale_cp, 0, str2, len2, buf2W, 130); if (len2W) str2W = buf2W; else diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index b6198d1..772d13b 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -1466,7 +1466,6 @@ static void test_CompareStringA(void) memset(a, 'a', sizeof(a)); SetLastError(0xdeadbeef); ret = CompareStringA(lcid, 0, a, sizeof(a), a, sizeof(a)); - todo_wine ok (GetLastError() == 0xdeadbeef && ret == CSTR_EQUAL, "ret %d, error %d, expected value %d\n", ret, GetLastError(), CSTR_EQUAL); }

1 0

← Newer
1
...
21
22
23
24
25
26
27
...
42
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 June 2013