wine-commits October 2013

wine-commits@winehq.org

2 participants
757 discussions

Rico Schüller : d3dx9: Don' t allocate the state parameter.
by Alexandre Julliard 07 Oct '13

07 Oct '13

Module: wine Branch: master Commit: bc1d6e5098c08e59f43fafe8e5e2b649f2006ba4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc1d6e5098c08e59f43fafe8e… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Oct 6 21:25:41 2013 +0200 d3dx9: Don't allocate the state parameter. --- dlls/d3dx9_36/effect.c | 20 ++++++-------------- 1 files changed, 6 insertions(+), 14 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 0c4fecc..547e810 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -127,7 +127,7 @@ struct d3dx_state UINT operation; UINT index; enum STATE_TYPE type; - struct d3dx_parameter *parameter; + struct d3dx_parameter parameter; }; struct d3dx_sampler @@ -558,8 +558,7 @@ static struct d3dx_parameter *get_valid_parameter(struct d3dx9_base_effect *base static void free_state(struct d3dx_state *state) { - free_parameter(state->parameter, FALSE, FALSE); - HeapFree(GetProcessHeap(), 0, state->parameter); + free_parameter(&state->parameter, FALSE, FALSE); } static void free_object(struct d3dx_object *object) @@ -4618,11 +4617,6 @@ static HRESULT d3dx9_parse_state(struct d3dx_state *state, const char *data, con DWORD offset; const char *ptr2; HRESULT hr; - struct d3dx_parameter *parameter; - - parameter = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*parameter)); - if (!parameter) - return E_OUTOFMEMORY; state->type = ST_CONSTANT; @@ -4635,7 +4629,7 @@ static HRESULT d3dx9_parse_state(struct d3dx_state *state, const char *data, con read_dword(ptr, &offset); TRACE("Typedef offset: %#x\n", offset); ptr2 = data + offset; - hr = d3dx9_parse_effect_typedef(parameter, data, &ptr2, NULL, 0); + hr = d3dx9_parse_effect_typedef(&state->parameter, data, &ptr2, NULL, 0); if (hr != D3D_OK) { WARN("Failed to parse type definition\n"); @@ -4644,20 +4638,18 @@ static HRESULT d3dx9_parse_state(struct d3dx_state *state, const char *data, con read_dword(ptr, &offset); TRACE("Value offset: %#x\n", offset); - hr = d3dx9_parse_init_value(parameter, data, data + offset, objects); + hr = d3dx9_parse_init_value(&state->parameter, data, data + offset, objects); if (hr != D3D_OK) { WARN("Failed to parse value\n"); goto err_out; } - state->parameter = parameter; - return D3D_OK; err_out: - free_parameter(parameter, FALSE, FALSE); + free_parameter(&state->parameter, FALSE, FALSE); return hr; } @@ -5007,7 +4999,7 @@ static HRESULT d3dx9_parse_resource(struct d3dx9_base_effect *base, const char * state = &pass->states[state_index]; } - param = state->parameter; + param = &state->parameter; /* * TODO: Do we need to create the shader/string here or later when we access them?

1 0

Łukasz Wojniłowicz : po: Update Polish translation.
by Alexandre Julliard 07 Oct '13

07 Oct '13

Module: wine Branch: master Commit: 14869bf4ee7f7a3fd2cb5651f158421cd35c723c URL: http://source.winehq.org/git/wine.git/?a=commit;h=14869bf4ee7f7a3fd2cb5651f… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Oct 5 16:57:25 2013 +0200 po: Update Polish translation. --- po/pl.po | 64 +++++++++++++++++-------------------------------------------- 1 files changed, 18 insertions(+), 46 deletions(-) diff --git a/po/pl.po b/po/pl.po index 97cad31..032dc5e 100644 --- a/po/pl.po +++ b/po/pl.po @@ -6,7 +6,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: 2013-03-31 08:50+0200\n" +"PO-Revision-Date: 2013-10-05 16:55+0200\n" "Last-Translator: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com>\n" "Language-Team: Polish <kde-i18n-doc(a)kde.org>\n" "Language: Polish\n" @@ -8555,16 +8555,12 @@ msgstr "" "spróbuj ponownie." #: winmm.rc:52 winmm.rc:125 -#, fuzzy -#| msgid "" -#| "The current MIDI Mapper setup refers to a MIDI device that is not " -#| "installed on the system. Use MIDI Mapper to edit the setup." msgid "" "The current MIDI Mapper setup refers to a MIDI device that is not installed " "on the system." msgstr "" "Bieżące ustawienia mapowania MIDI odwołują się do urządzenia MIDI, które nie " -"jest zainstalowane w systemie. Użyj Mapowania MIDI do edycji ustawień." +"jest zainstalowane w systemie." #: winmm.rc:53 msgid "" @@ -9398,22 +9394,16 @@ msgstr "" "wywołaną procedurę są dziedziczone przez skrypt wywołujący CALL.\n" #: cmd.rc:40 -#, fuzzy -#| msgid "" -#| "CD <dir> is the short version of CHDIR. It changes the current\n" -#| "default directory.\n" msgid "" "CD <directory> is the short version of CHDIR. It changes the current\n" "default directory.\n" msgstr "" -"CD <katalog> jest krótką wersją CHDIR. Zmienia aktualny\n" +"CD <katalog> jest krótką wersją CHDIR. Zmienia bieżący\n" "domyślny katalog.\n" #: cmd.rc:41 -#, fuzzy -#| msgid "CHDIR <dir> changes the current default directory.\n" msgid "CHDIR <directory> changes the current default directory.\n" -msgstr "CHDIR <katalog> zmienia aktualny domyślny katalog.\n" +msgstr "CHDIR <katalog> zmienia bieżący domyślny katalog.\n" #: cmd.rc:43 msgid "CLS clears the console screen.\n" @@ -9464,11 +9454,6 @@ msgid "ERASE <filename> deletes a file or set of files.\n" msgstr "ERASE <nazwapliku> usuwa plik lub zestaw plików.\n" #: cmd.rc:68 -#, fuzzy -#| msgid "" -#| "The FOR command is used to execute a command for each of a set of files.\n" -#| "\n" -#| "Syntax: FOR %variable IN (set) DO command\n" msgid "" "The FOR command is used to execute a command for each of a set of files.\n" "\n" @@ -9476,9 +9461,10 @@ msgid "" "\n" "The % sign must be doubled when using FOR in a batch file.\n" msgstr "" -"Komenda FOR służy do uruchomienia komendy dla każdego z plików ze zbioru.\n" +"Polecenie FOR służy do uruchomienia polecenia dla każdego ze zbioru plików.\n" "\n" -"Składnia: FOR %zmienna IN (zbiór) DO polecenie\n" +"Użycie: FOR %zmienna IN (zbiór) DO polecenie\n" +"Należy podwoić znak % jeśli FOR jest używane w pliku wsadowym.\n" #: cmd.rc:80 msgid "" @@ -9673,16 +9659,12 @@ msgid "RENAME <filename> renames a file.\n" msgstr "RENAME <nazwapliku> zmienia nazwę pliku.\n" #: cmd.rc:158 -#, fuzzy -#| msgid "RD <dir> is the short version of RMDIR. It deletes a subdirectory.\n" msgid "RD <directory> is the short version of RMDIR. It deletes a directory.\n" -msgstr "RD <katalog> jest krótką wersją RMDIR. usuwa podkatalog.\n" +msgstr "RD <katalog> jest krótką wersją RMDIR. Usuwa katalog.\n" #: cmd.rc:159 -#, fuzzy -#| msgid "RMDIR <dir> deletes a subdirectory.\n" msgid "RMDIR <directory> deletes a directory.\n" -msgstr "RMDIR <katalog> usuwa podkatalog.\n" +msgstr "RMDIR <katalog> usuwa katalog.\n" #: cmd.rc:203 msgid "" @@ -9856,15 +9838,11 @@ msgstr "" "ustawienia środowiska.\n" #: cmd.rc:245 -#, fuzzy -#| msgid "" -#| "PUSHD <directoryname> saves the current directory onto a\n" -#| "stack, and then changes the current directory to the supplied one.\n" msgid "" "PUSHD <directory> saves the current directory onto a\n" "stack, and then changes the current directory to the supplied one.\n" msgstr "" -"PUSHD <nazwakatalogu> zapamiętuje aktualny katalog na stosie, a\n" +"PUSHD <nazwakatalogu> zapamiętuje bieżący katalog na stosie, a\n" "następnie przechodzi do katalogu podanego jako parametr.\n" #: cmd.rc:247 @@ -12327,7 +12305,7 @@ msgstr "Aktualizuje okno co cztery sekundy" #: taskmgr.rc:203 msgid "Does not automatically update" -msgstr "Okno nie jest automatycznie aktualizowane" +msgstr "Okno nie uaktualnia się samoczynnie" #: taskmgr.rc:205 msgid "Tiles the windows horizontally on the desktop" @@ -12822,7 +12800,7 @@ msgstr "&Dodaj..." #: winecfg.rc:229 msgid "Auto&detect" -msgstr "Automatyczne wykrywanie" +msgstr "Wykryj &samoczynnie" #: winecfg.rc:232 msgid "&Path:" @@ -13034,7 +13012,7 @@ msgstr "Wybierz plik wykonywalny" #: winecfg.rc:66 msgid "Autodetect" -msgstr "Wykryj automatycznie" +msgstr "Wykryj samoczynnie" #: winecfg.rc:67 msgid "Local hard disk" @@ -13697,22 +13675,16 @@ msgid "Not yet implemented" msgstr "Jeszcze nie zaimplementowane" #: winefile.rc:106 -#, fuzzy -#| msgid "Creation failed.\n" msgid "Creation date" -msgstr "Utworzenie zakończone niepowodzeniem.\n" +msgstr "Data utworzenia" #: winefile.rc:107 -#, fuzzy -#| msgid "Access denied.\n" msgid "Access date" -msgstr "Dostęp zastrzeżony.\n" +msgstr "Data dostępu" #: winefile.rc:108 -#, fuzzy -#| msgid "Certification Path" msgid "Modification date" -msgstr "Ścieżka certyfikacji" +msgstr "Data modyfikacji" #: winefile.rc:109 msgid "Index/Inode" @@ -13767,7 +13739,7 @@ msgstr "Plansza &użytkownika..." #: winemine.rc:44 msgid "&Fastest Times" -msgstr "Najszybsze czasy" +msgstr "&Najlepsze Wyniki" #: winemine.rc:49 msgid "&About WineMine" @@ -14037,7 +14009,7 @@ msgstr "Wine Wordpad - &informacje" #: wordpad.rc:130 msgid "Automatic" -msgstr "Automatycznie" +msgstr "Samoczynnie" #: wordpad.rc:199 msgid "Date and time"

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard 07 Oct '13

07 Oct '13

Module: wine Branch: master Commit: 2dde7d0e0acb0d1a5633edce65622e251c9a6f13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2dde7d0e0acb0d1a5633edce6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 6 21:45:21 2013 +0400 po: Update Russian translation. --- po/ru.po | 40 +++++++++------------------------------- 1 files changed, 9 insertions(+), 31 deletions(-) diff --git a/po/ru.po b/po/ru.po index 4195680..7b02b04 100644 --- a/po/ru.po +++ b/po/ru.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: 2013-01-18 00:48+0400\n" +"PO-Revision-Date: 2013-10-06 21:40+0400\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: none\n" "Language: Russian\n" @@ -8531,16 +8531,12 @@ msgstr "" "передана и попробуйте заново." #: winmm.rc:52 winmm.rc:125 -#, fuzzy -#| msgid "" -#| "The current MIDI Mapper setup refers to a MIDI device that is not " -#| "installed on the system. Use MIDI Mapper to edit the setup." msgid "" "The current MIDI Mapper setup refers to a MIDI device that is not installed " "on the system." msgstr "" "Текущие установки MIDI Mapper ссылаются на устройство MIDI, которое не " -"установлено в системе. Используйте MIDI Mapper для редактирования установок." +"установлено в системе." #: winmm.rc:53 msgid "" @@ -9361,10 +9357,6 @@ msgstr "" "вызванной процедурой, наследуются вызвавшему.\n" #: cmd.rc:40 -#, fuzzy -#| msgid "" -#| "CD <dir> is the short version of CHDIR. It changes the current\n" -#| "default directory.\n" msgid "" "CD <directory> is the short version of CHDIR. It changes the current\n" "default directory.\n" @@ -9373,8 +9365,6 @@ msgstr "" "директорию.\n" #: cmd.rc:41 -#, fuzzy -#| msgid "CHDIR <dir> changes the current default directory.\n" msgid "CHDIR <directory> changes the current default directory.\n" msgstr "CHDIR <директория> изменяет текущую директорию.\n" @@ -9426,11 +9416,6 @@ msgid "ERASE <filename> deletes a file or set of files.\n" msgstr "ERASE <файл> удаляет файл или несколько файлов.\n" #: cmd.rc:68 -#, fuzzy -#| msgid "" -#| "The FOR command is used to execute a command for each of a set of files.\n" -#| "\n" -#| "Syntax: FOR %variable IN (set) DO command\n" msgid "" "The FOR command is used to execute a command for each of a set of files.\n" "\n" @@ -9439,9 +9424,11 @@ msgid "" "The % sign must be doubled when using FOR in a batch file.\n" msgstr "" "FOR используется для применения заданной <команды> для\n" -"одного файла или набора файлов.\n" +"каждого файла из набора файлов.\n" "\n" -"Синтаксис: FOR %переменная IN (набор) DO команда\n" +"Использование: FOR %переменная IN (набор) DO команда\n" +"\n" +"Знак % должен быть удвоен при использовании FOR в bat-файлах.\n" #: cmd.rc:80 msgid "" @@ -9632,17 +9619,12 @@ msgid "RENAME <filename> renames a file.\n" msgstr "RENAME <файла> переименовывает файл.\n" #: cmd.rc:158 -#, fuzzy -#| msgid "RD <dir> is the short version of RMDIR. It deletes a subdirectory.\n" msgid "RD <directory> is the short version of RMDIR. It deletes a directory.\n" -msgstr "" -"RD <директория> это краткий вариант RMDIR. Она удаляет поддиректорию.\n" +msgstr "RD <директория> это краткий вариант RMDIR. Она удаляет директорию.\n" #: cmd.rc:159 -#, fuzzy -#| msgid "RMDIR <dir> deletes a subdirectory.\n" msgid "RMDIR <directory> deletes a directory.\n" -msgstr "RMDIR <директория> удаляет поддиректорию.\n" +msgstr "RMDIR <директория> удаляет директорию.\n" #: cmd.rc:203 msgid "" @@ -9815,15 +9797,11 @@ msgstr "" "окружения восстанавливаются.\n" #: cmd.rc:245 -#, fuzzy -#| msgid "" -#| "PUSHD <directoryname> saves the current directory onto a\n" -#| "stack, and then changes the current directory to the supplied one.\n" msgid "" "PUSHD <directory> saves the current directory onto a\n" "stack, and then changes the current directory to the supplied one.\n" msgstr "" -"PUSHD <directoryname> сохраняет текущий каталог в стек,\n" +"PUSHD <директория> сохраняет текущий каталог в стек,\n" "а затем переходит в указанный каталог.\n" #: cmd.rc:247

1 0

Dmitry Timoshkov : ntdll/tests: Accept previously declared behaviour of overlapped IO as broken.
by Alexandre Julliard 07 Oct '13

07 Oct '13

Module: wine Branch: master Commit: 1670c7f9a61306b4103105467b2f8b913a01dc04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1670c7f9a61306b4103105467… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 7 16:36:31 2013 +0900 ntdll/tests: Accept previously declared behaviour of overlapped IO as broken. It highly depends on Windows version and updates/SP installed. --- dlls/ntdll/tests/file.c | 123 +++++++++++++++++++++------------------------- 1 files changed, 56 insertions(+), 67 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1670c7f9a61306b410310…

1 0

Dmitry Timoshkov : ntdll: Add support for FILE_APPEND_DATA to NtWriteFile.
by Alexandre Julliard 07 Oct '13

07 Oct '13

Module: wine Branch: master Commit: aa8546ecc25764a10123e452ca8f48e641b222b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa8546ecc25764a10123e452c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 7 14:40:10 2013 +0900 ntdll: Add support for FILE_APPEND_DATA to NtWriteFile. --- dlls/kernel32/tests/file.c | 11 ----------- dlls/ntdll/file.c | 15 ++++++++++++++- dlls/ntdll/tests/file.c | 12 ------------ 3 files changed, 14 insertions(+), 24 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index dc69193..866a29a 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -3986,17 +3986,6 @@ todo_wine } else { - /* FIXME: remove once Wine is fixed */ - if (!ret && (td[i].access & FILE_APPEND_DATA)) - { -todo_wine - ok(ret, "%d: WriteFile error %d\n", i, GetLastError()); -todo_wine - ok(bytes == 2, "%d: expected 2, got %u\n", i, bytes); - CloseHandle(hfile); - continue; - } - ok(ret, "%d: WriteFile error %d\n", i, GetLastError()); ok(bytes == 2, "%d: expected 2, got %u\n", i, bytes); } diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 62ae135..a8c25d6 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -952,7 +952,8 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, ULONG total = 0; enum server_fd_type type; ULONG_PTR cvalue = apc ? 0 : (ULONG_PTR)apc_user; - BOOL send_completion = FALSE, async_write; + BOOL send_completion = FALSE, async_write, append_write = FALSE; + LARGE_INTEGER offset_eof; TRACE("(%p,%p,%p,%p,%p,%p,0x%08x,%p,%p)!\n", hFile,hEvent,apc,apc_user,io_status,buffer,length,offset,key); @@ -961,6 +962,12 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, status = server_get_unix_fd( hFile, FILE_WRITE_DATA, &unix_handle, &needs_close, &type, &options ); + if (status == STATUS_ACCESS_DENIED) + { + status = server_get_unix_fd( hFile, FILE_APPEND_DATA, &unix_handle, + &needs_close, &type, &options ); + append_write = TRUE; + } if (status) return status; if (!virtual_check_buffer_for_read( buffer, length )) @@ -979,6 +986,12 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, goto done; } + if (append_write) + { + offset_eof.QuadPart = (LONGLONG)-1; /* FILE_WRITE_TO_END_OF_FILE */ + offset = &offset_eof; + } + if (offset && offset->QuadPart != (LONGLONG)-2 /* FILE_USE_FILE_POINTER_POSITION */) { off_t off = offset->QuadPart; diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 4740d42..1c2a918 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -883,30 +883,22 @@ static void append_file_test(void) iosb.Information = -1; offset.QuadPart = 1; status = pNtWriteFile(handle, NULL, NULL, NULL, &iosb, text + 2, 2, &offset, NULL); -todo_wine ok(status == STATUS_SUCCESS, "NtWriteFile error %#x\n", status); -todo_wine ok(iosb.Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", iosb.Status); -todo_wine ok(iosb.Information == 2, "expected 2, got %lu\n", iosb.Information); ret = SetFilePointer(handle, 0, NULL, FILE_CURRENT); -todo_wine ok(ret == 4, "expected 4, got %u\n", ret); U(iosb).Status = -1; iosb.Information = -1; offset.QuadPart = 3; status = pNtWriteFile(handle, NULL, NULL, NULL, &iosb, text + 4, 2, &offset, NULL); -todo_wine ok(status == STATUS_SUCCESS, "NtWriteFile error %#x\n", status); -todo_wine ok(iosb.Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", iosb.Status); -todo_wine ok(iosb.Information == 2, "expected 2, got %lu\n", iosb.Information); ret = SetFilePointer(handle, 0, NULL, FILE_CURRENT); -todo_wine ok(ret == 6, "expected 6, got %u\n", ret); CloseHandle(handle); @@ -921,10 +913,8 @@ todo_wine status = pNtReadFile(handle, 0, NULL, NULL, &iosb, buf, sizeof(buf), &offset, NULL); ok(status == STATUS_SUCCESS, "NtReadFile error %#x\n", status); ok(iosb.Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", iosb.Status); -todo_wine ok(iosb.Information == 6, "expected 6, got %lu\n", iosb.Information); buf[6] = 0; -todo_wine ok(memcmp(buf, text, 6) == 0, "wrong file contents: %s\n", buf); U(iosb).Status = -1; @@ -942,10 +932,8 @@ todo_wine status = pNtReadFile(handle, 0, NULL, NULL, &iosb, buf, sizeof(buf), &offset, NULL); ok(status == STATUS_SUCCESS, "NtReadFile error %#x\n", status); ok(iosb.Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", iosb.Status); -todo_wine ok(iosb.Information == 6, "expected 6, got %lu\n", iosb.Information); buf[6] = 0; -todo_wine ok(memcmp(buf, "barbar", 6) == 0, "wrong file contents: %s\n", buf); CloseHandle(handle);

1 0

Dmitry Timoshkov : ntdll/tests: Add a test for file position after NtWriteFile in FILE_APPEND_DATA mode.
by Alexandre Julliard 07 Oct '13

07 Oct '13

Module: wine Branch: master Commit: ae3c49d841abf25b1eb618484974477e95a2a6dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae3c49d841abf25b1eb618484… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 7 14:39:27 2013 +0900 ntdll/tests: Add a test for file position after NtWriteFile in FILE_APPEND_DATA mode. --- dlls/ntdll/tests/file.c | 30 +++++++++++++++++++++++++----- 1 files changed, 25 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 73b4559..4740d42 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -857,6 +857,7 @@ static void append_file_test(void) IO_STATUS_BLOCK iosb; LARGE_INTEGER offset; char path[MAX_PATH], buffer[MAX_PATH], buf[16]; + DWORD ret; GetTempPathA( MAX_PATH, path ); GetTempFileNameA( path, "foo", 0, buffer ); @@ -866,10 +867,10 @@ static void append_file_test(void) U(iosb).Status = -1; iosb.Information = -1; - status = pNtWriteFile(handle, NULL, NULL, NULL, &iosb, text, 3, NULL, NULL); + status = pNtWriteFile(handle, NULL, NULL, NULL, &iosb, text, 2, NULL, NULL); ok(status == STATUS_SUCCESS, "NtWriteFile error %#x\n", status); ok(iosb.Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", iosb.Status); - ok(iosb.Information == 3, "expected 3, got %lu\n", iosb.Information); + ok(iosb.Information == 2, "expected 2, got %lu\n", iosb.Information); CloseHandle(handle); @@ -880,14 +881,33 @@ static void append_file_test(void) U(iosb).Status = -1; iosb.Information = -1; - offset.QuadPart = 0; - status = pNtWriteFile(handle, NULL, NULL, NULL, &iosb, text + 3, 3, &offset, NULL); + offset.QuadPart = 1; + status = pNtWriteFile(handle, NULL, NULL, NULL, &iosb, text + 2, 2, &offset, NULL); todo_wine ok(status == STATUS_SUCCESS, "NtWriteFile error %#x\n", status); todo_wine ok(iosb.Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", iosb.Status); todo_wine - ok(iosb.Information == 3, "expected 3, got %lu\n", iosb.Information); + ok(iosb.Information == 2, "expected 2, got %lu\n", iosb.Information); + + ret = SetFilePointer(handle, 0, NULL, FILE_CURRENT); +todo_wine + ok(ret == 4, "expected 4, got %u\n", ret); + + U(iosb).Status = -1; + iosb.Information = -1; + offset.QuadPart = 3; + status = pNtWriteFile(handle, NULL, NULL, NULL, &iosb, text + 4, 2, &offset, NULL); +todo_wine + ok(status == STATUS_SUCCESS, "NtWriteFile error %#x\n", status); +todo_wine + ok(iosb.Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", iosb.Status); +todo_wine + ok(iosb.Information == 2, "expected 2, got %lu\n", iosb.Information); + + ret = SetFilePointer(handle, 0, NULL, FILE_CURRENT); +todo_wine + ok(ret == 6, "expected 6, got %u\n", ret); CloseHandle(handle);

1 0

Henri Verbeet : d3drm: Get rid of the IDirect3DRMDeviceImpl typedef.
by Alexandre Julliard 07 Oct '13

07 Oct '13

Module: wine Branch: master Commit: 0160b9a3850a6406d57cd3d8026c12bbd5ec2187 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0160b9a3850a6406d57cd3d80… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Oct 6 17:33:08 2013 +0200 d3drm: Get rid of the IDirect3DRMDeviceImpl typedef. --- dlls/d3drm/device.c | 883 ++++++++++++++++++++++----------------------------- 1 files changed, 382 insertions(+), 501 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0160b9a3850a6406d57cd…

1 0

Henri Verbeet : d3drm: Get rid of the IDirect3DRMImpl typedef.
by Alexandre Julliard 07 Oct '13

07 Oct '13

Module: wine Branch: master Commit: 3dffb34f7c7ba45f5b4238553ba722d97aebe109 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3dffb34f7c7ba45f5b4238553… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Oct 6 17:33:07 2013 +0200 d3drm: Get rid of the IDirect3DRMImpl typedef. --- dlls/d3drm/d3drm.c | 754 ++++++++++++++++++++++++---------------------------- 1 files changed, 350 insertions(+), 404 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3dffb34f7c7ba45f5b423…

1 0

Henri Verbeet : wined3d: Move lowest_disabled_stage to the context.
by Alexandre Julliard 07 Oct '13

07 Oct '13

Module: wine Branch: master Commit: 8644b6272677e06865b3875d5194d5efe1c2f5f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8644b6272677e06865b3875d5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Oct 6 17:33:06 2013 +0200 wined3d: Move lowest_disabled_stage to the context. --- dlls/wined3d/arb_program_shader.c | 8 ++--- dlls/wined3d/context.c | 21 +++++++++++++- dlls/wined3d/device.c | 50 ---------------------------------- dlls/wined3d/nvidia_texture_shader.c | 8 +++--- dlls/wined3d/state.c | 6 ++-- dlls/wined3d/stateblock.c | 2 - dlls/wined3d/utils.c | 2 +- dlls/wined3d/wined3d_private.h | 4 +- 8 files changed, 32 insertions(+), 69 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8644b6272677e06865b38…

1 0

Henri Verbeet : wined3d: Don' t update lowest_disabled_stage in wined3d_stateblock_apply().
by Alexandre Julliard 07 Oct '13

07 Oct '13

Module: wine Branch: master Commit: 242a79a9d7377e8534b7db6b9dbf373b8f5a5961 URL: http://source.winehq.org/git/wine.git/?a=commit;h=242a79a9d7377e8534b7db6b9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Oct 6 17:33:05 2013 +0200 wined3d: Don't update lowest_disabled_stage in wined3d_stateblock_apply(). --- dlls/wined3d/stateblock.c | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 24c4362..2a1cb12 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1133,16 +1133,6 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) wined3d_device_set_clip_plane(device, i, &stateblock->state.clip_planes[i]); } - stateblock->device->state.lowest_disabled_stage = MAX_TEXTURES - 1; - for (i = 0; i < MAX_TEXTURES - 1; ++i) - { - if (stateblock->device->state.texture_states[i][WINED3D_TSS_COLOR_OP] == WINED3D_TOP_DISABLE) - { - stateblock->device->state.lowest_disabled_stage = i; - break; - } - } - TRACE("Applied stateblock %p.\n", stateblock); }

1 0

← Newer
1
...
59
60
61
62
63
64
65
...
76
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 October 2013