January 2010 - Wine-commits

Julius Schwartzenberg : avifil32: Allow files with different extensions to be loaded.
by Alexandre Julliard 19 Jan '10

19 Jan '10

Module: wine Branch: master Commit: 65f6474c6c129b4dc8cfe72d954cf9915d4ab9ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=65f6474c6c129b4dc8cfe72d9… Author: Julius Schwartzenberg <julius.schwartzenberg(a)gmail.com> Date: Sat Jan 9 21:05:58 2010 +0100 avifil32: Allow files with different extensions to be loaded. --- dlls/avifil32/api.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/avifil32/api.c b/dlls/avifil32/api.c index c3dc72f..dd1c2e2 100644 --- a/dlls/avifil32/api.c +++ b/dlls/avifil32/api.c @@ -244,7 +244,7 @@ HRESULT WINAPI AVIFileOpenW(PAVIFILE *ppfile, LPCWSTR szFile, UINT uMode, /* if no handler then try guessing it by extension */ if (lpHandler == NULL) { if (! AVIFILE_GetFileHandlerByExtension(szFile, &clsidHandler)) - return AVIERR_UNSUPPORTED; + clsidHandler = CLSID_AVIFile; } else clsidHandler = *lpHandler;

1 0

Mike Kaplinskiy : server: Activate pending asyncs on a hangup/error.
by Alexandre Julliard 19 Jan '10

19 Jan '10

Module: wine Branch: master Commit: 8e669d9a61ba4558b5de8d63c83936684c277b2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e669d9a61ba4558b5de8d63c… Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Sat Jan 2 03:44:32 2010 -0500 server: Activate pending asyncs on a hangup/error. --- server/sock.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/sock.c b/server/sock.c index 71d8ccb..ed89ca2 100644 --- a/server/sock.c +++ b/server/sock.c @@ -248,13 +248,13 @@ static void sock_wake_up( struct sock *sock, int pollev ) int i; int async_active = 0; - if ( pollev & (POLLIN|POLLPRI) && async_waiting( sock->read_q )) + if ( pollev & (POLLIN|POLLPRI|POLLERR|POLLHUP) && async_waiting( sock->read_q )) { if (debug_level) fprintf( stderr, "activating read queue for socket %p\n", sock ); async_wake_up( sock->read_q, STATUS_ALERTED ); async_active = 1; } - if ( pollev & POLLOUT && async_waiting( sock->write_q )) + if ( pollev & (POLLOUT|POLLERR|POLLHUP) && async_waiting( sock->write_q )) { if (debug_level) fprintf( stderr, "activating write queue for socket %p\n", sock ); async_wake_up( sock->write_q, STATUS_ALERTED );

1 0

Vitaly Lipatov : wineconsole: Fix Russian translation.
by Alexandre Julliard 19 Jan '10

19 Jan '10

Module: wine Branch: master Commit: f8562ace96af5947c59ab5b066fbd2d55d610681 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8562ace96af5947c59ab5b06… Author: Vitaly Lipatov <lav(a)etersoft.ru> Date: Wed Jan 13 08:26:51 2010 +0300 wineconsole: Fix Russian translation. --- programs/wineconsole/wineconsole_Ru.rc | 33 ++++++++++++++++--------------- 1 files changed, 17 insertions(+), 16 deletions(-) diff --git a/programs/wineconsole/wineconsole_Ru.rc b/programs/wineconsole/wineconsole_Ru.rc index 0cebb2d..11ea6d3 100644 --- a/programs/wineconsole/wineconsole_Ru.rc +++ b/programs/wineconsole/wineconsole_Ru.rc @@ -2,6 +2,7 @@ * wineconsole (Russian resources) * * Copyright 2003 Igor Stepin + * Copyright 2010 Vitaly Lipatov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -33,36 +34,36 @@ IDS_PROPERTIES, "С&войства" IDS_MARK, "&Выделить" IDS_COPY, "&Копировать" IDS_PASTE, "&Вставить" -IDS_SELECTALL, "Выделить в&се" +IDS_SELECTALL, "Выделить в&сё" IDS_SCROLL, "Прок&рутить" IDS_SEARCH, "По&иск" IDS_FNT_DISPLAY, "Каждый символ %ld пикселей в ширину и %ld пикселей в высоту" IDS_FNT_PREVIEW_1, "Это тест" IDS_FNT_PREVIEW_2, "This is a test" -IDS_DLG_TIT_DEFAULT, "Настройка - Установки по умолчанию" -IDS_DLG_TIT_CURRENT, "Настройка - Текущие установки" -IDS_DLG_TIT_ERROR, "Ошибка настройки" +IDS_DLG_TIT_DEFAULT, "Настройка - Установки по умолчанию" +IDS_DLG_TIT_CURRENT, "Настройка - Текущие установки" +IDS_DLG_TIT_ERROR, "Ошибка настройки" IDS_DLG_ERR_SBWINSIZE, "Размер буфера экрана должен быть не менее буфера окна" -IDS_CMD_INVALID_EVENT_ID "wineconsole: Не верно указан код события\n" -IDS_CMD_INVALID_BACKEND "wineconsole: Не известный backend\n" -IDS_CMD_INVALID_OPTION "wineconsole: Указанная опция не найдена\n" +IDS_CMD_INVALID_EVENT_ID "wineconsole: Неверно указан код события\n" +IDS_CMD_INVALID_BACKEND "wineconsole: Неизвестный backend\n" +IDS_CMD_INVALID_OPTION "wineconsole: Неверный параметр командной строки\n" IDS_CMD_ABOUT "Запуск программы в консоли Wine\n" IDS_CMD_LAUNCH_FAILED "wineconsole: Не удался запуск программы '%s'.\n"\ - "Не верно указанна команда.\n" + "Неверно указана команда.\n" -IDS_USAGE_HEADER "\nВызов:\n wineconsole [опции] <команда>\n\nОпции:\n" +IDS_USAGE_HEADER "\nВызов:\n wineconsole [параметры] <команда>\n\nПараметры:\n" IDS_USAGE_BACKEND " --backend={user|curses} Выбор 'user' откроет новое окно с полной поддержкой\n"\ " всех режимов работы консоли. 'curses' - использует\n"\ " текущее окно с ограниченной функциональностью\n"\ -IDS_USAGE_COMMAND " <команда> Имя программы для запуска в консоли Wine\n" +IDS_USAGE_COMMAND " <команда> Название программы для запуска в консоли Wine\n" IDS_USAGE_FOOTER "\nНапример:\n wineconsole cmd\nЗапустить командный процессор Wine в консоли Wine\n\n" END IDD_OPTION DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 140, 105 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION " Опции " +CAPTION " Параметры " FONT 8, "MS Shell Dlg" { GROUPBOX "Размер курсора", -1, 10, 11, 60, 54, BS_GROUPBOX @@ -81,7 +82,7 @@ FONT 8, "MS Shell Dlg" LTEXT "&История команд:", -1, 14, 77, 78, 18 EDITTEXT IDC_OPT_HIST_SIZE, 82, 79, 31, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER CONTROL "", IDC_OPT_HIST_SIZE_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 - AUTOCHECKBOX "&Удалять дублирующиеся", IDC_OPT_HIST_NODOUBLE, 120, 77, 70, 18, WS_TABSTOP|BS_MULTILINE + AUTOCHECKBOX "&Удалять повторяющиеся", IDC_OPT_HIST_NODOUBLE, 120, 77, 70, 18, WS_TABSTOP|BS_MULTILINE } IDD_FONT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 140, 105 @@ -106,18 +107,18 @@ CAPTION " Настройка " FONT 8, "MS Shell Dlg" { GROUPBOX "Зона буфера", -1, 8, 11, 100, 42, BS_GROUPBOX - LTEXT "&Ширина :", -1, 14, 25, 54, 9 + LTEXT "&Ширина:", -1, 14, 25, 54, 9 EDITTEXT IDC_CNF_SB_WIDTH, 68, 23, 36, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER CONTROL "", IDC_CNF_SB_WIDTH_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 - LTEXT "&Высота :", -1, 14, 39, 54, 9 + LTEXT "&Высота:", -1, 14, 39, 54, 9 EDITTEXT IDC_CNF_SB_HEIGHT, 68, 37, 36, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER CONTROL "", IDC_CNF_SB_HEIGHT_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 GROUPBOX "Размер окна", -1, 8, 55, 100, 42 - LTEXT "Ш&ирина :", -1, 14, 69, 54, 9 + LTEXT "Ш&ирина:", -1, 14, 69, 54, 9 EDITTEXT IDC_CNF_WIN_WIDTH, 68, 67, 36, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER CONTROL "", IDC_CNF_WIN_WIDTH_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 - LTEXT "В&ысота :", -1, 14, 83, 54, 9 + LTEXT "В&ысота:", -1, 14, 83, 54, 9 EDITTEXT IDC_CNF_WIN_HEIGHT, 68, 81, 36, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER CONTROL "", IDC_CNF_WIN_HEIGHT_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0

1 0

Ilya Shpigor : winex11.drv: Produce VK_CANCEL vkey on the Ctrl+Pause/ Break pressing.
by Alexandre Julliard 19 Jan '10

19 Jan '10

Module: wine Branch: master Commit: a374b3cbbede1c15361130f98485454028492e23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a374b3cbbede1c15361130f98… Author: Ilya Shpigor <shpigor(a)etersoft.ru> Date: Tue Jan 19 11:12:45 2010 +0300 winex11.drv: Produce VK_CANCEL vkey on the Ctrl+Pause/Break pressing. --- dlls/winex11.drv/keyboard.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 4d486b0..74581cb 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1140,6 +1140,11 @@ static WORD EVENT_event_to_vkey( XIC xic, XKeyEvent *e) * depending on the NumLock state */ return nonchar_key_vkey[keysym & 0xFF]; + /* Pressing the Pause/Break key alone produces VK_PAUSE vkey, while + * pressing Ctrl+Pause/Break produces VK_CANCEL. */ + if ((e->state & ControlMask) && (keysym == XK_Break)) + return VK_CANCEL; + TRACE_(key)("e->keycode = %x\n", e->keycode); return keyc2vkey[e->keycode];

1 0

André Hentschel : msvcrt: Fix typo.
by Alexandre Julliard 19 Jan '10

19 Jan '10

Module: wine Branch: master Commit: 13e8505e58da5dc458c74bb6b140851e51aaf38f URL: http://source.winehq.org/git/wine.git/?a=commit;h=13e8505e58da5dc458c74bb6b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jan 19 14:33:43 2010 +0100 msvcrt: Fix typo. --- dlls/msvcrt/locale.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index b216838..c60b80d 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -462,7 +462,7 @@ char* CDECL MSVCRT_setlocale(int category, const char* locale) } /********************************************************************* - * setlocale (MSVCRT.@) + * wsetlocale (MSVCRT.@) */ MSVCRT_wchar_t* CDECL MSVCRT__wsetlocale(int category, const MSVCRT_wchar_t* locale) {

1 0

Hans Leidekker : msi: Add a test to exersize the code to retrieve rows from join tables.
by Alexandre Julliard 19 Jan '10

19 Jan '10

Module: wine Branch: master Commit: 72393c55e90477fa36c46fcda378a9b0bc53991c URL: http://source.winehq.org/git/wine.git/?a=commit;h=72393c55e90477fa36c46fcda… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jan 19 15:08:48 2010 +0100 msi: Add a test to exersize the code to retrieve rows from join tables. --- dlls/msi/tests/db.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index d3e9ad1..6a2852d 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -3218,6 +3218,9 @@ static void test_join(void) ok( !lstrcmp( buf, join_res_first[i].two ), "For (row %d, column 2) expected '%s', got %s\n", i, join_res_first[i].two, buf ); + r = MsiViewModify(hview, MSIMODIFY_UPDATE, hrec); + todo_wine ok( r == ERROR_SUCCESS, "failed to modiy view: %d\n", r ); + i++; MsiCloseHandle(hrec); }

1 0

Paul Vriens : shell32/tests: Fix crash on ancient Win95.
by Alexandre Julliard 19 Jan '10

19 Jan '10

Module: wine Branch: master Commit: 83c422e1119f7b4768d7e06dcbb080fb3ae3a203 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83c422e1119f7b4768d7e06dc… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jan 19 16:02:26 2010 +0100 shell32/tests: Fix crash on ancient Win95. --- dlls/shell32/tests/progman_dde.c | 30 +++++++++++++++++++++++++----- 1 files changed, 25 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/tests/progman_dde.c b/dlls/shell32/tests/progman_dde.c index 0a7fdaa..333e1f1 100644 --- a/dlls/shell32/tests/progman_dde.c +++ b/dlls/shell32/tests/progman_dde.c @@ -102,6 +102,30 @@ static BOOL use_common(void) return TRUE; } +static BOOL full_title(void) +{ + CABINETSTATE cs; + + memset(&cs, 0, sizeof(cs)); + if (pReadCabinetState) + { + pReadCabinetState(&cs, sizeof(cs)); + } + else + { + HKEY key; + DWORD size; + + win_skip("ReadCabinetState is not available, reading registry directly\n"); + RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\CabinetState", &key); + size = sizeof(cs); + RegQueryValueExA(key, "Settings", NULL, NULL, (LPBYTE)&cs, &size); + RegCloseKey(key); + } + + return (cs.fFullPathTitle == -1); +} + static char ProgramsDir[MAX_PATH]; static char Group1Title[MAX_PATH] = "Group1"; @@ -115,8 +139,6 @@ static void init_strings(void) char commonprograms[MAX_PATH]; char programs[MAX_PATH]; - CABINETSTATE cs; - if (pSHGetSpecialFolderPathA) { pSHGetSpecialFolderPathA(NULL, programs, CSIDL_PROGRAMS, FALSE); @@ -153,9 +175,7 @@ static void init_strings(void) else lstrcpyA(ProgramsDir, programs); - memset(&cs, 0, sizeof(cs)); - pReadCabinetState(&cs, sizeof(cs)); - if (cs.fFullPathTitle == -1) + if (full_title()) { lstrcpyA(Group1Title, ProgramsDir); lstrcatA(Group1Title, "\\Group1");

1 0

Paul Vriens : rasapi32/tests: Fix some test failures on Win9x.
by Alexandre Julliard 19 Jan '10

19 Jan '10

Module: wine Branch: master Commit: c5112d9f6f75d0160645829c466cb83ae1786b12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5112d9f6f75d0160645829c4… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jan 19 16:44:22 2010 +0100 rasapi32/tests: Fix some test failures on Win9x. --- dlls/rasapi32/tests/rasapi.c | 3 ++- include/raserror.h | 1 + 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/rasapi32/tests/rasapi.c b/dlls/rasapi32/tests/rasapi.c index 1bc684c..d25c741 100644 --- a/dlls/rasapi32/tests/rasapi.c +++ b/dlls/rasapi32/tests/rasapi.c @@ -55,7 +55,8 @@ static void test_rasenum(void) /* create the return buffer */ result = pRasEnumDevicesA(NULL, &bufsize, &cDevices); - if(ERROR_RASMAN_CANNOT_INITIALIZE == result) { + if(ERROR_RASMAN_CANNOT_INITIALIZE == result || + ERROR_STATE_MACHINES_NOT_STARTED == result) { win_skip("RAS configuration problem\n"); return; } diff --git a/include/raserror.h b/include/raserror.h index 694dfe9..1735936 100644 --- a/include/raserror.h +++ b/include/raserror.h @@ -23,6 +23,7 @@ #define ERROR_BUFFER_TOO_SMALL (RASBASE+3) #define ERROR_BUFFER_INVALID (RASBASE+10) #define ERROR_INVALID_SIZE (RASBASE+32) +#define ERROR_STATE_MACHINES_NOT_STARTED (RASBASE+95) #define ERROR_RASMAN_CANNOT_INITIALIZE (RASBASE+111) #endif

1 0

Christian Costa : d3drm: Add definitions for IDirect3DRMFace.
by Alexandre Julliard 19 Jan '10

19 Jan '10

Module: wine Branch: master Commit: ecbeda64dd4147b4874cdee1feffd16501329739 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecbeda64dd4147b4874cdee1f… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Mon Jan 18 23:23:24 2010 +0100 d3drm: Add definitions for IDirect3DRMFace. --- include/d3drmobj.h | 110 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 110 insertions(+), 0 deletions(-) diff --git a/include/d3drmobj.h b/include/d3drmobj.h index 6d98a2b..0ec4ee1 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -2181,6 +2181,116 @@ DECLARE_INTERFACE_(IDirect3DRMShadow2,IDirect3DRMVisual) #define IDirect3DRMShadow2_SetOptions(p,a) (p)->lpVtbl->SetOptions(p,a) #endif +/***************************************************************************** + * IDirect3DRMFace interface + */ +#define INTERFACE IDirect3DRMFace +DECLARE_INTERFACE_(IDirect3DRMFace,IDirect3DRMObject) +{ + /*** IUnknown methods ***/ + STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; + /*** IDirect3DRMObject methods ***/ + STDMETHOD(Clone)(THIS_ LPUNKNOWN pUnkOuter, REFIID riid, LPVOID *ppvObj) PURE; + STDMETHOD(AddDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK, LPVOID argument) PURE; + STDMETHOD(DeleteDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK, LPVOID argument) PURE; + STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; + STDMETHOD_(DWORD, GetAppData)(THIS) PURE; + STDMETHOD(SetName)(THIS_ LPCSTR) PURE; + STDMETHOD(GetName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; + STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; + /*** IDirect3DRMFace methods ***/ + STDMETHOD(AddVertex)(THIS_ D3DVALUE x, D3DVALUE y, D3DVALUE z) PURE; + STDMETHOD(AddVertexAndNormalIndexed)(THIS_ DWORD vertex, DWORD normal) PURE; + STDMETHOD(SetColorRGB)(THIS_ D3DVALUE, D3DVALUE, D3DVALUE) PURE; + STDMETHOD(SetColor)(THIS_ D3DCOLOR) PURE; + STDMETHOD(SetTexture)(THIS_ LPDIRECT3DRMTEXTURE) PURE; + STDMETHOD(SetTextureCoordinates)(THIS_ DWORD vertex, D3DVALUE u, D3DVALUE v) PURE; + STDMETHOD(SetMaterial)(THIS_ LPDIRECT3DRMMATERIAL) PURE; + STDMETHOD(SetTextureTopology)(THIS_ BOOL wrap_u, BOOL wrap_v) PURE; + STDMETHOD(GetVertex)(THIS_ DWORD index, D3DVECTOR *vertex, D3DVECTOR *normal) PURE; + STDMETHOD(GetVertices)(THIS_ DWORD *vertex_count, D3DVECTOR *coords, D3DVECTOR *normals); + STDMETHOD(GetTextureCoordinates)(THIS_ DWORD vertex, D3DVALUE *u, D3DVALUE *v) PURE; + STDMETHOD(GetTextureTopology)(THIS_ BOOL *wrap_u, BOOL *wrap_v) PURE; + STDMETHOD(GetNormal)(THIS_ D3DVECTOR *) PURE; + STDMETHOD(GetTexture)(THIS_ LPDIRECT3DRMTEXTURE *) PURE; + STDMETHOD(GetMaterial)(THIS_ LPDIRECT3DRMMATERIAL *) PURE; + STDMETHOD_(int, GetVertexCount)(THIS) PURE; + STDMETHOD_(int, GetVertexIndex)(THIS_ DWORD which) PURE; + STDMETHOD_(int, GetTextureCoordinateIndex)(THIS_ DWORD which) PURE; + STDMETHOD_(D3DCOLOR, GetColor)(THIS) PURE; +}; +#undef INTERFACE + +#if !defined(__cplusplus) || defined(CINTERFACE) +/*** IUnknown methods ***/ +#define IDirect3DRMFace_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define IDirect3DRMFace_AddRef(p) (p)->lpVtbl->AddRef(p) +#define IDirect3DRMFace_Release(p) (p)->lpVtbl->Release(p) +/*** IDirect3DRMObject methods ***/ +#define IDirect3DRMFace_Clone(p,a,b,c) (p)->lpVtbl->Clone(p,a,b,c) +#define IDirect3DRMFace_AddDestroyCallback(p,a,b) (p)->lpVtbl->AddDestroyCallback(p,a,b) +#define IDirect3DRMFace_DeleteDestroyCallback(p,a,b) (p)->lpVtbl->DeleteDestroyCallback(p,a,b) +#define IDirect3DRMFace_SetAppData(p,a) (p)->lpVtbl->SetAppData(p,a) +#define IDirect3DRMFace_GetAppData(p) (p)->lpVtbl->GetAppData(p) +#define IDirect3DRMFace_SetName(p,a) (p)->lpVtbl->SetName(p,a) +#define IDirect3DRMFace_GetName(p,a,b) (p)->lpVtbl->GetName(p,a,b) +#define IDirect3DRMFace_GetClassName(p,a,b) (p)->lpVtbl->GetClassName(p,a,b) +/*** IDirect3DRMFace methods ***/ +#define IDirect3DRMFace_AddVertex(p,a,b,c) (p)->lpVtbl->AddVertex(p,a,b,c) +#define IDirect3DRMFace_AddVertexAndNormalIndexed(p,a,b) (p)->lpVtbl->AddVertexAndNormalIndexed(p,a,b) +#define IDirect3DRMFace_SetColorRGB(p,a,b,c) (p)->lpVtbl->SetColorRGB(p,a,b,c) +#define IDirect3DRMFace_SetColor(p,a) (p)->lpVtbl->SetColor(p,a) +#define IDirect3DRMFace_SetTexture(p,a) (p)->lpVtbl->SetTexture(p,a) +#define IDirect3DRMFace_SetTextureCoordinates(p,a,b,c) (p)->lpVtbl->SetTextureCoordinates(p,a,b,c) +#define IDirect3DRMFace_SetMaterial(p,a) (p)->lpVtbl->SetMaterial(p,a) +#define IDirect3DRMFace_SetTextureTopology(p,a,b) (p)->lpVtbl->SetTextureTopology(p,a,b) +#define IDirect3DRMFace_GetVertex(p,a,b,c) (p)->lpVtbl->GetVertex(p,a,b,c) +#define IDirect3DRMFace_GetVertices(p,a,b,c) (p)->lpVtbl->GetVertices(p,a,b,c) +#define IDirect3DRMFace_GetTextureCoordinates(p,a,b,c) (p)->lpVtbl->GetTextureCoordinates(p,a,b,c) +#define IDirect3DRMFace_GetTextureTopology(p,a,b) (p)->lpVtbl->GetTextureTopology(p,a,b) +#define IDirect3DRMFace_GetNormal(p,a) (p)->lpVtbl->GetNormal(p,a) +#define IDirect3DRMFace_GetTexture(p,a) (p)->lpVtbl->GetTexture(p,a) +#define IDirect3DRMFace_GetVertexCount(p) (p)->lpVtbl->GetVertexCount(p) +#define IDirect3DRMFace_GetVertexIndex(p,a) (p)->lpVtbl->GetVertexIndex(p,a) +#define IDirect3DRMFace_GetTextureCoordinateIndex(p,a) (p)->lpVtbl->GetTextureCoordinateIndex(p,a) +#define IDirect3DRMFace_GetColor(p,a) (p)->lpVtbl->GetColor(p,a) +#else +/*** IUnknown methods ***/ +#define IDirect3DRMFace_QueryInterface(p,a,b) (p)->QueryInterface(a,b) +#define IDirect3DRMFace_AddRef(p) (p)->AddRef() +#define IDirect3DRMFace_Release(p) (p)->Release() +/*** IDirect3DRMObject methods ***/ +#define IDirect3DRMFace_Clone(p,a,b,c) (p)->Clone(a,b,c) +#define IDirect3DRMFace_AddDestroyCallback(p,a,b) (p)->AddDestroyCallback(a,b) +#define IDirect3DRMFace_DeleteDestroyCallback(p,a,b) (p)->DeleteDestroyCallback(a,b) +#define IDirect3DRMFace_SetAppData(p,a) (p)->SetAppData(a) +#define IDirect3DRMFace_GetAppData(p) (p)->GetAppData() +#define IDirect3DRMFace_SetName(p,a) (p)->SetName(a) +#define IDirect3DRMFace_GetName(p,a,b) (p)->GetName(a,b) +#define IDirect3DRMFace_GetClassName(p,a,b) (p)->GetClassName(a,b) +/*** IDirect3DRMFace methods ***/ +#define IDirect3DRMFace_AddVertex(p,a,b,c) (p)->AddVertex(a,b,c) +#define IDirect3DRMFace_AddVertexAndNormalIndexed(p,a,b) (p)->AddVertexAndNormalIndexed(a,b) +#define IDirect3DRMFace_SetColorRGB(p,a,b,c) (p)->SetColorRGB(a,b,c) +#define IDirect3DRMFace_SetColor(p,a) (p)->SetColor(a) +#define IDirect3DRMFace_SetTexture(p,a) (p)->SetTexture(a) +#define IDirect3DRMFace_SetTextureCoordinates(p,a,b,c) (p)->SetTextureCoordinates(a,b,c) +#define IDirect3DRMFace_SetMaterial(p,a) (p)->SetMaterial(a) +#define IDirect3DRMFace_SetTextureTopology(p,a,b) (p)->SetTextureTopology(a,b) +#define IDirect3DRMFace_GetVertex(p,a,b,c) (p)->GetVertex(a,b,c) +#define IDirect3DRMFace_GetVertices(p,a,b,c) (p)->GetVertices(a,b,c) +#define IDirect3DRMFace_GetTextureCoordinates(p,a,b,c) (p)->GetTextureCoordinates(a,b,c) +#define IDirect3DRMFace_GetTextureTopology(p,a,b) (p)->GetTextureTopology(a,b) +#define IDirect3DRMFace_GetNormal(p,a) (p)->GetNormal(a) +#define IDirect3DRMFace_GetTexture(p,a) (p)->GetTexture(a) +#define IDirect3DRMFace_GetVertexCount(p) (p)->GetVertexCount() +#define IDirect3DRMFace_GetVertexIndex(p,a) (p)->GetVertexIndex(a) +#define IDirect3DRMFace_GetTextureCoordinateIndex(p,a) (p)->GetTextureCoordinateIndex(a) +#define IDirect3DRMFace_GetColor(p,a) (p)->GetColor(a) +#endif + #ifdef __cplusplus }; #endif

1 0

Michael Stefaniuc : dmband: Avoid newlines inside FIXME messages.
by Alexandre Julliard 19 Jan '10

19 Jan '10

Module: wine Branch: master Commit: dfc4f8e5f16ea80e1d2f571b1ebd0d9ad55e10dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfc4f8e5f16ea80e1d2f571b1… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 19 00:44:14 2010 +0100 dmband: Avoid newlines inside FIXME messages. --- dlls/dmband/dmband_main.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/dmband/dmband_main.c b/dlls/dmband/dmband_main.c index b99f64d..30d8f6b 100644 --- a/dlls/dmband/dmband_main.c +++ b/dlls/dmband/dmband_main.c @@ -32,10 +32,10 @@ typedef struct { */ static HRESULT WINAPI BandCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { - FIXME("- no interface\n\tIID:\t%s\n", debugstr_guid(riid)); + FIXME("- no interface IID: %s\n", debugstr_guid(riid)); if (ppobj == NULL) return E_POINTER; - + return E_NOINTERFACE; } @@ -84,10 +84,10 @@ static IClassFactoryImpl Band_CF = {&BandCF_Vtbl}; */ static HRESULT WINAPI BandTrackCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { - FIXME("- no interface\n\tIID:\t%s\n", debugstr_guid(riid)); - + FIXME("- no interface IID: %s\n", debugstr_guid(riid)); + if (ppobj == NULL) return E_POINTER; - + return E_NOINTERFACE; }

1 0