April 2013 - Wine-commits - list.winehq.org

Detlef Riekenberg : kernel32/tests: Avoid IOCTL_DVD_READ_STRUCTURE test failures.
by Alexandre Julliard 30 Apr '13

30 Apr '13

Module: wine Branch: master Commit: 71cbd277e7cceeb125e4a607bb3ed962f14e57be URL: http://source.winehq.org/git/wine.git/?a=commit;h=71cbd277e7cceeb125e4a607b… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Apr 30 00:32:44 2013 +0200 kernel32/tests: Avoid IOCTL_DVD_READ_STRUCTURE test failures. --- dlls/kernel32/tests/volume.c | 11 +++-------- 1 files changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index d788c81..f7879c8 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -775,17 +775,12 @@ static void test_dvd_read_structure(HANDLE handle) /* Test whether this ioctl is supported */ ret = DeviceIoControl(handle, IOCTL_DVD_READ_STRUCTURE, &dvdReadStructure, sizeof(DVD_READ_STRUCTURE), &completeDvdLayerDescriptor, sizeof(struct COMPLETE_DVD_LAYER_DESCRIPTOR), &nbBytes, NULL); - if ((!ret && GetLastError() == ERROR_INVALID_FUNCTION) - || (!ret && GetLastError() == ERROR_NOT_SUPPORTED)) - { - skip("IOCTL_DVD_READ_STRUCTURE not supported\n"); - return; - } - ok(ret || broken(GetLastError() == ERROR_NOT_READY) || broken(GetLastError() == ERROR_INVALID_PARAMETER), - "IOCTL_DVD_READ_STRUCTURE (DvdPhysicalDescriptor) failed, last error = %u\n", GetLastError()); if(!ret) + { + skip("IOCTL_DVD_READ_STRUCTURE not supported: %u\n", GetLastError()); return; + } /* Confirm there is always a header before the actual data */ ok( completeDvdLayerDescriptor.Header.Length == 0x0802, "Length is 0x%04x instead of 0x0802\n", completeDvdLayerDescriptor.Header.Length);

1 0

Nikolay Sivov : po: Updated Russian translation.
by Alexandre Julliard 30 Apr '13

30 Apr '13

Module: wine Branch: master Commit: bfe4d799f2777349c6a07dd0639a71899da87741 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfe4d799f2777349c6a07dd06… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 30 13:18:15 2013 +0400 po: Updated Russian translation. --- po/ru.po | 44 +++++++++++++------------------------------- 1 files changed, 13 insertions(+), 31 deletions(-) diff --git a/po/ru.po b/po/ru.po index a1b068c..08890f1 100644 --- a/po/ru.po +++ b/po/ru.po @@ -10435,77 +10435,59 @@ msgstr "Неизвестные протоколы" #: netstat.rc:41 msgid "TCP Statistics for IPv4" -msgstr "" +msgstr "Статистика TCP для IPv4" #: netstat.rc:42 -#, fuzzy -#| msgid "Active Connections" msgid "Active Opens" msgstr "Активные подключения" #: netstat.rc:43 msgid "Passive Opens" -msgstr "" +msgstr "Пассивные подключения" #: netstat.rc:44 -#, fuzzy -#| msgid "Active Connections" msgid "Failed Connection Attempts" -msgstr "Активные подключения" +msgstr "Сбоев при подключении" #: netstat.rc:45 -#, fuzzy -#| msgid "Active Connections" msgid "Reset Connections" -msgstr "Активные подключения" +msgstr "Сброшено подключений" #: netstat.rc:46 -#, fuzzy -#| msgid "Active Connections" msgid "Current Connections" -msgstr "Активные подключения" +msgstr "Текущих подключений" #: netstat.rc:47 -#, fuzzy -#| msgid "Segment locked.\n" msgid "Segments Received" -msgstr "Сегмент заблокирован.\n" +msgstr "Получено сегментов" #: netstat.rc:48 -#, fuzzy -#| msgid "Segment locked.\n" msgid "Segments Sent" -msgstr "Сегмент заблокирован.\n" +msgstr "Отправлено сегментов" #: netstat.rc:49 msgid "Segments Retransmitted" -msgstr "" +msgstr "Повторно отправлено сегментов" #: netstat.rc:50 msgid "UDP Statistics for IPv4" -msgstr "" +msgstr "Статистика UDP для IPv4" #: netstat.rc:51 -#, fuzzy -#| msgid "Segment locked.\n" msgid "Datagrams Received" -msgstr "Сегмент заблокирован.\n" +msgstr "Получено датаграмм" #: netstat.rc:52 -#, fuzzy -#| msgid "Local Port" msgid "No Ports" -msgstr "Локальный порт" +msgstr "Порт не указан" #: netstat.rc:53 -#, fuzzy -#| msgid "Decoding Error" msgid "Receive Errors" -msgstr "Ошибка декодирования" +msgstr "Ошибок приема" #: netstat.rc:54 msgid "Datagrams Sent" -msgstr "" +msgstr "Отправлено датаграмм" #: notepad.rc:27 msgid "&New\tCtrl+N"

1 0

Nikolay Sivov : netstat: No need to allocate fixed length stats structs.
by Alexandre Julliard 30 Apr '13

30 Apr '13

Module: wine Branch: master Commit: 423d5f29e8d3cb9906d0663047c4dd51ed581f02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=423d5f29e8d3cb9906d066304… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 30 13:26:43 2013 +0400 netstat: No need to allocate fixed length stats structs. --- programs/netstat/netstat.c | 40 ++++++++++++++++------------------------ 1 files changed, 16 insertions(+), 24 deletions(-) diff --git a/programs/netstat/netstat.c b/programs/netstat/netstat.c index b7fee0e..23f2b40 100644 --- a/programs/netstat/netstat.c +++ b/programs/netstat/netstat.c @@ -274,25 +274,21 @@ static void NETSTAT_tcp_table(void) static void NETSTAT_tcp_stats(void) { - PMIB_TCPSTATS stats; + MIB_TCPSTATS stats; - stats = (PMIB_TCPSTATS)HeapAlloc(GetProcessHeap(), 0, sizeof(MIB_TCPSTATS)); - - if (GetTcpStatistics(stats) == NO_ERROR) + if (GetTcpStatistics(&stats) == NO_ERROR) { NETSTAT_wprintf(fmtnn, NETSTAT_load_message(IDS_TCP_STAT)); NETSTAT_wprintf(fmtn); - NETSTAT_wprintf(fmttcpstat, NETSTAT_load_message(IDS_TCP_ACTIVE_OPEN), stats->dwActiveOpens); - NETSTAT_wprintf(fmttcpstat, NETSTAT_load_message(IDS_TCP_PASSIV_OPEN), stats->dwPassiveOpens); - NETSTAT_wprintf(fmttcpstat, NETSTAT_load_message(IDS_TCP_FAILED_CONN), stats->dwAttemptFails); - NETSTAT_wprintf(fmttcpstat, NETSTAT_load_message(IDS_TCP_RESET_CONN), stats->dwEstabResets); - NETSTAT_wprintf(fmttcpstat, NETSTAT_load_message(IDS_TCP_CURR_CONN), stats->dwCurrEstab); - NETSTAT_wprintf(fmttcpstat, NETSTAT_load_message(IDS_TCP_SEGM_RECV), stats->dwInSegs); - NETSTAT_wprintf(fmttcpstat, NETSTAT_load_message(IDS_TCP_SEGM_SENT), stats->dwOutSegs); - NETSTAT_wprintf(fmttcpstat, NETSTAT_load_message(IDS_TCP_SEGM_RETRAN), stats->dwRetransSegs); + NETSTAT_wprintf(fmttcpstat, NETSTAT_load_message(IDS_TCP_ACTIVE_OPEN), stats.dwActiveOpens); + NETSTAT_wprintf(fmttcpstat, NETSTAT_load_message(IDS_TCP_PASSIV_OPEN), stats.dwPassiveOpens); + NETSTAT_wprintf(fmttcpstat, NETSTAT_load_message(IDS_TCP_FAILED_CONN), stats.dwAttemptFails); + NETSTAT_wprintf(fmttcpstat, NETSTAT_load_message(IDS_TCP_RESET_CONN), stats.dwEstabResets); + NETSTAT_wprintf(fmttcpstat, NETSTAT_load_message(IDS_TCP_CURR_CONN), stats.dwCurrEstab); + NETSTAT_wprintf(fmttcpstat, NETSTAT_load_message(IDS_TCP_SEGM_RECV), stats.dwInSegs); + NETSTAT_wprintf(fmttcpstat, NETSTAT_load_message(IDS_TCP_SEGM_SENT), stats.dwOutSegs); + NETSTAT_wprintf(fmttcpstat, NETSTAT_load_message(IDS_TCP_SEGM_RETRAN), stats.dwRetransSegs); } - - HeapFree(GetProcessHeap(), 0, stats); } static void NETSTAT_udp_table(void) @@ -325,21 +321,17 @@ static void NETSTAT_udp_table(void) static void NETSTAT_udp_stats(void) { - PMIB_UDPSTATS stats; + MIB_UDPSTATS stats; - stats = (PMIB_UDPSTATS)HeapAlloc(GetProcessHeap(), 0, sizeof(MIB_UDPSTATS)); - - if (GetUdpStatistics(stats) == NO_ERROR) + if (GetUdpStatistics(&stats) == NO_ERROR) { NETSTAT_wprintf(fmtnn, NETSTAT_load_message(IDS_UDP_STAT)); NETSTAT_wprintf(fmtn); - NETSTAT_wprintf(fmtudpstat, NETSTAT_load_message(IDS_UDP_DGRAMS_RECV), stats->dwInDatagrams); - NETSTAT_wprintf(fmtudpstat, NETSTAT_load_message(IDS_UDP_NO_PORTS), stats->dwNoPorts); - NETSTAT_wprintf(fmtudpstat, NETSTAT_load_message(IDS_UDP_RECV_ERRORS), stats->dwInErrors); - NETSTAT_wprintf(fmtudpstat, NETSTAT_load_message(IDS_UDP_DGRAMS_SENT), stats->dwOutDatagrams); + NETSTAT_wprintf(fmtudpstat, NETSTAT_load_message(IDS_UDP_DGRAMS_RECV), stats.dwInDatagrams); + NETSTAT_wprintf(fmtudpstat, NETSTAT_load_message(IDS_UDP_NO_PORTS), stats.dwNoPorts); + NETSTAT_wprintf(fmtudpstat, NETSTAT_load_message(IDS_UDP_RECV_ERRORS), stats.dwInErrors); + NETSTAT_wprintf(fmtudpstat, NETSTAT_load_message(IDS_UDP_DGRAMS_SENT), stats.dwOutDatagrams); } - - HeapFree(GetProcessHeap(), 0, stats); } static NETSTATPROTOCOLS NETSTAT_get_protocol(WCHAR name[])

1 0

Hans Leidekker : winhttp: Reset the content read counter.
by Alexandre Julliard 30 Apr '13

30 Apr '13

Module: wine Branch: master Commit: 7a69d4dbfea97be2e92787983850f648776d1656 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a69d4dbfea97be2e92787983… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 30 11:31:30 2013 +0200 winhttp: Reset the content read counter. --- dlls/winhttp/request.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index f14f22b..bab576e 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1494,6 +1494,7 @@ static DWORD set_content_length( request_t *request ) request->content_length = ~0u; request->read_chunked = TRUE; } + request->content_read = 0; return request->content_length; }

1 0

Hans Leidekker : winhttp: Resend any request data when handling an authentication or redirect response .
by Alexandre Julliard 30 Apr '13

30 Apr '13

Module: wine Branch: master Commit: d63ef4d855654a60ebc8b8660cf161ee837db46e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d63ef4d855654a60ebc8b8660… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 30 11:32:31 2013 +0200 winhttp: Resend any request data when handling an authentication or redirect response. --- dlls/winhttp/request.c | 18 +++++++++++++----- dlls/winhttp/winhttp_private.h | 2 ++ 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index bab576e..8d579b3 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1124,9 +1124,13 @@ static BOOL send_request( request_t *request, LPCWSTR headers, DWORD headers_len heap_free( req_ascii ); if (!ret) goto end; - if (optional_len && !netconn_send( &request->netconn, optional, optional_len, 0, &bytes_sent )) goto end; - len += optional_len; - + if (optional_len) + { + if (!netconn_send( &request->netconn, optional, optional_len, 0, &bytes_sent )) goto end; + request->optional = optional; + request->optional_len = optional_len; + len += optional_len; + } send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_REQUEST_SENT, &len, sizeof(DWORD) ); end: @@ -1951,6 +1955,8 @@ static BOOL handle_redirect( request_t *request, DWORD status ) { heap_free( request->verb ); request->verb = strdupW( getW ); + request->optional = NULL; + request->optional_len = 0; } ret = TRUE; @@ -1987,7 +1993,8 @@ static BOOL receive_response( request_t *request, BOOL async ) if (!(ret = handle_redirect( request, status ))) break; - send_request( request, NULL, 0, NULL, 0, 0, 0, FALSE ); /* recurse synchronously */ + /* recurse synchronously */ + send_request( request, NULL, 0, request->optional, request->optional_len, 0, 0, FALSE ); continue; } else if (status == HTTP_STATUS_DENIED || status == HTTP_STATUS_PROXY_AUTH_REQ) @@ -2000,7 +2007,8 @@ static BOOL receive_response( request_t *request, BOOL async ) ret = TRUE; break; } - send_request( request, NULL, 0, NULL, 0, 0, 0, FALSE ); + /* recurse synchronously */ + send_request( request, NULL, 0, request->optional, request->optional_len, 0, 0, FALSE ); continue; } break; diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 82b4582..d47bed3 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -156,6 +156,8 @@ typedef struct LPWSTR path; LPWSTR version; LPWSTR raw_headers; + void *optional; + DWORD optional_len; netconn_t netconn; int resolve_timeout; int connect_timeout;

1 0

Hans Leidekker : winhttp: Add support for NTLM and Negotiate authentication .
by Alexandre Julliard 30 Apr '13

30 Apr '13

Module: wine Branch: master Commit: a506d0aa3bb3ab19f9cea71f279a618761a02978 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a506d0aa3bb3ab19f9cea71f2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 30 11:32:59 2013 +0200 winhttp: Add support for NTLM and Negotiate authentication. --- dlls/winhttp/request.c | 424 +++++++++++++++++++++++++++++++++------- dlls/winhttp/session.c | 3 + dlls/winhttp/winhttp_private.h | 28 +++- 3 files changed, 380 insertions(+), 75 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a506d0aa3bb3ab19f9cea…

1 0

Christian Costa : d3dxof: Avoid dealing with remaining byte until next token or eof, check_TOKEN handles them fine.
by Alexandre Julliard 30 Apr '13

30 Apr '13

Module: wine Branch: master Commit: 37d037749d9c8954a41818d03b9f073336021f23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37d037749d9c8954a41818d03… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Apr 29 21:42:46 2013 +0200 d3dxof: Avoid dealing with remaining byte until next token or eof, check_TOKEN handles them fine. --- dlls/d3dxof/parsing.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index 546166a..1c624d3 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -1114,11 +1114,6 @@ static BOOL parse_template(parse_buffer * buf) return FALSE; if (get_TOKEN(buf) != TOKEN_CBRACE) return FALSE; - if (buf->txt) - { - /* Go to the next template */ - go_to_next_definition(buf); - } TRACE("%d - %s - %s\n", buf->pdxf->nb_xtemplates, buf->pdxf->xtemplates[buf->pdxf->nb_xtemplates].name, debugstr_guid(&buf->pdxf->xtemplates[buf->pdxf->nb_xtemplates].class_id)); buf->pdxf->nb_xtemplates++; @@ -1128,7 +1123,7 @@ static BOOL parse_template(parse_buffer * buf) BOOL parse_templates(parse_buffer * buf) { - while (buf->rem_bytes && (check_TOKEN(buf) == TOKEN_TEMPLATE)) + while (check_TOKEN(buf) == TOKEN_TEMPLATE) { if (!parse_template(buf)) {

1 0

Christian Costa : d3dxof: Only parse templates for object files, but with RegisterTemplates parse the whole file.
by Alexandre Julliard 30 Apr '13

30 Apr '13

Module: wine Branch: master Commit: 1bd5bfebaeb3cf7dd901203c6b554a20723fff0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bd5bfebaeb3cf7dd901203c6… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Apr 29 21:42:55 2013 +0200 d3dxof: Only parse templates for object files, but with RegisterTemplates parse the whole file. --- dlls/d3dx9_36/tests/xfile.c | 2 +- dlls/d3dxof/d3dxof.c | 7 ++++--- dlls/d3dxof/d3dxof_private.h | 2 +- dlls/d3dxof/parsing.c | 6 ++++-- dlls/d3dxof/tests/d3dxof.c | 2 +- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/d3dx9_36/tests/xfile.c b/dlls/d3dx9_36/tests/xfile.c index 1238bcd..e514a5f 100644 --- a/dlls/d3dx9_36/tests/xfile.c +++ b/dlls/d3dx9_36/tests/xfile.c @@ -77,7 +77,7 @@ static void test_templates(void) ok(ret == D3DXFERR_BADFILEFLOATSIZE, "RegisterTemplates returned %#x, expected %#x\n", ret, D3DXFERR_BADFILEFLOATSIZE); ret = d3dxfile->lpVtbl->RegisterTemplates(d3dxfile, templates_parse_error, sizeof(templates_parse_error) - 1); - todo_wine ok(ret == D3DXFERR_PARSEERROR, "RegisterTemplates returned %#x, expected %#x\n", ret, D3DXFERR_PARSEERROR); + ok(ret == D3DXFERR_PARSEERROR, "RegisterTemplates returned %#x, expected %#x\n", ret, D3DXFERR_PARSEERROR); ret = d3dxfile->lpVtbl->RegisterTemplates(d3dxfile, templates, sizeof(templates) - 1); ok(ret == S_OK, "RegisterTemplates failed with %#x\n", ret); diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 5a08b21..498b192 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -241,7 +241,8 @@ static HRESULT WINAPI IDirectXFileImpl_CreateEnumObject(IDirectXFile* iface, LPV if (FAILED(hr)) goto error; - if (!parse_templates(&object->buf)) + /* Check if there are templates defined before the object */ + if (!parse_templates(&object->buf, TRUE)) { hr = DXFILEERR_PARSEERROR; goto error; @@ -320,7 +321,7 @@ static HRESULT WINAPI IDirectXFileImpl_RegisterTemplates(IDirectXFile* iface, LP if (FAILED(hr)) goto cleanup; - if (!parse_templates(&buf)) + if (!parse_templates(&buf, FALSE)) { hr = DXFILEERR_PARSEERROR; goto cleanup; @@ -1003,7 +1004,7 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE } /* Check if there are templates defined before the object */ - if (!parse_templates(&This->buf)) + if (!parse_templates(&This->buf, TRUE)) return DXFILEERR_PARSEERROR; if (!This->buf.rem_bytes) diff --git a/dlls/d3dxof/d3dxof_private.h b/dlls/d3dxof/d3dxof_private.h index 8872c14..5bd3c71 100644 --- a/dlls/d3dxof/d3dxof_private.h +++ b/dlls/d3dxof/d3dxof_private.h @@ -161,7 +161,7 @@ HRESULT IDirectXFileImpl_Create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HID HRESULT parse_header(parse_buffer *buf, BYTE **decomp_buffer_ptr) DECLSPEC_HIDDEN; BOOL parse_object(parse_buffer * buf) DECLSPEC_HIDDEN; -BOOL parse_templates(parse_buffer * buf) DECLSPEC_HIDDEN; +BOOL parse_templates(parse_buffer * buf, BOOL templates_only) DECLSPEC_HIDDEN; int mszip_decompress(int inlen, int outlen, char* inbuffer, char* outbuffer) DECLSPEC_HIDDEN; diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index 1c624d3..b1dde86 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -1121,10 +1121,12 @@ static BOOL parse_template(parse_buffer * buf) return TRUE; } -BOOL parse_templates(parse_buffer * buf) +BOOL parse_templates(parse_buffer * buf, BOOL templates_only) { - while (check_TOKEN(buf) == TOKEN_TEMPLATE) + while (check_TOKEN(buf) != TOKEN_NONE) { + if (templates_only && (check_TOKEN(buf) != TOKEN_TEMPLATE)) + return TRUE; if (!parse_template(buf)) { WARN("Template is not correct\n"); diff --git a/dlls/d3dxof/tests/d3dxof.c b/dlls/d3dxof/tests/d3dxof.c index 43a7fde..f6874a4 100644 --- a/dlls/d3dxof/tests/d3dxof.c +++ b/dlls/d3dxof/tests/d3dxof.c @@ -427,7 +427,7 @@ static void test_templates(void) ok(ret == DXFILEERR_BADFILEFLOATSIZE, "RegisterTemplates returned %#x, expected %#x\n", ret, DXFILEERR_BADFILEFLOATSIZE); ret = IDirectXFile_RegisterTemplates(dxfile, templates_parse_error, sizeof(templates_parse_error) - 1); - todo_wine ok(ret == DXFILEERR_PARSEERROR, "RegisterTemplates returned %#x, expected %#x\n", ret, DXFILEERR_PARSEERROR); + ok(ret == DXFILEERR_PARSEERROR, "RegisterTemplates returned %#x, expected %#x\n", ret, DXFILEERR_PARSEERROR); IDirectXFile_Release(dxfile); }

1 0

Christian Costa : d3dxof: Get rid of go_to_next_definition.
by Alexandre Julliard 30 Apr '13

30 Apr '13

Module: wine Branch: master Commit: a180e5ed00a298f971d6a015ac476629010b1d68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a180e5ed00a298f971d6a015a… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Apr 29 21:43:03 2013 +0200 d3dxof: Get rid of go_to_next_definition. --- dlls/d3dxof/parsing.c | 40 ++-------------------------------------- 1 files changed, 2 insertions(+), 38 deletions(-) diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index b1dde86..37cf2e1 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -1065,39 +1065,6 @@ static BOOL parse_template_parts(parse_buffer * buf) return TRUE; } -static void go_to_next_definition(parse_buffer * buf) -{ - char c; - while (buf->rem_bytes) - { - if (!read_bytes(buf, &c, 1)) - return; - if ((c == '#') || (c == '/')) - { - /* Handle comment (# or //) */ - if (c == '/') - { - if (!read_bytes(buf, &c, 1)) - return; - if (c != '/') - return; - } - c = 0; - while (c != 0x0A) - { - if (!read_bytes(buf, &c, 1)) - return; - } - continue; - } - else if (!is_space(c)) - { - rewind_bytes(buf, 1); - break; - } - } -} - static BOOL parse_template(parse_buffer * buf) { if (get_TOKEN(buf) != TOKEN_TEMPLATE) @@ -1466,11 +1433,8 @@ BOOL parse_object(parse_buffer * buf) if (get_TOKEN(buf) != TOKEN_CBRACE) return FALSE; - if (buf->txt) - { - /* Go to the next object */ - go_to_next_definition(buf); - } + /* For seeking to a possibly eof to avoid parsing another object next time */ + check_TOKEN(buf); return TRUE; }

1 0

Volkan Gezer : po: Updated Turkish translation.
by Alexandre Julliard 29 Apr '13

29 Apr '13

Module: wine Branch: master Commit: 1d17274c8b3d446c64629bb3e852c810c0862e29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d17274c8b3d446c64629bb3e… Author: Volkan Gezer <volkangezer(a)gmail.com> Date: Sun Apr 28 16:57:57 2013 +0200 po: Updated Turkish translation. --- po/tr.po | 1339 ++++++++++++++++++++++++++++++++++++-------------------------- 1 files changed, 771 insertions(+), 568 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1d17274c8b3d446c64629…

1 0