wine-commits February 2012

wine-commits@winehq.org

2 participants
442 discussions

Francois Gouget : winedbg: The winedbg debug channel is unused in crashdlg. c so remove it.
by Alexandre Julliard 20 Feb '12

20 Feb '12

Module: wine Branch: master Commit: 4f2d3e9b489b05baa5068aaf8d13e4aaa20a8943 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f2d3e9b489b05baa5068aaf8… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Feb 19 23:31:30 2012 +0100 winedbg: The winedbg debug channel is unused in crashdlg.c so remove it. --- programs/winedbg/crashdlg.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/programs/winedbg/crashdlg.c b/programs/winedbg/crashdlg.c index fe13502..4e02a4b 100644 --- a/programs/winedbg/crashdlg.c +++ b/programs/winedbg/crashdlg.c @@ -26,13 +26,10 @@ #include "shellapi.h" #include "psapi.h" -#include "wine/debug.h" #include "wine/unicode.h" #include "resource.h" -WINE_DEFAULT_DEBUG_CHANNEL(winedbg); - #define MAX_PROGRAM_NAME_LENGTH 80 static char *crash_log;

1 0

Francois Gouget : comctl32/tests: Make cbt_hook_proc() static.
by Alexandre Julliard 20 Feb '12

20 Feb '12

Module: wine Branch: master Commit: 07d9d04de845990cf89851d2d542b1ad96260e22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07d9d04de845990cf89851d2d… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Feb 19 23:31:16 2012 +0100 comctl32/tests: Make cbt_hook_proc() static. --- dlls/comctl32/tests/toolbar.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index 2444975..9de319f 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -1776,7 +1776,7 @@ static LRESULT WINAPI toolbar_subclass_proc(HWND hwnd, UINT msg, WPARAM wParam, return CallWindowProcA(oldproc, hwnd, msg, wParam, lParam); } -LRESULT CALLBACK cbt_hook_proc(int code, WPARAM wParam, LPARAM lParam) +static LRESULT CALLBACK cbt_hook_proc(int code, WPARAM wParam, LPARAM lParam) { if (code == HCBT_CREATEWND) {

1 0

Jaka Kranjc : po: Update Slovenian translation.
by Alexandre Julliard 20 Feb '12

20 Feb '12

Module: wine Branch: master Commit: d01400fab0ca1b5d34a7455fc023f8838716e273 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d01400fab0ca1b5d34a7455fc… Author: Jaka Kranjc <smgl(a)lynxlynx.info> Date: Sun Feb 19 19:10:38 2012 +0100 po: Update Slovenian translation. --- po/sl.po | 291 +++++++++++++++++++++++++------------------------------------- 1 files changed, 118 insertions(+), 173 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d01400fab0ca1b5d34a74…

1 0

Luca Bennati : po: Update Italian translation.
by Alexandre Julliard 20 Feb '12

20 Feb '12

Module: wine Branch: master Commit: 22a37c633583f5660584b383f26dc4691fb576bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=22a37c633583f5660584b383f… Author: Luca Bennati <lucak3(a)gmail.com> Date: Fri Feb 17 10:31:09 2012 +0100 po: Update Italian translation. --- po/it.po | 59 ++++++++++++++++++++++++----------------------------------- 1 files changed, 24 insertions(+), 35 deletions(-) diff --git a/po/it.po b/po/it.po index 5bb9940..4c07c8c 100644 --- a/po/it.po +++ b/po/it.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-02-01 15:00+0100\n" +"PO-Revision-Date: 2012-02-17 10:25+0100\n" "Last-Translator: Luca Bennati <lucak3(a)gmail.com>\n" "Language-Team: none\n" "Language: Italian\n" @@ -5575,7 +5575,7 @@ msgstr "LB_SETCOUNT inviato non valido.\n" #: winerror.mc:2566 msgid "No tab stops on this list box.\n" -msgstr "Nessun tabstop in questa list box.\n" +msgstr "Nessun tab stop in questa list box.\n" #: winerror.mc:2571 msgid "Can't destroy object owned by another thread.\n" @@ -6691,7 +6691,7 @@ msgstr "" "Installa un prodotto:\n" "\t/i {pacchetto|codice_prodotto} [proprietà]\n" "\t/pacchetto {pacchetto|codice_prodotto} [proprietà]\n" -"\t/a pacchetto [property]\n" +"\t/a pacchetto [proprietà]\n" "Ripara un'installazione:\n" "\t/f[p|o|e|d|c|a|u|m|s|v] {pacchetto|codice_prodotto}\n" "Disinstalla un prodotto:\n" @@ -7917,17 +7917,14 @@ msgid "Administrative Tools" msgstr "Strumenti di amministrazione" #: shell32.rc:218 -#, fuzzy msgid "Music" msgstr "Musica" #: shell32.rc:219 -#, fuzzy msgid "Pictures" msgstr "Immagini" #: shell32.rc:220 -#, fuzzy msgid "Videos" msgstr "Video" @@ -7945,7 +7942,7 @@ msgstr "Collegamenti" #: shell32.rc:223 msgid "Slide Shows" -msgstr "Slide Shows" +msgstr "Presentazioni" #: shell32.rc:224 msgid "Playlists" @@ -7965,19 +7962,19 @@ msgstr "Modello" #: shell32.rc:225 msgid "Sample Music" -msgstr "" +msgstr "Musica condivisa" #: shell32.rc:226 msgid "Sample Pictures" -msgstr "" +msgstr "Immagini condivise" #: shell32.rc:227 msgid "Sample Playlists" -msgstr "" +msgstr "Playlist condivise" #: shell32.rc:228 msgid "Sample Videos" -msgstr "" +msgstr "Video condivisi" #: shell32.rc:229 msgid "Saved Games" @@ -9626,7 +9623,6 @@ msgstr "" "se chiamato dalla linea di comando.\n" #: cmd.rc:176 -#, fuzzy msgid "" "Start a program, or open a document in the program normally used for files " "with that suffix.\n" @@ -9662,13 +9658,6 @@ msgstr "" "/ProgIDOpen Apri un documento usando il seguente progID.\n" "/L Mostra l'accordo di licenza con l'utente finale.\n" "/? Mostra questo aiuto ed esci.\n" -"\n" -"start.exe versione 0.2 Copyright (C) 2003, Dan Kegel\n" -"Start è fornito SENZA GARANZIA di alcun tipo; per ulteriori informazioni " -"eseguire start con l'opzione /L.\n" -"Questo è software libero e sei invitato a redistribuirlo sotto alcune " -"condizioni;\n" -" eseguire 'start' con l'opzione /L per ulteriori informazioni.\n" #: cmd.rc:201 msgid "TIME sets or shows the current system time.\n" @@ -9744,8 +9733,8 @@ msgid "" "PUSHD <directoryname> saves the current directory onto a\n" "stack, and then changes the current directory to the supplied one.\n" msgstr "" -"PUSHD <nomedellacartella> salva la cartella attuale su di uno\n" -"stack e poi la cambia con quella passata.\n" +"PUSHD <nomedellacartella> salva la cartella attuale in una\n" +"pila e poi la cambia con quella passata.\n" #: cmd.rc:238 msgid "POPD changes current directory to the last one saved with PUSHD.\n" @@ -9819,7 +9808,6 @@ msgstr "" "sistema operativo o alla shell dal quale hai chiamato cmd.\n" #: cmd.rc:305 -#, fuzzy msgid "" "CMD built-in commands are:\n" "ASSOC\t\tShow or modify file extension associations\n" @@ -9890,6 +9878,7 @@ msgstr "" "RD (RMDIR)\tElimina una sottocartella\n" "SET\t\tConfigura o mostra le variabili d'ambiente\n" "SETLOCAL\tInizia localizzazione dei cambiamenti d'ambiente in un file batch\n" +"START\t\tAvvia un programma o apre un documento con il programma associato\n" "TIME\t\tConfigura o cambia l'orario di sistema attuale\n" "TITLE\t\tConfigura il titolo della finestra per la sessione di CMD\n" "TYPE\t\tInserisce il contenuto di un file di testo\n" @@ -10407,7 +10396,7 @@ msgstr "F" #: notepad.rc:132 wordpad.rc:277 msgctxt "accelerator Replace" msgid "H" -msgstr "" +msgstr "H" #: notepad.rc:133 wordpad.rc:286 msgctxt "accelerator New" @@ -10422,27 +10411,27 @@ msgstr "O" #: notepad.rc:135 regedit.rc:321 wordpad.rc:289 msgctxt "accelerator Print" msgid "P" -msgstr "" +msgstr "P" #: notepad.rc:136 wordpad.rc:288 msgctxt "accelerator Save" msgid "S" -msgstr "" +msgstr "S" #: notepad.rc:137 msgctxt "accelerator Paste" msgid "V" -msgstr "" +msgstr "V" #: notepad.rc:138 wordpad.rc:279 msgctxt "accelerator Cut" msgid "X" -msgstr "" +msgstr "X" #: notepad.rc:139 wordpad.rc:281 msgctxt "accelerator Undo" msgid "Z" -msgstr "" +msgstr "Z" #: notepad.rc:66 msgid "Page &p" @@ -13509,7 +13498,7 @@ msgstr "Informazioni sulla versione" #: winefile.rc:197 msgctxt "accelerator Fullscreen" msgid "S" -msgstr "" +msgstr "S" #: winefile.rc:89 msgid "Applying font settings" @@ -13801,7 +13790,7 @@ msgstr "&Formato del carattere" #: wordpad.rc:61 msgid "&Def. char format" -msgstr "Formato del &def. car" +msgstr "Formato pre&definito del carattere" #: wordpad.rc:62 msgid "Paragrap&h format" @@ -13938,17 +13927,17 @@ msgstr "Barre" #: wordpad.rc:273 msgctxt "accelerator Align Left" msgid "L" -msgstr "" +msgstr "L" #: wordpad.rc:274 msgctxt "accelerator Align Center" msgid "E" -msgstr "" +msgstr "E" #: wordpad.rc:275 msgctxt "accelerator Align Right" msgid "R" -msgstr "" +msgstr "R" #: wordpad.rc:282 msgctxt "accelerator Redo" @@ -13963,12 +13952,12 @@ msgstr "B" #: wordpad.rc:284 msgctxt "accelerator Italic" msgid "I" -msgstr "" +msgstr "I" #: wordpad.rc:285 msgctxt "accelerator Underline" msgid "U" -msgstr "" +msgstr "U" #: wordpad.rc:136 msgid "All documents (*.*)"

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 20 Feb '12

20 Feb '12

Module: wine Branch: master Commit: 64f5ce5b3b77156a7ed776c308084c05c2470064 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64f5ce5b3b77156a7ed776c30… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Sat Feb 18 11:36:23 2012 +0200 po: Update Finnish translation. --- po/fi.po | 916 ++++++++++++++++++++++++++++++++++---------------------------- 1 files changed, 496 insertions(+), 420 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=64f5ce5b3b77156a7ed77…

1 0

Gustavo Henrique Milaré : po: Update Brazilian Portuguese translation.
by Alexandre Julliard 20 Feb '12

20 Feb '12

Module: wine Branch: master Commit: 8021d73a60dcd5ff41d90025476027c7bc4c5c48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8021d73a60dcd5ff41d900254… Author: Gustavo Henrique Milaré <gugamilare(a)gmail.com> Date: Fri Feb 17 16:14:33 2012 -0200 po: Update Brazilian Portuguese translation. --- po/pt_BR.po | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index 5acf55f..490620e 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-02-11 22:12-0200\n" +"PO-Revision-Date: 2012-02-17 16:03-0200\n" "Last-Translator: Gustavo Henrique Milaré <gugamilare(a)gmail.com>\n" "Language-Team: none\n" "Language: Portuguese (Brazil)\n" @@ -563,11 +563,11 @@ msgstr "&Cores do Usuário:" #: comdlg32.rc:281 comdlg32.rc:304 msgid "Color | Sol&id" -msgstr "Colorido|Sólid&o" +msgstr "Cor | &Sólida" #: comdlg32.rc:282 msgid "&Red:" -msgstr "Ver&m:" +msgstr "&Rubro:" #: comdlg32.rc:284 msgid "&Green:" @@ -579,12 +579,12 @@ msgstr "A&zul:" #: comdlg32.rc:288 msgid "&Hue:" -msgstr "Mat&iz:" +msgstr "&Matiz:" #: comdlg32.rc:290 msgctxt "Saturation" msgid "&Sat:" -msgstr "Sa&t:" +msgstr "&Sat:" #: comdlg32.rc:292 msgctxt "Luminance" @@ -2114,10 +2114,9 @@ msgstr "D&esativar todos os propósitos para este certificado" msgid "Enable &only the following purposes for this certificate:" msgstr "A&tivar apenas os seguintes propósitos para este certificado:" -# Ellipsis removed - not enough space in button #: cryptui.rc:250 msgid "Add &Purpose..." -msgstr "Adicionar &Propósito" +msgstr "Adicionar &Propósito..." #: cryptui.rc:254 msgid "Add Purpose"

1 0

Christian Costa : d3dxof: Fix parsing of empty array + tests.
by Alexandre Julliard 20 Feb '12

20 Feb '12

Module: wine Branch: master Commit: 07931f73f0544e067c5a86b4ac92723c11600dd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07931f73f0544e067c5a86b4a… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sun Feb 19 21:02:51 2012 +0100 d3dxof: Fix parsing of empty array + tests. --- dlls/d3dxof/parsing.c | 2 +- dlls/d3dxof/tests/d3dxof.c | 64 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 1 deletions(-) diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index a6e387d..b2f51bb 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -1315,7 +1315,7 @@ static BOOL parse_object_members_list(parse_buffer * buf) } } - if (nb_elems && buf->txt && (check_TOKEN(buf) != TOKEN_CBRACE) && (check_TOKEN(buf) != TOKEN_NAME)) + if (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 40ad10c..95dcd66 100644 --- a/dlls/d3dxof/tests/d3dxof.c +++ b/dlls/d3dxof/tests/d3dxof.c @@ -91,6 +91,25 @@ static char object_noname[] = "1; 2; 3;\n" "}\n"; +static char template_syntax_empty_array[] = +"xof 0302txt 0064\n" +"template Buffer\n" +"{\n" +"<3D82AB43-62DA-11CF-AB39-0020AF71E433>\n" +"DWORD num_elem;\n" +"array DWORD value[num_elem];\n" +"DWORD dummy;\n" +"}\n"; + +static char object_syntax_empty_array[] = +"xof 0302txt 0064\n" +"Buffer\n" +"{\n" +"0;\n" +";\n" +"1234;\n" +"}\n"; + static void init_function_pointers(void) { /* We have to use LoadLibrary as no d3dxof functions are referenced directly */ @@ -457,6 +476,50 @@ static void test_getname(void) ok(ref == 0, "Got refcount %d, expected 0\n", ref); } +static void test_syntax(void) +{ + HRESULT hr; + ULONG ref; + LPDIRECTXFILE lpDirectXFile = NULL; + LPDIRECTXFILEENUMOBJECT lpdxfeo; + LPDIRECTXFILEDATA lpdxfd; + DXFILELOADMEMORY dxflm; + + if (!pDirectXFileCreate) + { + win_skip("DirectXFileCreate is not available\n"); + return; + } + + hr = pDirectXFileCreate(&lpDirectXFile); + ok(hr == DXFILE_OK, "DirectXFileCreate: %x\n", hr); + if (!lpDirectXFile) + { + skip("Couldn't create DirectXFile interface\n"); + return; + } + + 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; + 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); + } + ref = IDirectXFile_Release(lpDirectXFile); + ok(ref == 0, "Got refcount %d, expected 0\n", ref); +} + /* 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 @@ -634,6 +697,7 @@ START_TEST(d3dxof) test_file_types(); test_compressed_files(); test_getname(); + test_syntax(); test_dump(); FreeLibrary(hd3dxof);

1 0

Christian Costa : d3dxof: Add tests for IDirectXFileData_GetName.
by Alexandre Julliard 20 Feb '12

20 Feb '12

Module: wine Branch: master Commit: ddecb6aae5d61fad0b95a76fe3e4ae178b4af8d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddecb6aae5d61fad0b95a76fe… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sun Feb 19 21:02:42 2012 +0100 d3dxof: Add tests for IDirectXFileData_GetName. --- dlls/d3dxof/tests/d3dxof.c | 95 ++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 92 insertions(+), 3 deletions(-) diff --git a/dlls/d3dxof/tests/d3dxof.c b/dlls/d3dxof/tests/d3dxof.c index 5c6315a..40ad10c 100644 --- a/dlls/d3dxof/tests/d3dxof.c +++ b/dlls/d3dxof/tests/d3dxof.c @@ -84,6 +84,13 @@ static char empty_bzip_file[] = "xof 0302bzip0064\x11\x00\x00\x00\x01\x00\x05\x0 static char empty_cmp_file[] = "xof 0302cmp 0064"; static char empty_xxxx_file[] = "xof 0302xxxx0064"; +static char object_noname[] = +"xof 0302txt 0064\n" +"Header\n" +"{\n" +"1; 2; 3;\n" +"}\n"; + static void init_function_pointers(void) { /* We have to use LoadLibrary as no d3dxof functions are referenced directly */ @@ -115,7 +122,7 @@ static void test_refcount(void) hr = pDirectXFileCreate(&lpDirectXFile); ok(hr == DXFILE_OK, "DirectXFileCreate: %x\n", hr); - if(!lpDirectXFile) + if (!lpDirectXFile) { skip("Couldn't create DirectXFile interface\n"); return; @@ -187,7 +194,7 @@ static void test_CreateEnumObject(void) hr = pDirectXFileCreate(&lpDirectXFile); ok(hr == DXFILE_OK, "DirectXFileCreate: %x\n", hr); - if(!lpDirectXFile) + if (!lpDirectXFile) { skip("Couldn't create DirectXFile interface\n"); return; @@ -369,6 +376,87 @@ static void test_compressed_files(void) IDirectXFile_Release(dxfile); } +static void test_getname(void) +{ + HRESULT hr; + ULONG ref; + LPDIRECTXFILE lpDirectXFile = NULL; + LPDIRECTXFILEENUMOBJECT lpdxfeo; + LPDIRECTXFILEDATA lpdxfd; + DXFILELOADMEMORY dxflm; + char name[100]; + DWORD length; + + if (!pDirectXFileCreate) + { + win_skip("DirectXFileCreate is not available\n"); + return; + } + + hr = pDirectXFileCreate(&lpDirectXFile); + ok(hr == DXFILE_OK, "DirectXFileCreate: %x\n", hr); + if (!lpDirectXFile) + { + skip("Couldn't create DirectXFile interface\n"); + return; + } + + hr = IDirectXFile_RegisterTemplates(lpDirectXFile, template, sizeof(template) - 1); + ok(hr == DXFILE_OK, "IDirectXFileImpl_RegisterTemplates: %x\n", hr); + + /* Check object with name */ + dxflm.lpMemory = &object; + dxflm.dSize = sizeof(object) - 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); + + hr = IDirectXFileData_GetName(lpdxfd, NULL, NULL); + ok(hr == DXFILEERR_BADVALUE, "IDirectXFileData_GetName: %x\n", hr); + hr = IDirectXFileData_GetName(lpdxfd, name, NULL); + ok(hr == DXFILEERR_BADVALUE, "IDirectXFileData_GetName: %x\n", hr); + hr = IDirectXFileData_GetName(lpdxfd, NULL, &length); + ok(hr == DXFILE_OK, "IDirectXFileData_GetName: %x\n", hr); + ok(length == 7, "Returned length should be 7 instead of %u\n", length); + length = sizeof(name); + hr = IDirectXFileData_GetName(lpdxfd, name, &length); + ok(hr == DXFILE_OK, "IDirectXFileData_GetName: %x\n", hr); + ok(length == 7, "Returned length should be 7 instead of %u\n", length); + ok(!strcmp(name, "Object"), "Returned string should be 'Object' intead of '%s'\n", name); + length = 3; + hr = IDirectXFileData_GetName(lpdxfd, name, &length); + ok(hr == DXFILEERR_BADVALUE, "IDirectXFileData_GetName: %x\n", hr); + + ref = IDirectXFileEnumObject_Release(lpdxfeo); + ok(ref == 0, "Got refcount %d, expected 0\n", ref); + ref = IDirectXFileData_Release(lpdxfd); + ok(ref == 0, "Got refcount %d, expected 0\n", ref); + + /* Check object without name */ + dxflm.lpMemory = &object_noname; + dxflm.dSize = sizeof(object_noname) - 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); + + hr = IDirectXFileData_GetName(lpdxfd, NULL, &length); + ok(hr == DXFILE_OK, "IDirectXFileData_GetName: %x\n", hr); + ok(length == 0, "Returned length should be 0 instead of %u\n", length); + length = sizeof(name); + hr = IDirectXFileData_GetName(lpdxfd, name, &length); + ok(hr == DXFILE_OK, "IDirectXFileData_GetName: %x\n", hr); + ok(length == 0, "Returned length should be 0 instead of %u\n", length); + + ref = IDirectXFileEnumObject_Release(lpdxfeo); + ok(ref == 0, "Got refcount %d, expected 0\n", ref); + 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); +} + /* 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 @@ -381,7 +469,7 @@ static void process_data(LPDIRECTXFILEDATA lpDirectXFileData, int* plevel) CONST GUID* clsid_type = NULL; char str_clsid[40]; char str_clsid_type[40]; - DWORD len= 100; + DWORD len = 100; LPDIRECTXFILEOBJECT pChildObj; int i; int j = 0; @@ -545,6 +633,7 @@ START_TEST(d3dxof) test_CreateEnumObject(); test_file_types(); test_compressed_files(); + test_getname(); test_dump(); FreeLibrary(hd3dxof);

1 0

Maarten Lankhorst : mmdevapi: Fix exclusive test.
by Alexandre Julliard 20 Feb '12

20 Feb '12

Module: wine Branch: master Commit: 14b765aca538a43b57a989b28acc1656928113c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14b765aca538a43b57a989b28… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sun Feb 19 13:18:28 2012 +0100 mmdevapi: Fix exclusive test. --- dlls/mmdevapi/tests/render.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index e2b281e..127f558 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -878,6 +878,7 @@ static void test_clock(int share) period = defp; } else { pwfx->wFormatTag = WAVE_FORMAT_PCM; + pwfx->nChannels = 2; pwfx->cbSize = 0; pwfx->wBitsPerSample = 16; /* no floating point */ pwfx->nBlockAlign = pwfx->nChannels * pwfx->wBitsPerSample / 8;

1 0

Juan Lang : cryptnet: Don' t call HttpEndRequest on a request that was never sent.
by Alexandre Julliard 20 Feb '12

20 Feb '12

Module: wine Branch: master Commit: eee39b12abc92cffdfbc6923a01cb174b4631b60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eee39b12abc92cffdfbc6923a… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sat Feb 18 19:08:45 2012 -0800 cryptnet: Don't call HttpEndRequest on a request that was never sent. --- dlls/cryptnet/cryptnet_main.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index 5d06396..3143604 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -967,7 +967,8 @@ static BOOL WINAPI HTTP_RetrieveEncodedObjectW(LPCWSTR pszURL, /* We don't set ret to TRUE in this block to avoid masking * an error from HttpSendRequestExW. */ - if (!HttpEndRequestW(hHttp, NULL, 0, (DWORD_PTR)context) && + if (ret && + !HttpEndRequestW(hHttp, NULL, 0, (DWORD_PTR)context) && GetLastError() == ERROR_IO_PENDING) { if (WaitForSingleObject(context->event,

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
45
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 February 2012