February 2012 - Wine-commits

Francois Gouget : po: Tweak the wrapping o f the cmd MOVE Norwegian Bokmål usage message translation.
by Alexandre Julliard 27 Feb '12

27 Feb '12

Module: wine Branch: master Commit: 216359c6fb4754b47bdf28ff6fcecb39b7c0c9ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=216359c6fb4754b47bdf28ff6… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Feb 26 17:42:45 2012 +0100 po: Tweak the wrapping of the cmd MOVE Norwegian Bokmål usage message translation. --- po/nb_NO.po | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index abd3a87..11a4ac9 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -9706,8 +9706,7 @@ msgid "" "\n" "MOVE fails if the old and new locations are on different DOS drive letters.\n" msgstr "" -"MOVE flytter en fil eller katalog til et nytt sted innenfor\n" -"filsystemet.\n" +"MOVE flytter en fil eller katalog til et nytt sted innenfor filsystemet.\n" "\n" "Hvis elementet som flyttes er en katalog, flyttes også filene og\n" "underkatalogene i den.\n"

1 0

Francois Gouget : po: Fix some typography issues in the Norwegian Bokmål translation.
by Alexandre Julliard 27 Feb '12

27 Feb '12

Module: wine Branch: master Commit: 2fa09b1b1048397ecbf7e64310979c6a6a419ad0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fa09b1b1048397ecbf7e6431… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Feb 26 17:43:35 2012 +0100 po: Fix some typography issues in the Norwegian Bokmål translation. --- po/nb_NO.po | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index 11a4ac9..6b9d794 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -6952,7 +6952,7 @@ msgstr "Egenskapens nettverksstasjon mangler" #: msi.rc:60 msgid "feature from:" -msgstr "Egenskap fra::" +msgstr "Egenskap fra:" #: msi.rc:61 msgid "choose which folder contains %s" @@ -8011,7 +8011,7 @@ msgstr "Kjører på %s" #: shell32.rc:326 msgid "Wine was brought to you by:" -msgstr "Wine er laget av" +msgstr "Wine er laget av:" #: shell32.rc:334 msgid "" @@ -8634,7 +8634,7 @@ msgstr "Det oppgitte enhetshåndtaket er ugyldig." #: winmm.rc:34 #, fuzzy msgid "There is no driver installed on your system!" -msgstr "Det er ingen driver installert på systemet.\n" +msgstr "Det er ingen driver installert på systemet!" #: winmm.rc:35 winmm.rc:61 msgid "" @@ -9747,7 +9747,7 @@ msgstr "" "PAUSE viser meldingen 'Trykk Enter for å fortsette', og venter på at\n" " brukeren trykker Enter. Dette er hovedsakelig nyttig i satsvise filer,\n" "for å la brukeren lese utdata fra en tidligere kommando før den ruller\n" -"vekk fra skjermen..\n" +"vekk fra skjermen.\n" #: cmd.rc:149 #, fuzzy @@ -13186,7 +13186,7 @@ msgstr "" "Vil du virkelig fjerne stasjon C?\n" "\n" "De fleste Windows-programmer forventer at C finnes, og lager bråk hvis den " -"ikke er der. Husk å lage den på nytt hvis du fortsetter." +"ikke er der. Husk å lage den på nytt hvis du fortsetter!" #: winecfg.rc:74 #, fuzzy @@ -13204,9 +13204,9 @@ msgid "" "\n" "Remember to click 'Add' in the Drives tab to create one!\n" msgstr "" -"Du har ikke en C-stasjon. Det er ikke så bra..\n" +"Du har ikke en C-stasjon. Det er ikke så bra.\n" "\n" -"Husk å trykke «Legg til» i stasjonsfanen for å lage en.\n" +"Husk å trykke «Legg til» i stasjonsfanen for å lage en!\n" #: winecfg.rc:90 msgid "Controls Background" @@ -14396,12 +14396,12 @@ msgstr "" #: wordpad.rc:187 #, fuzzy msgid "Invalid number format." -msgstr "Ugyldig tallformat" +msgstr "Ugyldig tallformat." #: wordpad.rc:188 #, fuzzy msgid "OLE storage documents are not supported." -msgstr "OLE storage-dokumenter støttes ikke" +msgstr "OLE storage-dokumenter støttes ikke." #: wordpad.rc:189 msgid "Could not save the file."

1 0

Francois Gouget : po: Remove some invalid Norwegian Bokmål shell folder name translations.
by Alexandre Julliard 27 Feb '12

27 Feb '12

Module: wine Branch: master Commit: 5e0029ef8d55d725f778466ca3f7dc556c6cbbf8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e0029ef8d55d725f778466ca… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Feb 26 17:44:01 2012 +0100 po: Remove some invalid Norwegian Bokmål shell folder name translations. --- po/nb_NO.po | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index 6b9d794..e0a2e8d 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -8174,19 +8174,22 @@ msgstr "Dokumenter" #: shell32.rc:217 #, fuzzy msgid "Administrative Tools" -msgstr "Start-meny\\Programmer\\Administrative verktøy" +msgstr "Administrative verktøy" #: shell32.rc:218 +#, fuzzy msgid "Music" -msgstr "Dokumenter\\Min musikk" +msgstr "Min musikk" #: shell32.rc:219 +#, fuzzy msgid "Pictures" -msgstr "Dokumenter\\Mine bilder" +msgstr "Mine bilder" #: shell32.rc:220 +#, fuzzy msgid "Videos" -msgstr "Dokumenter\\Mine videoklipp" +msgstr "Mine videoklipp" #: shell32.rc:213 #, fuzzy

1 0

Francois Gouget : po: Wrap the 'Caps Lock' Catalan warning tooltip like the English one.
by Alexandre Julliard 27 Feb '12

27 Feb '12

Module: wine Branch: master Commit: d6160b142b72cf91d0967f38959db17782792cf9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6160b142b72cf91d0967f389… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Feb 26 17:46:01 2012 +0100 po: Wrap the 'Caps Lock' Catalan warning tooltip like the English one. --- po/ca.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/ca.po b/po/ca.po index f176631..90f4b99 100644 --- a/po/ca.po +++ b/po/ca.po @@ -1184,7 +1184,7 @@ msgstr "" "Tenir el bloqueig de majúscules activat pot causar que introduïu la\n" "contrasenya de forma incorrecta.\n" "\n" -"Premeu la tecla Bloc Maj en el vostre teclat per desactivar el bloqueig de " +"Premeu la tecla Bloc Maj en el vostre teclat per desactivar el bloqueig de\n" "majúscules abans d'introduir la vostre contrasenya." #: credui.rc:31

1 0

Francois Gouget : ddraw/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 27 Feb '12

27 Feb '12

Module: wine Branch: master Commit: cdac8cb17664947153f05093c0980a39bb75a45c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdac8cb17664947153f05093c… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Feb 25 13:37:10 2012 +0100 ddraw/tests: Fix compilation on systems that don't support nameless unions. --- dlls/ddraw/tests/ddraw1.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 9f2b394..02c3b4d 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -160,15 +160,15 @@ static void emit_tquad(void **ptr, WORD base_idx) inst->bSize = sizeof(*tri); inst->wCount = 2; - tri->v1 = base_idx; - tri->v2 = base_idx + 1; - tri->v3 = base_idx + 2; + U1(*tri).v1 = base_idx; + U2(*tri).v2 = base_idx + 1; + U3(*tri).v3 = base_idx + 2; tri->wFlags = D3DTRIFLAG_START; ++tri; - tri->v1 = base_idx + 2; - tri->v2 = base_idx + 1; - tri->v3 = base_idx + 3; + U1(*tri).v1 = base_idx + 2; + U2(*tri).v2 = base_idx + 1; + U3(*tri).v3 = base_idx + 3; tri->wFlags = D3DTRIFLAG_ODD; ++tri;

1 0

Nikolay Sivov : msxml3: Properly escape character data in text nodes.
by Alexandre Julliard 27 Feb '12

27 Feb '12

Module: wine Branch: master Commit: 5016f7ba4a36265bd1bff3e5abe81213ed5c6ec0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5016f7ba4a36265bd1bff3e5a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 24 23:20:48 2012 +0300 msxml3: Properly escape character data in text nodes. --- dlls/msxml3/mxwriter.c | 41 ++++++++++++++++++++---- dlls/msxml3/tests/saxreader.c | 70 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 103 insertions(+), 8 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index cb1a67f..72db31d 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -68,6 +68,12 @@ typedef enum MXWriter_LastProp } mxwriter_prop; +typedef enum +{ + EscapeValue, + EscapeText +} escape_mode; + typedef struct { char *data; @@ -94,6 +100,7 @@ typedef struct VARIANT_BOOL props[MXWriter_LastProp]; BOOL prop_changed; + BOOL cdata; BSTR version; @@ -275,7 +282,7 @@ static void close_output_buffer(mxwriter *This) '"' -> """ '>' -> ">" */ -static WCHAR *get_escaped_string(const WCHAR *str, int *len) +static WCHAR *get_escaped_string(const WCHAR *str, escape_mode mode, int *len) { static const WCHAR ltW[] = {'&','l','t',';'}; static const WCHAR ampW[] = {'&','a','m','p',';'}; @@ -311,14 +318,18 @@ static WCHAR *get_escaped_string(const WCHAR *str, int *len) memcpy(ptr, ampW, sizeof(ampW)); ptr += sizeof(ampW)/sizeof(WCHAR); break; - case '"': - memcpy(ptr, equotW, sizeof(equotW)); - ptr += sizeof(equotW)/sizeof(WCHAR); - break; case '>': memcpy(ptr, gtW, sizeof(gtW)); ptr += sizeof(gtW)/sizeof(WCHAR); break; + case '"': + if (mode == EscapeValue) + { + memcpy(ptr, equotW, sizeof(equotW)); + ptr += sizeof(equotW)/sizeof(WCHAR); + break; + } + /* fallthrough for text mode */ default: *ptr++ = *str; break; @@ -429,6 +440,7 @@ static inline HRESULT flush_output_buffer(mxwriter *This) { close_element_starttag(This); set_element_name(This, NULL, 0); + This->cdata = FALSE; return write_data_to_stream(This); } @@ -978,7 +990,7 @@ static HRESULT WINAPI SAXContentHandler_startElement( hr = ISAXAttributes_getValue(attr, i, &str, &len); if (FAILED(hr)) return hr; - escaped = get_escaped_string(str, &len); + escaped = get_escaped_string(str, EscapeValue, &len); write_output_buffer_quoted(This->buffer, escaped, len); heap_free(escaped); } @@ -1040,7 +1052,19 @@ static HRESULT WINAPI SAXContentHandler_characters( set_element_name(This, NULL, 0); if (nchars) - write_output_buffer(This->buffer, chars, nchars); + { + if (This->cdata) + write_output_buffer(This->buffer, chars, nchars); + else + { + int len = nchars; + WCHAR *escaped; + + escaped = get_escaped_string(chars, EscapeText, &len); + write_output_buffer(This->buffer, escaped, len); + heap_free(escaped); + } + } return S_OK; } @@ -1203,6 +1227,7 @@ static HRESULT WINAPI SAXLexicalHandler_startCDATA(ISAXLexicalHandler *iface) TRACE("(%p)\n", This); write_output_buffer(This->buffer, scdataW, sizeof(scdataW)/sizeof(WCHAR)); + This->cdata = TRUE; return S_OK; } @@ -1215,6 +1240,7 @@ static HRESULT WINAPI SAXLexicalHandler_endCDATA(ISAXLexicalHandler *iface) TRACE("(%p)\n", This); write_output_buffer(This->buffer, ecdataW, sizeof(ecdataW)/sizeof(WCHAR)); + This->cdata = FALSE; return S_OK; } @@ -1296,6 +1322,7 @@ HRESULT MXWriter_create(MSXML_VERSION version, IUnknown *outer, void **ppObj) This->xml_enc = XmlEncoding_UTF16; This->element = NULL; + This->cdata = FALSE; This->dest = NULL; This->dest_written = 0; diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index cfead73..74afc67 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -2439,13 +2439,29 @@ static void test_mxwriter_startendelement(void) free_bstrs(); } +struct writer_characters_t { + const GUID *clsid; + const char *data; + const char *output; +}; + +static const struct writer_characters_t writer_characters[] = { + { &CLSID_MXXMLWriter, "< > & \"", "< > & \"" }, + { &CLSID_MXXMLWriter30, "< > & \"", "< > & \"" }, + { &CLSID_MXXMLWriter40, "< > & \"", "< > & \"" }, + { &CLSID_MXXMLWriter60, "< > & \"", "< > & \"" }, + { NULL } +}; + static void test_mxwriter_characters(void) { static const WCHAR chardataW[] = {'T','E','S','T','C','H','A','R','D','A','T','A',' ','.',0}; + const struct writer_characters_t *table = writer_characters; ISAXContentHandler *content; IMXWriter *writer; VARIANT dest; HRESULT hr; + int i = 0; hr = CoCreateInstance(&CLSID_MXXMLWriter, NULL, CLSCTX_INPROC_SERVER, &IID_IMXWriter, (void**)&writer); @@ -2515,6 +2531,54 @@ static void test_mxwriter_characters(void) ISAXContentHandler_Release(content); IMXWriter_Release(writer); + /* batch tests */ + while (table->clsid) + { + ISAXContentHandler *content; + IMXWriter *writer; + HRESULT hr; + + if (!is_clsid_supported(table->clsid, mxwriter_support_data)) + { + table++; + i++; + continue; + } + + hr = CoCreateInstance(table->clsid, NULL, CLSCTX_INPROC_SERVER, + &IID_IMXWriter, (void**)&writer); + EXPECT_HR(hr, S_OK); + + hr = IMXWriter_QueryInterface(writer, &IID_ISAXContentHandler, (void**)&content); + EXPECT_HR(hr, S_OK); + + hr = IMXWriter_put_omitXMLDeclaration(writer, VARIANT_TRUE); + EXPECT_HR(hr, S_OK); + + hr = ISAXContentHandler_startDocument(content); + EXPECT_HR(hr, S_OK); + + hr = ISAXContentHandler_characters(content, _bstr_(table->data), strlen(table->data)); + EXPECT_HR(hr, S_OK); + + /* test output */ + if (hr == S_OK) + { + VARIANT dest; + + V_VT(&dest) = VT_EMPTY; + hr = IMXWriter_get_output(writer, &dest); + EXPECT_HR(hr, S_OK); + ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); + ok(!lstrcmpW(_bstr_(table->output), V_BSTR(&dest)), + "test %d: got wrong content %s, expected %s\n", i, wine_dbgstr_w(V_BSTR(&dest)), table->output); + VariantClear(&dest); + } + + table++; + i++; + } + free_bstrs(); } @@ -2975,6 +3039,10 @@ static void test_mxwriter_cdata(void) hr = ISAXLexicalHandler_startCDATA(lexical); EXPECT_HR(hr, S_OK); + /* all these are escaped for text nodes */ + hr = ISAXContentHandler_characters(content, _bstr_("< > & \""), 7); + EXPECT_HR(hr, S_OK); + hr = ISAXLexicalHandler_endCDATA(lexical); EXPECT_HR(hr, S_OK); @@ -2982,7 +3050,7 @@ static void test_mxwriter_cdata(void) hr = IMXWriter_get_output(writer, &dest); EXPECT_HR(hr, S_OK); ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); - ok(!lstrcmpW(_bstr_("<![CDATA[<![CDATA[]]>"), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + ok(!lstrcmpW(_bstr_("<![CDATA[<![CDATA[< > & \"]]>"), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); VariantClear(&dest); ISAXContentHandler_Release(content);

1 0

Vincent Povirk : shell32: Properly double-null-terminate the filter in the run/browse dialog.
by Alexandre Julliard 27 Feb '12

27 Feb '12

Module: wine Branch: master Commit: dd65da7dcec388036f875c91ed8197368001ab7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd65da7dcec388036f875c91e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sun Feb 26 13:05:00 2012 -0600 shell32: Properly double-null-terminate the filter in the run/browse dialog. --- dlls/shell32/dialogs.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/dialogs.c b/dlls/shell32/dialogs.c index 84d8799..28a25fd 100644 --- a/dlls/shell32/dialogs.c +++ b/dlls/shell32/dialogs.c @@ -266,7 +266,7 @@ static INT_PTR CALLBACK RunDlgProc (HWND hwnd, UINT message, WPARAM wParam, LPAR LoadStringW(shell32_hInstance, IDS_RUNDLG_BROWSE_FILTER_EXE, filter_exe, 256); LoadStringW(shell32_hInstance, IDS_RUNDLG_BROWSE_FILTER_ALL, filter_all, 256); LoadStringW(shell32_hInstance, IDS_RUNDLG_BROWSE_CAPTION, szCaption, MAX_PATH); - snprintfW( filter, MAX_PATH, filterW, filter_exe, 0, 0, filter_all, 0 ); + snprintfW( filter, MAX_PATH, filterW, filter_exe, 0, 0, filter_all, 0, 0 ); ZeroMemory(&ofn, sizeof(ofn)); ofn.lStructSize = sizeof(OPENFILENAMEW);

1 0

Christian Costa : d3dxof: Empty arrays can have the semicolon at the end or not so handle both cases and add tests for them .
by Alexandre Julliard 27 Feb '12

27 Feb '12

Module: wine Branch: master Commit: 6ee15adf4d607558827e467e4da37fb111fe783c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ee15adf4d607558827e467e4… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sat Feb 25 12:36:51 2012 +0100 d3dxof: Empty arrays can have the semicolon at the end or not so handle both cases and add tests for them. This fixes a regression introduced by commit 07931f73f0544e067c5a86b4ac92723c11600dd3. --- dlls/d3dxof/parsing.c | 6 +++++- dlls/d3dxof/tests/d3dxof.c | 31 ++++++++++++++++++++++++++++--- 2 files changed, 33 insertions(+), 4 deletions(-) diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index b2f51bb..f40c202 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -1315,7 +1315,11 @@ static BOOL parse_object_members_list(parse_buffer * buf) } } - if (buf->txt && (check_TOKEN(buf) != TOKEN_CBRACE) && (check_TOKEN(buf) != TOKEN_NAME)) + /* Empty arrays can have the semicolon at the end or not so remove it if any and skip next check */ + if (!nb_elems && (check_TOKEN(buf) == TOKEN_SEMICOLON)) + get_TOKEN(buf); + + if (nb_elems && buf->txt && (check_TOKEN(buf) != TOKEN_CBRACE) && (check_TOKEN(buf) != TOKEN_NAME)) { token = get_TOKEN(buf); if ((token != TOKEN_SEMICOLON) && (token != TOKEN_COMMA)) diff --git a/dlls/d3dxof/tests/d3dxof.c b/dlls/d3dxof/tests/d3dxof.c index c166054..0c3a295 100644 --- a/dlls/d3dxof/tests/d3dxof.c +++ b/dlls/d3dxof/tests/d3dxof.c @@ -101,7 +101,7 @@ static char template_syntax_empty_array[] = "DWORD dummy;\n" "}\n"; -static char object_syntax_empty_array[] = +static char object_syntax_empty_array_semicolon[] = "xof 0302txt 0064\n" "Buffer\n" "{\n" @@ -110,6 +110,15 @@ static char object_syntax_empty_array[] = "1234;\n" "}\n"; +static char object_syntax_empty_array_nosemicolon[] = +"xof 0302txt 0064\n" +"Buffer\n" +"{\n" +"0;\n" +"1234;\n" +"}\n"; + + static void init_function_pointers(void) { /* We have to use LoadLibrary as no d3dxof functions are referenced directly */ @@ -502,8 +511,23 @@ static void test_syntax(void) hr = IDirectXFile_RegisterTemplates(lpDirectXFile, template_syntax_empty_array, sizeof(template_syntax_empty_array) - 1); ok(hr == DXFILE_OK, "IDirectXFileImpl_RegisterTemplates: %x\n", hr); - dxflm.lpMemory = &object_syntax_empty_array; - dxflm.dSize = sizeof(object_syntax_empty_array) - 1; + dxflm.lpMemory = &object_syntax_empty_array_semicolon; + dxflm.dSize = sizeof(object_syntax_empty_array_semicolon) - 1; + 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); + + ref = IDirectXFileEnumObject_Release(lpdxfeo); + ok(ref == 0, "Got refcount %d, expected 0\n", ref); + if (hr == DXFILE_OK) + { + ref = IDirectXFileData_Release(lpdxfd); + ok(ref == 0, "Got refcount %d, expected 0\n", ref); + } + + dxflm.lpMemory = &object_syntax_empty_array_nosemicolon; + dxflm.dSize = sizeof(object_syntax_empty_array_nosemicolon) - 1; hr = IDirectXFile_CreateEnumObject(lpDirectXFile, &dxflm, DXFILELOAD_FROMMEMORY, &lpdxfeo); ok(hr == DXFILE_OK, "IDirectXFile_CreateEnumObject: %x\n", hr); hr = IDirectXFileEnumObject_GetNextDataObject(lpdxfeo, &lpdxfd); @@ -516,6 +540,7 @@ static void test_syntax(void) ref = IDirectXFileData_Release(lpdxfd); ok(ref == 0, "Got refcount %d, expected 0\n", ref); } + ref = IDirectXFile_Release(lpDirectXFile); ok(ref == 0, "Got refcount %d, expected 0\n", ref); }

1 0

Stefan Dösinger : ddraw/tests: LONG/ ULONG and error checking fixes.
by Alexandre Julliard 27 Feb '12

27 Feb '12

Module: wine Branch: master Commit: f8d6d0300b026d39ac1ad82e3e8a2ed1fd1f5616 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8d6d0300b026d39ac1ad82e3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Feb 27 12:11:15 2012 +0100 ddraw/tests: LONG/ULONG and error checking fixes. --- dlls/ddraw/tests/ddraw1.c | 26 ++++++++++++++------------ dlls/ddraw/tests/ddraw2.c | 22 +++++++++++----------- dlls/ddraw/tests/ddraw4.c | 22 +++++++++++----------- 3 files changed, 36 insertions(+), 34 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 02c3b4d..3d173d9 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -884,7 +884,7 @@ static void test_coop_level_threaded(void) destroy_window_thread(&p); } -static LONG get_refcount(IUnknown *test_iface) +static ULONG get_refcount(IUnknown *test_iface) { IUnknown_AddRef(test_iface); return IUnknown_Release(test_iface); @@ -895,7 +895,7 @@ static void test_viewport_interfaces(void) IDirectDraw *ddraw; IDirect3D *d3d; HRESULT hr; - LONG ref; + ULONG ref; IDirect3DViewport *viewport; IDirect3DViewport2 *viewport2; IDirect3DViewport3 *viewport3; @@ -921,9 +921,9 @@ static void test_viewport_interfaces(void) hr = IDirect3D_CreateViewport(d3d, &viewport, NULL); ok(SUCCEEDED(hr), "Failed to create viewport, hr %#x.\n", hr); ref = get_refcount((IUnknown *)viewport); - ok(ref == 1, "Initial IDirect3DViewport refcount is %d\n", ref); + ok(ref == 1, "Initial IDirect3DViewport refcount is %u\n", ref); ref = get_refcount((IUnknown *)d3d); - ok(ref == 2, "IDirect3D refcount is %d\n", ref); + ok(ref == 2, "IDirect3D refcount is %u\n", ref); /* E_FAIL return values are returned by Winetestbot Windows NT machines. While not supporting * newer interfaces is legitimate for old ddraw versions, E_FAIL violates Microsoft's rules @@ -936,25 +936,27 @@ static void test_viewport_interfaces(void) /* NULL iid: Segfaults */ hr = IDirect3DViewport_QueryInterface(viewport, &IID_IDirect3DViewport2, (void **)&viewport2); - ok(SUCCEEDED(hr) || broken(hr == E_FAIL), "Failed to QI IDirect3DViewport2, hr %#x.\n", hr); + ok(SUCCEEDED(hr) || hr == E_NOINTERFACE || broken(hr == E_FAIL), + "Failed to QI IDirect3DViewport2, hr %#x.\n", hr); if (viewport2) { ref = get_refcount((IUnknown *)viewport); - ok(ref == 2, "IDirect3DViewport refcount is %d\n", ref); + ok(ref == 2, "IDirect3DViewport refcount is %u\n", ref); ref = get_refcount((IUnknown *)viewport2); - ok(ref == 2, "IDirect3DViewport2 refcount is %d\n", ref); + ok(ref == 2, "IDirect3DViewport2 refcount is %u\n", ref); IDirect3DViewport2_Release(viewport2); viewport2 = NULL; } hr = IDirect3DViewport_QueryInterface(viewport, &IID_IDirect3DViewport3, (void **)&viewport3); - ok(SUCCEEDED(hr) || broken(hr == E_FAIL), "Failed to QI IDirect3DViewport3, hr %#x.\n", hr); + ok(SUCCEEDED(hr) || hr == E_NOINTERFACE || broken(hr == E_FAIL), + "Failed to QI IDirect3DViewport3, hr %#x.\n", hr); if (viewport3) { ref = get_refcount((IUnknown *)viewport); - ok(ref == 2, "IDirect3DViewport refcount is %d\n", ref); + ok(ref == 2, "IDirect3DViewport refcount is %u\n", ref); ref = get_refcount((IUnknown *)viewport3); - ok(ref == 2, "IDirect3DViewport3 refcount is %d\n", ref); + ok(ref == 2, "IDirect3DViewport3 refcount is %u\n", ref); IDirect3DViewport3_Release(viewport3); } @@ -963,9 +965,9 @@ static void test_viewport_interfaces(void) if (unknown) { ref = get_refcount((IUnknown *)viewport); - ok(ref == 2, "IDirect3DViewport refcount is %d\n", ref); + ok(ref == 2, "IDirect3DViewport refcount is %u\n", ref); ref = get_refcount(unknown); - ok(ref == 2, "IUnknown refcount is %d\n", ref); + ok(ref == 2, "IUnknown refcount is %u\n", ref); IUnknown_Release(unknown); } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 35c3a7b..ba8d3b6 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -1179,7 +1179,7 @@ done: if (ddraw) IDirectDraw2_Release(ddraw); } -static LONG get_refcount(IUnknown *test_iface) +static ULONG get_refcount(IUnknown *test_iface) { IUnknown_AddRef(test_iface); return IUnknown_Release(test_iface); @@ -1190,7 +1190,7 @@ static void test_viewport_interfaces(void) IDirectDraw2 *ddraw; IDirect3D2 *d3d; HRESULT hr; - LONG ref, old_d3d_ref; + ULONG ref, old_d3d_ref; IDirect3DViewport *viewport; IDirect3DViewport2 *viewport2; IDirect3DViewport3 *viewport3; @@ -1216,9 +1216,9 @@ static void test_viewport_interfaces(void) hr = IDirect3D2_CreateViewport(d3d, &viewport2, NULL); ok(SUCCEEDED(hr), "Failed to create viewport, hr %#x.\n", hr); ref = get_refcount((IUnknown *)viewport2); - ok(ref == 1, "Initial IDirect3DViewport2 refcount is %d\n", ref); + ok(ref == 1, "Initial IDirect3DViewport2 refcount is %u\n", ref); ref = get_refcount((IUnknown *)d3d); - ok(ref == old_d3d_ref, "IDirect3D2 refcount is %d\n", ref); + ok(ref == old_d3d_ref, "IDirect3D2 refcount is %u\n", ref); gamma = (IDirectDrawGammaControl *)0xdeadbeef; hr = IDirect3DViewport2_QueryInterface(viewport2, &IID_IDirectDrawGammaControl, (void **)&gamma); @@ -1232,21 +1232,21 @@ static void test_viewport_interfaces(void) if (viewport) { ref = get_refcount((IUnknown *)viewport); - ok(ref == 2, "IDirect3DViewport refcount is %d\n", ref); + ok(ref == 2, "IDirect3DViewport refcount is %u\n", ref); ref = get_refcount((IUnknown *)viewport2); - ok(ref == 2, "IDirect3DViewport2 refcount is %d\n", ref); + ok(ref == 2, "IDirect3DViewport2 refcount is %u\n", ref); IDirect3DViewport_Release(viewport); viewport = NULL; } hr = IDirect3DViewport2_QueryInterface(viewport2, &IID_IDirect3DViewport3, (void **)&viewport3); - ok(SUCCEEDED(hr), "Failed to QI IDirect3DViewport3, hr %#x.\n", hr); + ok(SUCCEEDED(hr) || hr == E_NOINTERFACE, "Failed to QI IDirect3DViewport3, hr %#x.\n", hr); if (viewport3) { ref = get_refcount((IUnknown *)viewport2); - ok(ref == 2, "IDirect3DViewport2 refcount is %d\n", ref); + ok(ref == 2, "IDirect3DViewport2 refcount is %u\n", ref); ref = get_refcount((IUnknown *)viewport3); - ok(ref == 2, "IDirect3DViewport3 refcount is %d\n", ref); + ok(ref == 2, "IDirect3DViewport3 refcount is %u\n", ref); IDirect3DViewport3_Release(viewport3); } @@ -1255,9 +1255,9 @@ static void test_viewport_interfaces(void) if (unknown) { ref = get_refcount((IUnknown *)viewport2); - ok(ref == 2, "IDirect3DViewport2 refcount is %d\n", ref); + ok(ref == 2, "IDirect3DViewport2 refcount is %u\n", ref); ref = get_refcount(unknown); - ok(ref == 2, "IUnknown refcount is %d\n", ref); + ok(ref == 2, "IUnknown refcount is %u\n", ref); IUnknown_Release(unknown); } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 89d5799..d9ed90d 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -1310,7 +1310,7 @@ static void test_texture_load_ckey(void) IDirectDraw4_Release(ddraw); } -static LONG get_refcount(IUnknown *test_iface) +static ULONG get_refcount(IUnknown *test_iface) { IUnknown_AddRef(test_iface); return IUnknown_Release(test_iface); @@ -1321,7 +1321,7 @@ static void test_viewport_interfaces(void) IDirectDraw4 *ddraw; IDirect3D3 *d3d; HRESULT hr, old_d3d_ref; - LONG ref; + ULONG ref; IDirect3DViewport *viewport; IDirect3DViewport2 *viewport2; IDirect3DViewport3 *viewport3; @@ -1346,9 +1346,9 @@ static void test_viewport_interfaces(void) hr = IDirect3D3_CreateViewport(d3d, &viewport3, NULL); ok(SUCCEEDED(hr), "Failed to create viewport, hr %#x.\n", hr); ref = get_refcount((IUnknown *)viewport3); - ok(ref == 1, "Initial IDirect3DViewport3 refcount is %d\n", ref); + ok(ref == 1, "Initial IDirect3DViewport3 refcount is %u\n", ref); ref = get_refcount((IUnknown *)d3d); - ok(ref == old_d3d_ref, "IDirect3D3 refcount is %d\n", ref); + ok(ref == old_d3d_ref, "IDirect3D3 refcount is %u\n", ref); gamma = (IDirectDrawGammaControl *)0xdeadbeef; hr = IDirect3DViewport2_QueryInterface(viewport3, &IID_IDirectDrawGammaControl, (void **)&gamma); @@ -1362,9 +1362,9 @@ static void test_viewport_interfaces(void) if (viewport) { ref = get_refcount((IUnknown *)viewport); - ok(ref == 2, "IDirect3DViewport refcount is %d\n", ref); + ok(ref == 2, "IDirect3DViewport refcount is %u\n", ref); ref = get_refcount((IUnknown *)viewport3); - ok(ref == 2, "IDirect3DViewport3 refcount is %d\n", ref); + ok(ref == 2, "IDirect3DViewport3 refcount is %u\n", ref); IDirect3DViewport_Release(viewport); viewport = NULL; } @@ -1374,20 +1374,20 @@ static void test_viewport_interfaces(void) if (viewport2) { ref = get_refcount((IUnknown *)viewport2); - ok(ref == 2, "IDirect3DViewport2 refcount is %d\n", ref); + ok(ref == 2, "IDirect3DViewport2 refcount is %u\n", ref); ref = get_refcount((IUnknown *)viewport3); - ok(ref == 2, "IDirect3DViewport3 refcount is %d\n", ref); + ok(ref == 2, "IDirect3DViewport3 refcount is %u\n", ref); IDirect3DViewport3_Release(viewport2); } - hr = IDirect3DViewport3_QueryInterface(viewport2, &IID_IUnknown, (void **)&unknown); + hr = IDirect3DViewport3_QueryInterface(viewport3, &IID_IUnknown, (void **)&unknown); ok(SUCCEEDED(hr), "Failed to QI IUnknown, hr %#x.\n", hr); if (unknown) { ref = get_refcount((IUnknown *)viewport3); - ok(ref == 2, "IDirect3DViewport3 refcount is %d\n", ref); + ok(ref == 2, "IDirect3DViewport3 refcount is %u\n", ref); ref = get_refcount(unknown); - ok(ref == 2, "IUnknown refcount is %d\n", ref); + ok(ref == 2, "IUnknown refcount is %u\n", ref); IUnknown_Release(unknown); }

1 0

Alexander Morozov : msvcr90: realloc can move memory block.
by Alexandre Julliard 27 Feb '12

27 Feb '12

Module: wine Branch: master Commit: 35a4b7dc0e78c8447ef1b0f28f8f3006bc49fd2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=35a4b7dc0e78c8447ef1b0f28… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Mon Feb 27 15:39:11 2012 +0400 msvcr90: realloc can move memory block. --- dlls/msvcr90/msvcr90.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcr90/msvcr90.c b/dlls/msvcr90/msvcr90.c index 6b97e2f..663dd37 100644 --- a/dlls/msvcr90/msvcr90.c +++ b/dlls/msvcr90/msvcr90.c @@ -192,7 +192,7 @@ void* CDECL _recalloc(void* mem, size_t num, size_t size) } if(size>old_size) - memset((BYTE*)mem+old_size, 0, size-old_size); + memset((BYTE*)ret+old_size, 0, size-old_size); return ret; }

1 0