March 2009 - Wine-commits - list.winehq.org

Alexandre Julliard : iphlpapi: Remove the no longer needed getNumArpEntries function.
by Alexandre Julliard 02 Mar '09

02 Mar '09

Module: wine Branch: master Commit: 7a5c5099bcb8a1079bcd31f3d93609a86327e487 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a5c5099bcb8a1079bcd31f3d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 2 12:53:41 2009 +0100 iphlpapi: Remove the no longer needed getNumArpEntries function. --- dlls/iphlpapi/ipstats.c | 45 --------------------------------------------- dlls/iphlpapi/ipstats.h | 3 --- 2 files changed, 0 insertions(+), 48 deletions(-) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index d01bf22..5ce373f 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -1268,51 +1268,6 @@ done: return ret; } -DWORD getNumArpEntries(void) -{ -#if defined(HAVE_SYS_SYSCTL_H) && defined(NET_RT_DUMP) - int mib[] = {CTL_NET, PF_ROUTE, 0, AF_INET, NET_RT_FLAGS, RTF_LLINFO}; -#define MIB_LEN (sizeof(mib) / sizeof(mib[0])) - DWORD arpEntries = 0; - size_t needed; - char *buf, *lim, *next; - struct rt_msghdr *rtm; - struct sockaddr_inarp *sinarp; - struct sockaddr_dl *sdl; - - if (sysctl (mib, MIB_LEN, NULL, &needed, NULL, 0) == -1) - { - ERR ("failed to get size of arp table\n"); - return 0; - } - - buf = HeapAlloc (GetProcessHeap (), 0, needed); - if (!buf) return 0; - - if (sysctl (mib, MIB_LEN, buf, &needed, NULL, 0) == -1) - { - ERR ("failed to get arp table\n"); - HeapFree (GetProcessHeap (), 0, buf); - return 0; - } - - lim = buf + needed; - next = buf; - while(next < lim) - { - rtm = (struct rt_msghdr *)next; - sinarp=(struct sockaddr_inarp *)(rtm + 1); - sdl = (struct sockaddr_dl *)((char *)sinarp + ROUNDUP(sinarp->sin_len)); - if(sdl->sdl_alen) /* arp entry */ - arpEntries++; - next += rtm->rtm_msglen; - } - HeapFree (GetProcessHeap (), 0, buf); - return arpEntries; -#endif - return getNumWithOneHeader("/proc/net/arp"); -} - static MIB_IPNETTABLE *append_ipnet_row( HANDLE heap, DWORD flags, MIB_IPNETTABLE *table, DWORD *count, const MIB_IPNETROW *row ) { diff --git a/dlls/iphlpapi/ipstats.h b/dlls/iphlpapi/ipstats.h index 3e05d56..88c4839 100644 --- a/dlls/iphlpapi/ipstats.h +++ b/dlls/iphlpapi/ipstats.h @@ -55,9 +55,6 @@ DWORD getUDPStats(MIB_UDPSTATS *stats); /* Returns the number of entries in the route table. */ DWORD getNumRoutes(void); -/* Returns the number of entries in the arp table. */ -DWORD getNumArpEntries(void); - /* Returns the number of entries in the UDP state table. */ DWORD getNumUdpEntries(void);

1 0

Alexandre Julliard : iphlpapi: Remove the no longer needed getNumUdpEntries function.
by Alexandre Julliard 02 Mar '09

02 Mar '09

Module: wine Branch: master Commit: 3573c6497076e35d7a5111e4136156ae26a1ae89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3573c6497076e35d7a5111e41… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 2 12:54:16 2009 +0100 iphlpapi: Remove the no longer needed getNumUdpEntries function. --- dlls/iphlpapi/ipstats.c | 16 +++++++--------- dlls/iphlpapi/ipstats.h | 3 --- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 5ce373f..103ef45 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -793,6 +793,7 @@ DWORD getUDPStats(MIB_UDPSTATS *stats) int mib[] = {CTL_NET, PF_INET, IPPROTO_UDP, UDPCTL_STATS}; #define MIB_LEN (sizeof(mib) / sizeof(mib[0])) struct udpstat udp_stat; + MIB_UDPTABLE *udp_table; size_t needed; if (!stats) return ERROR_INVALID_PARAMETER; @@ -809,7 +810,12 @@ DWORD getUDPStats(MIB_UDPSTATS *stats) stats->dwOutDatagrams = udp_stat.udps_opackets; stats->dwNoPorts = udp_stat.udps_noport; stats->dwInErrors = udp_stat.udps_hdrops + udp_stat.udps_badsum + udp_stat.udps_fullsock + udp_stat.udps_badlen; - stats->dwNumAddrs = getNumUdpEntries(); + if (!AllocateAndGetUdpTableFromStack( &udp_table, FALSE, GetProcessHeap(), 0 )) + { + stats->dwNumAddrs = udp_table->dwNumEntries; + HeapFree( GetProcessHeap(), 0, udp_table ); + } + else stats->dwNumAddrs = 0; return NO_ERROR; #else @@ -1453,14 +1459,6 @@ done: return ret; } -DWORD getNumUdpEntries(void) -{ -#if defined(HAVE_SYS_SYSCTL_H) && defined(HAVE_NETINET_IN_PCB_H) - return getNumWithOneHeader ("net.inet.udp.pcblist"); -#else - return getNumWithOneHeader("/proc/net/udp"); -#endif -} static MIB_UDPTABLE *append_udp_row( HANDLE heap, DWORD flags, MIB_UDPTABLE *table, DWORD *count, const MIB_UDPROW *row ) diff --git a/dlls/iphlpapi/ipstats.h b/dlls/iphlpapi/ipstats.h index 88c4839..2c82981 100644 --- a/dlls/iphlpapi/ipstats.h +++ b/dlls/iphlpapi/ipstats.h @@ -55,9 +55,6 @@ DWORD getUDPStats(MIB_UDPSTATS *stats); /* Returns the number of entries in the route table. */ DWORD getNumRoutes(void); -/* Returns the number of entries in the UDP state table. */ -DWORD getNumUdpEntries(void); - /* Returns the number of entries in the TCP state table. */ DWORD getNumTcpEntries(void);

1 0

Hwang YunSong(황윤성) : setupapi: Updated Korean resource.
by Alexandre Julliard 02 Mar '09

02 Mar '09

Module: wine Branch: master Commit: ff878b0c373b5ae8efe2306e322c2518e39fb19d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff878b0c373b5ae8efe2306e3… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Mon Mar 2 16:42:16 2009 +0900 setupapi: Updated Korean resource. --- dlls/setupapi/Ko.rc | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/setupapi/Ko.rc b/dlls/setupapi/Ko.rc index 9c1fad3..dfd75a9 100644 --- a/dlls/setupapi/Ko.rc +++ b/dlls/setupapi/Ko.rc @@ -20,6 +20,14 @@ LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE +{ + IDS_PROMPTDISK "�� '%s' �� %s�� ʿ�� մϴ�" + IDS_UNKNOWN "�˼� ��" + IDS_COPYFROM "�� ġ�� :" + IDS_INFO "�� ġ�� θ� �Է��ϰ�, Ȯ�� Ŭ��Ͻʽÿ�." +} + COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION CAPTION "�� ..." @@ -32,3 +40,17 @@ BEGIN LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP END + +IDPROMPTFORDISK DIALOG MOVEABLE DISCARDABLE 0, 0, 250, 120 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "�ʿ�� ϵ�" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "��ۻ�� ġ ��ũ�� ϰ�, \ �Ʒ�� õ� ��̺갡 �ùٸ�� Ȯ��Ͻÿ� ", IDC_FILENEEDED, 10, 10, 175, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", IDC_INFO, 10, 50, 175, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "��ۻ�� ϵ� �� :", IDC_COPYFROM, 10, 90, 175, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", IDC_PATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 10, 100, 175, 14 + PUSHBUTTON "Ȯ��", IDOK, 195, 10, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "��", IDCANCEL, 195, 30, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "ã��...", IDC_RUNDLG_BROWSE, 195, 100, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END

1 0

Hwang YunSong(황윤성) : wordpad: Updated Korean resource.
by Alexandre Julliard 02 Mar '09

02 Mar '09

Module: wine Branch: master Commit: 9b309b0142144839f51f4de86cd0ed378fb2c680 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b309b0142144839f51f4de86… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Mon Mar 2 16:42:56 2009 +0900 wordpad: Updated Korean resource. --- programs/wordpad/Ko.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/wordpad/Ko.rc b/programs/wordpad/Ko.rc index 79885f5..7bfaf00 100644 --- a/programs/wordpad/Ko.rc +++ b/programs/wordpad/Ko.rc @@ -242,4 +242,5 @@ BEGIN STRING_OPEN_FAILED, "�� ϴ�." STRING_OPEN_ACCESS_DENIED, "�� ϴ�." STRING_PRINTING_NOT_IMPLEMENTED, "�μ�� ʽ��ϴ�" + STRING_MAX_TAB_STOPS, " �� 32�� ̻� �߰� �� ϴ�." END

1 0

Alexandre Julliard : iphlpapi: Reimplement GetUdpTable to avoid parsing the same information three times.
by Alexandre Julliard 02 Mar '09

02 Mar '09

Module: wine Branch: master Commit: d069e498e17ae8daea44bf284deb0492c301d219 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d069e498e17ae8daea44bf284… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 2 12:43:33 2009 +0100 iphlpapi: Reimplement GetUdpTable to avoid parsing the same information three times. --- dlls/iphlpapi/iphlpapi_main.c | 39 ++++---------- dlls/iphlpapi/ipstats.c | 118 ++++++++++++++++++++--------------------- 2 files changed, 68 insertions(+), 89 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index f580ca8..c9ced14 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1685,31 +1685,17 @@ DWORD WINAPI GetUdpStatistics(PMIB_UDPSTATS pStats) */ DWORD WINAPI GetUdpTable(PMIB_UDPTABLE pUdpTable, PDWORD pdwSize, BOOL bOrder) { - DWORD ret; + DWORD ret; + PMIB_UDPTABLE table; - TRACE("pUdpTable %p, pdwSize %p, bOrder %d\n", pUdpTable, pdwSize, - (DWORD)bOrder); - if (!pdwSize) - ret = ERROR_INVALID_PARAMETER; - else { - DWORD numEntries = getNumUdpEntries(); - DWORD size = sizeof(MIB_UDPTABLE); + TRACE("pUdpTable %p, pdwSize %p, bOrder %d\n", pUdpTable, pdwSize, bOrder); - if (numEntries > 1) - size += (numEntries - 1) * sizeof(MIB_UDPROW); - if (!pUdpTable || *pdwSize < size) { - *pdwSize = size; - ret = ERROR_INSUFFICIENT_BUFFER; - } - else { - PMIB_UDPTABLE table; + if (!pdwSize) return ERROR_INVALID_PARAMETER; - ret = getUdpTable(&table, GetProcessHeap(), 0); - if (!ret) { - size = sizeof(MIB_UDPTABLE); - if (table->dwNumEntries > 1) - size += (table->dwNumEntries - 1) * sizeof(MIB_UDPROW); - if (*pdwSize < size) { + ret = getUdpTable(&table, GetProcessHeap(), 0); + if (!ret) { + DWORD size = FIELD_OFFSET( MIB_UDPTABLE, table[table->dwNumEntries] ); + if (!pUdpTable || *pdwSize < size) { *pdwSize = size; ret = ERROR_INSUFFICIENT_BUFFER; } @@ -1719,16 +1705,11 @@ DWORD WINAPI GetUdpTable(PMIB_UDPTABLE pUdpTable, PDWORD pdwSize, BOOL bOrder) if (bOrder) qsort(pUdpTable->table, pUdpTable->dwNumEntries, sizeof(MIB_UDPROW), UdpTableSorter); - ret = NO_ERROR; } HeapFree(GetProcessHeap(), 0, table); - } - else - ret = ERROR_OUTOFMEMORY; } - } - TRACE("returning %d\n", ret); - return ret; + TRACE("returning %d\n", ret); + return ret; } diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index ada1430..57398bb 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -1,5 +1,7 @@ -/* Copyright (C) 2003,2006 Juan Lang +/* + * Copyright (C) 2003,2006 Juan Lang * Copyright (C) 2007 TransGaming Technologies Inc. + * Copyright (C) 2009 Alexandre Julliard * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -14,9 +16,6 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - * - * This file implements statistics getting using the /proc filesystem exported - * by Linux, and maybe other OSes. */ #include "config.h" @@ -1480,72 +1479,71 @@ DWORD getNumUdpEntries(void) #endif } -DWORD getUdpTable(PMIB_UDPTABLE *ppUdpTable, HANDLE heap, DWORD flags) +static MIB_UDPTABLE *append_udp_row( HANDLE heap, DWORD flags, MIB_UDPTABLE *table, + DWORD *count, const MIB_UDPROW *row ) { - DWORD ret; + if (table->dwNumEntries >= *count) + { + MIB_UDPTABLE *new_table; + DWORD new_count = table->dwNumEntries * 2; -#if defined(HAVE_SYS_SYSCTL_H) && defined(NET_RT_DUMP) - ERR ("unimplemented!\n"); - return ERROR_NOT_SUPPORTED; -#endif + if (!(new_table = HeapReAlloc( heap, flags, table, FIELD_OFFSET(MIB_UDPTABLE, table[new_count] )))) + { + HeapFree( heap, 0, table ); + return NULL; + } + *count = new_count; + table = new_table; + } + memcpy( &table->table[table->dwNumEntries++], row, sizeof(*row) ); + return table; +} - if (!ppUdpTable) - ret = ERROR_INVALID_PARAMETER; - else { - DWORD numEntries = getNumUdpEntries(); - DWORD size = sizeof(MIB_UDPTABLE); - PMIB_UDPTABLE table; +DWORD getUdpTable(PMIB_UDPTABLE *ppUdpTable, HANDLE heap, DWORD flags) +{ + MIB_UDPTABLE *table; + MIB_UDPROW row; + DWORD ret = NO_ERROR, count = 16; - if (numEntries > 1) - size += (numEntries - 1) * sizeof(MIB_UDPROW); - table = HeapAlloc(heap, flags, size); - if (table) { - FILE *fp; + if (!ppUdpTable) return ERROR_INVALID_PARAMETER; - ret = NO_ERROR; - *ppUdpTable = table; - table->dwNumEntries = 0; - /* get from /proc/net/udp, no error if can't */ - fp = fopen("/proc/net/udp", "r"); - if (fp) { - char buf[512] = { 0 }, *ptr; + if (!(table = HeapAlloc( heap, flags, FIELD_OFFSET(MIB_UDPTABLE, table[count] )))) + return ERROR_OUTOFMEMORY; - /* skip header line */ - ptr = fgets(buf, sizeof(buf), fp); - while (ptr && table->dwNumEntries < numEntries) { - memset(&table->table[table->dwNumEntries], 0, sizeof(MIB_UDPROW)); - ptr = fgets(buf, sizeof(buf), fp); - if (ptr) { - char *endPtr; + table->dwNumEntries = 0; - if (ptr && *ptr) { - strtoul(ptr, &endPtr, 16); /* skip */ - ptr = endPtr; - } - if (ptr && *ptr) { - ptr++; - table->table[table->dwNumEntries].dwLocalAddr = strtoul(ptr, - &endPtr, 16); - ptr = endPtr; - } - if (ptr && *ptr) { - ptr++; - table->table[table->dwNumEntries].dwLocalPort = strtoul(ptr, - &endPtr, 16); - ptr = endPtr; +#ifdef __linux__ + { + FILE *fp; + + if ((fp = fopen("/proc/net/udp", "r"))) + { + char buf[512], *ptr; + DWORD dummy; + + /* skip header line */ + ptr = fgets(buf, sizeof(buf), fp); + while ((ptr = fgets(buf, sizeof(buf), fp))) + { + if (sscanf( ptr, "%u: %x:%x", &dummy, &row.dwLocalAddr, &row.dwLocalPort ) != 3) + continue; + row.dwLocalPort = htons( row.dwLocalPort ); + if (!(table = append_udp_row( heap, flags, table, &count, &row ))) + break; } - table->dwNumEntries++; - } + fclose(fp); } - fclose(fp); - } - else - ret = ERROR_NOT_SUPPORTED; + else ret = ERROR_NOT_SUPPORTED; } - else - ret = ERROR_OUTOFMEMORY; - } - return ret; +#else + FIXME( "not implemented\n" ); + ret = ERROR_NOT_SUPPORTED; +#endif + + if (!table) return ERROR_OUTOFMEMORY; + if (!ret) *ppUdpTable = table; + else HeapFree( heap, flags, table ); + return ret; }

1 0

Alexandre Julliard : iphlpapi: Reimplement GetTcpTable to avoid parsing the same information three times.
by Alexandre Julliard 02 Mar '09

02 Mar '09

Module: wine Branch: master Commit: 53d522bc545ca2d2bca012e5a4a70398144e63c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53d522bc545ca2d2bca012e5a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 2 12:45:12 2009 +0100 iphlpapi: Reimplement GetTcpTable to avoid parsing the same information three times. --- dlls/iphlpapi/iphlpapi_main.c | 52 ++++----- dlls/iphlpapi/ipstats.c | 273 ++++++++++++++++++----------------------- dlls/iphlpapi/ipstats.h | 3 +- 3 files changed, 145 insertions(+), 183 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=53d522bc545ca2d2bca01…

1 0

Paul Vriens : d3d8/tests: Use win_skip() and skip() where appropriate.
by Alexandre Julliard 02 Mar '09

02 Mar '09

Module: wine Branch: master Commit: 1dc4d5caae321ac83ef70241931f112d18a8202e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1dc4d5caae321ac83ef702419… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Mar 2 11:46:58 2009 +0100 d3d8/tests: Use win_skip() and skip() where appropriate. --- dlls/d3d8/tests/visual.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 5728269..61082e0 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -1278,14 +1278,14 @@ START_TEST(visual) d3d8_handle = LoadLibraryA("d3d8.dll"); if (!d3d8_handle) { - skip("Could not load d3d8.dll\n"); + win_skip("Could not load d3d8.dll\n"); return; } device_ptr = init_d3d8(); if (!device_ptr) { - skip("Could not initialize direct3d\n"); + win_skip("Could not initialize direct3d\n"); return; } @@ -1295,7 +1295,7 @@ START_TEST(visual) hr = IDirect3DDevice8_Clear(device_ptr, 0, NULL, D3DCLEAR_TARGET, 0xffff0000, 0.0, 0); if(FAILED(hr)) { - trace("Clear failed, can't assure correctness of the test results, skipping\n"); + skip("Clear failed, can't assure correctness of the test results\n"); goto cleanup; } IDirect3DDevice8_Present(device_ptr, NULL, NULL, NULL, NULL); @@ -1303,14 +1303,14 @@ START_TEST(visual) color = getPixelColor(device_ptr, 1, 1); if(color !=0x00ff0000) { - trace("Sanity check returned an incorrect color(%08x), can't assure the correctness of the tests, skipping\n", color); + skip("Sanity check returned an incorrect color(%08x), can't assure the correctness of the tests\n", color); goto cleanup; } hr = IDirect3DDevice8_Clear(device_ptr, 0, NULL, D3DCLEAR_TARGET, 0xff00ddee, 0.0, 0); if(FAILED(hr)) { - trace("Clear failed, can't assure correctness of the test results, skipping\n"); + skip("Clear failed, can't assure correctness of the test results\n"); goto cleanup; } IDirect3DDevice8_Present(device_ptr, NULL, NULL, NULL, NULL); @@ -1318,7 +1318,7 @@ START_TEST(visual) color = getPixelColor(device_ptr, 639, 479); if(color != 0x0000ddee) { - trace("Sanity check returned an incorrect color(%08x), can't assure the correctness of the tests, skipping\n", color); + skip("Sanity check returned an incorrect color(%08x), can't assure the correctness of the tests\n", color); goto cleanup; }

1 0

Alexandre Julliard : loader: Get rid of the no longer supported wine-kthread.
by Alexandre Julliard 02 Mar '09

02 Mar '09

Module: wine Branch: master Commit: 0e446d5912567efdef6cd9b2f7d23e77f7622cb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e446d5912567efdef6cd9b2f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 2 12:29:32 2009 +0100 loader: Get rid of the no longer supported wine-kthread. --- .gitignore | 2 - configure | 6 +- configure.ac | 4 +- include/config.h.in | 6 - loader/Makefile.in | 10 - loader/glibc.c | 17 +- loader/kthread.c | 975 --------------------------------------------------- 7 files changed, 9 insertions(+), 1011 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0e446d5912567efdef6cd…

1 0

Henri Verbeet : d3d10: Fix a typo.
by Alexandre Julliard 02 Mar '09

02 Mar '09

Module: wine Branch: master Commit: 892ce1db5e1a7c9ccdc67c9c8edb6661c0fdbcf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=892ce1db5e1a7c9ccdc67c9c8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 2 08:52:48 2009 +0100 d3d10: Fix a typo. --- dlls/d3d10/effect.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 09a9378..4e725e3 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -32,8 +32,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d10); static inline void read_dword(const char **ptr, DWORD *d) { - memcpy(d, *ptr, sizeof(d)); - *ptr += sizeof(d); + memcpy(d, *ptr, sizeof(*d)); + *ptr += sizeof(*d); } static inline void skip_dword_unknown(const char **ptr, unsigned int count)

1 0

Henri Verbeet : d3d10: Implement ID3D10Effect::GetTechniqueByName().
by Alexandre Julliard 02 Mar '09

02 Mar '09

Module: wine Branch: master Commit: 5e59028a4eb0e1f3c7ae1895659a876e11287bac URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e59028a4eb0e1f3c7ae18956… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 2 08:52:49 2009 +0100 d3d10: Implement ID3D10Effect::GetTechniqueByName(). --- dlls/d3d10/d3d10_private.h | 3 + dlls/d3d10/effect.c | 89 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 91 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 02e0eec..a832c83 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -52,8 +52,11 @@ struct d3d10_effect_pass struct d3d10_effect_variable *variables; }; +/* ID3D10EffectTechnique */ struct d3d10_effect_technique { + const struct ID3D10EffectTechniqueVtbl *vtbl; + char *name; DWORD start; DWORD pass_count; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 4e725e3..9f1b77e 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -30,6 +30,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d10); #define TAG_DXBC MAKE_TAG('D', 'X', 'B', 'C') #define TAG_FX10 MAKE_TAG('F', 'X', '1', '0') +static const struct ID3D10EffectTechniqueVtbl d3d10_effect_technique_vtbl; + static inline void read_dword(const char **ptr, DWORD *d) { memcpy(d, *ptr, sizeof(*d)); @@ -322,6 +324,9 @@ static HRESULT parse_fx10_body(struct d3d10_effect *e, const char *data, DWORD d for (i = 0; i < e->technique_count; ++i) { struct d3d10_effect_technique *t = &e->techniques[i]; + + t->vtbl = &d3d10_effect_technique_vtbl; + hr = parse_fx10_technique_index(t, &ptr); if (FAILED(hr)) break; @@ -569,7 +574,20 @@ static struct ID3D10EffectTechnique * STDMETHODCALLTYPE d3d10_effect_GetTechniqu static struct ID3D10EffectTechnique * STDMETHODCALLTYPE d3d10_effect_GetTechniqueByName(ID3D10Effect *iface, LPCSTR name) { - FIXME("iface %p, name \"%s\" stub!\n", iface, name); + struct d3d10_effect *This = (struct d3d10_effect *)iface; + unsigned int i; + + TRACE("iface %p, name \"%s\"\n", iface, name); + + for (i = 0; i < This->technique_count; ++i) + { + struct d3d10_effect_technique *t = &This->techniques[i]; + if (!strcmp(t->name, name)) + { + TRACE("Returning technique %p\n", t); + return (ID3D10EffectTechnique *)t; + } + } return NULL; } @@ -609,3 +627,72 @@ const struct ID3D10EffectVtbl d3d10_effect_vtbl = d3d10_effect_Optimize, d3d10_effect_IsOptimized, }; + +/* ID3D10EffectTechnique methods */ + +static BOOL STDMETHODCALLTYPE d3d10_effect_technique_IsValid(ID3D10EffectTechnique *iface) +{ + FIXME("iface %p stub!\n", iface); + + return FALSE; +} + +static HRESULT STDMETHODCALLTYPE d3d10_effect_technique_GetDesc(ID3D10EffectTechnique *iface, + D3D10_TECHNIQUE_DESC *desc) +{ + FIXME("iface %p, desc %p stub!\n", iface, desc); + + return E_NOTIMPL; +} + +static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_technique_GetAnnotationByIndex( + ID3D10EffectTechnique *iface, UINT index) +{ + FIXME("iface %p, index %u stub!\n", iface, index); + + return NULL; +} + +static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_technique_GetAnnotationByName( + ID3D10EffectTechnique *iface, LPCSTR name) +{ + FIXME("iface %p, name \"%s\" stub!\n", iface, name); + + return NULL; +} + +static struct ID3D10EffectPass * STDMETHODCALLTYPE d3d10_effect_technique_GetPassByIndex(ID3D10EffectTechnique *iface, + UINT index) +{ + FIXME("iface %p, index %u stub!\n", iface, index); + + return NULL; +} + +static struct ID3D10EffectPass * STDMETHODCALLTYPE d3d10_effect_technique_GetPassByName(ID3D10EffectTechnique *iface, + LPCSTR name) +{ + FIXME("iface %p, name \"%s\" stub!\n", iface, name); + + return NULL; +} + +static HRESULT STDMETHODCALLTYPE d3d10_effect_technique_ComputeStateBlockMask(ID3D10EffectTechnique *iface, + D3D10_STATE_BLOCK_MASK *mask) +{ + FIXME("iface %p,mask %p stub!\n", iface, mask); + + return E_NOTIMPL; +} + +static const struct ID3D10EffectTechniqueVtbl d3d10_effect_technique_vtbl = +{ + /* ID3D10EffectTechnique methods */ + d3d10_effect_technique_IsValid, + d3d10_effect_technique_GetDesc, + d3d10_effect_technique_GetAnnotationByIndex, + d3d10_effect_technique_GetAnnotationByName, + d3d10_effect_technique_GetPassByIndex, + d3d10_effect_technique_GetPassByName, + d3d10_effect_technique_ComputeStateBlockMask, +};

1 0