February 2006 - Wine-commits

Phil Krylov : riched20: Removed an unused parameter.
by Alexandre Julliard 04 Feb '06

04 Feb '06

Module: wine Branch: refs/heads/master Commit: 325e06d2c194b2ce0572bda1f7a387bdc99ff595 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=325e06d2c194b2ce0572bda… Author: Phil Krylov <phil(a)newstar.rinet.ru> Date: Sat Feb 4 17:00:18 2006 +0100 riched20: Removed an unused parameter. --- dlls/riched20/editor.h | 2 +- dlls/riched20/run.c | 2 +- dlls/riched20/wrap.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index f3d9b07..f452870 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -116,7 +116,7 @@ ME_DisplayItem *ME_InsertRunAtCursor(ME_ void ME_CheckCharOffsets(ME_TextEditor *editor); void ME_PropagateCharOffset(ME_DisplayItem *p, int shift); void ME_GetGraphicsSize(ME_TextEditor *editor, ME_Run *run, SIZE *pSize); -int ME_CharFromPoint(ME_TextEditor *editor, int cx, ME_Paragraph *para, ME_Run *run); +int ME_CharFromPoint(ME_TextEditor *editor, int cx, ME_Run *run); /* this one accounts for 1/2 char tolerance */ int ME_CharFromPointCursor(ME_TextEditor *editor, int cx, ME_Run *run); int ME_PointFromChar(ME_TextEditor *editor, ME_Run *pRun, int nOffset); diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index 13a7204..4730784 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -381,7 +381,7 @@ void ME_GetGraphicsSize(ME_TextEditor *e pSize->cy = 64; } -int ME_CharFromPoint(ME_TextEditor *editor, int cx, ME_Paragraph *para, ME_Run *run) +int ME_CharFromPoint(ME_TextEditor *editor, int cx, ME_Run *run) { int fit = 0; HGDIOBJ hOldFont; diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index f3d3e9d..4e27454 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -168,7 +168,7 @@ static ME_DisplayItem *ME_SplitByBacktra int i, idesp, len; ME_Run *run = &p->member.run; - idesp = i = ME_CharFromPoint(wc->context->editor, loc, &ME_GetParagraph(p)->member.para, run); + idesp = i = ME_CharFromPoint(wc->context->editor, loc, run); len = ME_StrVLen(run->strText); assert(len>0); assert(i<len);

1 0

Phil Krylov : riched20: Fixed undo stack corruption.
by Alexandre Julliard 04 Feb '06

04 Feb '06

Module: wine Branch: refs/heads/master Commit: 65fdee73b937f47dcd75960733aa43b501e9dcf8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=65fdee73b937f47dcd75960… Author: Phil Krylov <phil(a)newstar.rinet.ru> Date: Sat Feb 4 16:59:37 2006 +0100 riched20: Fixed undo stack corruption. --- dlls/riched20/run.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index b9c33a5..13a7204 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -324,7 +324,8 @@ ME_InsertRunAtCursor(ME_TextEditor *edit pUI = ME_AddUndoItem(editor, diUndoDeleteRun, NULL); if (pUI) { - pUI->nStart = cursor->pRun->member.run.nCharOfs; + pUI->nStart = (ME_GetParagraph(cursor->pRun)->member.para.nCharOfs + + cursor->pRun->member.run.nCharOfs); pUI->nLen = len; }

1 0

Phil Krylov : riched20: Simplified ME_InsertGraphicsFromCursor() function.
by Alexandre Julliard 04 Feb '06

04 Feb '06

Module: wine Branch: refs/heads/master Commit: baf25fc8ab9163af066a49f9b984491c4f473515 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=baf25fc8ab9163af066a49f… Author: Phil Krylov <phil(a)newstar.rinet.ru> Date: Sat Feb 4 16:59:48 2006 +0100 riched20: Simplified ME_InsertGraphicsFromCursor() function. --- dlls/riched20/caret.c | 50 ++++++++++++++++--------------------------------- 1 files changed, 16 insertions(+), 34 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 9865581..231a091 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -312,40 +312,6 @@ void ME_DeleteTextAtCursor(ME_TextEditor ME_InternalDeleteText(editor, ME_GetCursorOfs(editor, nCursor), nChars); } -static const WCHAR wszSpace[] = {' ', 0}; - -/* FIXME this is temporary, just to have something to test how bad graphics handler is */ -void ME_InsertGraphicsFromCursor(ME_TextEditor *editor, int nCursor) -{ - ME_Cursor *pCursor = &editor->pCursors[nCursor]; - ME_DisplayItem *pItem = NULL; - ME_DisplayItem *pNewRun = NULL; - ME_Style *pStyle = ME_GetInsertStyle(editor, nCursor); - ME_UndoItem *pUndo; - - /* FIXME no no no */ - if (ME_IsSelection(editor)) - ME_DeleteSelection(editor); - - pUndo = ME_AddUndoItem(editor, diUndoDeleteRun, NULL); - if (pUndo) { - pUndo->nStart = pCursor->nOffset + pCursor->pRun->member.run.nCharOfs + ME_GetParagraph(pCursor->pRun)->member.para.nCharOfs; - pUndo->nLen = 1; - } - if (pCursor->nOffset) - { - ME_SplitRunSimple(editor, pCursor->pRun, pCursor->nOffset); - } - pItem = pCursor->pRun; - pNewRun = ME_MakeRun(pStyle, ME_MakeStringN(wszSpace, 1), MERF_GRAPHICS); - pNewRun->member.run.nCharOfs = pCursor->pRun->member.run.nCharOfs; - ME_InsertBefore(pCursor->pRun, pNewRun); - ME_PropagateCharOffset(pItem, 1); - ME_CheckCharOffsets(editor); - ME_SendSelChange(editor); -} - - static void ME_InternalInsertTextFromCursor(ME_TextEditor *editor, int nCursor, const WCHAR *str, int len, ME_Style *style, @@ -361,6 +327,22 @@ ME_InternalInsertTextFromCursor(ME_TextE } +/* FIXME this is temporary, just to have something to test how bad graphics handler is */ +void ME_InsertGraphicsFromCursor(ME_TextEditor *editor, int nCursor) +{ + ME_Style *pStyle = ME_GetInsertStyle(editor, nCursor); + WCHAR space = ' '; + + /* FIXME no no no */ + if (ME_IsSelection(editor)) + ME_DeleteSelection(editor); + + ME_InternalInsertTextFromCursor(editor, nCursor, &space, 1, pStyle, + MERF_GRAPHICS); + ME_SendSelChange(editor); +} + + void ME_InsertTextFromCursor(ME_TextEditor *editor, int nCursor, const WCHAR *str, int len, ME_Style *style) {

1 0

Dmitry Timoshkov : msvfw32: Do not overwrite fccType in the codec enumeration proc.
by Alexandre Julliard 04 Feb '06

04 Feb '06

Module: wine Branch: refs/heads/master Commit: 3f2e9681a60f87a5489bc5d5595f9a6496b5e013 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3f2e9681a60f87a5489bc5d… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Sat Feb 4 16:58:49 2006 +0100 msvfw32: Do not overwrite fccType in the codec enumeration proc. --- dlls/msvideo/msvideo_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvideo/msvideo_main.c b/dlls/msvideo/msvideo_main.c index 0479210..cd638c0 100644 --- a/dlls/msvideo/msvideo_main.c +++ b/dlls/msvideo/msvideo_main.c @@ -181,7 +181,6 @@ static BOOL ICInfo_enum_handler(const ch if ((lpicinfo->fccHandler != nr) && (lpicinfo->fccHandler != fccHandler)) return FALSE; - lpicinfo->fccType = mmioStringToFOURCCA(drv, 0); lpicinfo->fccHandler = fccHandler; lpicinfo->dwFlags = 0; lpicinfo->dwVersion = 0; @@ -209,6 +208,7 @@ BOOL VFWAPI ICInfo( DWORD fccType, DWORD TRACE("(%s,%s/%08lx,%p)\n", wine_dbgstr_fcc(fccType), wine_dbgstr_fcc(fccHandler), fccHandler, lpicinfo); + lpicinfo->fccType = fccType; lpicinfo->fccHandler = fccHandler; return enum_drivers(fccType, ICInfo_enum_handler, lpicinfo); }

1 0

Mike McCormack : Clock: Load license text from resources.
by Alexandre Julliard 04 Feb '06

04 Feb '06

Module: wine Branch: refs/heads/master Commit: cbe8ea0517de9981b3c74f29a65b2f6059b7107f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cbe8ea0517de9981b3c74f2… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sat Feb 4 16:59:19 2006 +0100 Clock: Load license text from resources. --- programs/clock/En.rc | 24 +++++++++++++++++ programs/clock/License_En.c | 29 -------------------- programs/clock/Makefile.in | 6 +--- programs/clock/clock_res.h | 5 +++ programs/clock/license.c | 40 ---------------------------- programs/clock/license.h | 62 ------------------------------------------- programs/clock/main.c | 17 +++++++++++- 7 files changed, 46 insertions(+), 137 deletions(-) delete mode 100644 programs/clock/License_En.c delete mode 100644 programs/clock/license.c delete mode 100644 programs/clock/license.h diff --git a/programs/clock/En.rc b/programs/clock/En.rc index ee6738c..fe7c5bc 100644 --- a/programs/clock/En.rc +++ b/programs/clock/En.rc @@ -47,3 +47,27 @@ STRINGTABLE DISCARDABLE { IDS_CLOCK, "Clock" } + +STRINGTABLE DISCARDABLE LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT +{ +IDS_LICENSE_CAPTION, "LICENSE" +IDS_LICENSE, +"This library is free software; you can redistribute it and/or \ +modify it under the terms of the GNU Lesser General Public \ +License as published by the Free Software Foundation; either \ +version 2.1 of the License, or (at your option) any later version.\n\ +This library is distributed in the hope that it will be useful, \ +but WITHOUT ANY WARRANTY; without even the implied warranty of \ +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU \ +Lesser General Public License for more details.\n\ +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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA" + +IDS_WARRANTY_CAPTION, "NO WARRANTY" +IDS_WARRANTY, +"This library is distributed in the hope that it will be useful, \ +but WITHOUT ANY WARRANTY; without even the implied warranty of \ +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU \ +Lesser General Public License for more details." +} diff --git a/programs/clock/License_En.c b/programs/clock/License_En.c deleted file mode 100644 index 654d523..0000000 --- a/programs/clock/License_En.c +++ /dev/null @@ -1,29 +0,0 @@ -#include "windows.h" -#include "license.h" - -static CHAR LicenseCaption_En[] = "LICENSE"; -static CHAR License_En[] = -"This library is free software; you can redistribute it and/or " -"modify it under the terms of the GNU Lesser General Public " -"License as published by the Free Software Foundation; either " -"version 2.1 of the License, or (at your option) any later version.\n" - -"This library is distributed in the hope that it will be useful, " -"but WITHOUT ANY WARRANTY; without even the implied warranty of " -"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU " -"Lesser General Public License for more details.\n" - -"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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA"; - -static CHAR NoWarrantyCaption_En[] = "NO WARRANTY"; -static CHAR NoWarranty_En[] = -"This library is distributed in the hope that it will be useful, " -"but WITHOUT ANY WARRANTY; without even the implied warranty of " -"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU " -"Lesser General Public License for more details."; - -LICENSE WineLicense_En = {License_En, LicenseCaption_En, - NoWarranty_En, NoWarrantyCaption_En}; - diff --git a/programs/clock/Makefile.in b/programs/clock/Makefile.in index 91822e5..72a2fd8 100644 --- a/programs/clock/Makefile.in +++ b/programs/clock/Makefile.in @@ -6,13 +6,9 @@ MODULE = clock.exe APPMODE = -mwindows IMPORTS = comdlg32 shell32 user32 gdi32 kernel32 -LICENSELANG = En - C_SRCS = \ - license.c \ main.c \ - winclock.c \ - $(LICENSELANG:%=License_%.c) + winclock.c RC_SRCS = rsrc.rc diff --git a/programs/clock/clock_res.h b/programs/clock/clock_res.h index 1667f6b..2c92918 100644 --- a/programs/clock/clock_res.h +++ b/programs/clock/clock_res.h @@ -31,3 +31,8 @@ #define IDM_ONTOP 0x113 #define IDS_CLOCK 0x10C + +#define IDS_LICENSE_CAPTION 0x120 +#define IDS_LICENSE 0x121 +#define IDS_WARRANTY_CAPTION 0x122 +#define IDS_WARRANTY 0x123 diff --git a/programs/clock/license.c b/programs/clock/license.c deleted file mode 100644 index 6de507b..0000000 --- a/programs/clock/license.c +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Clock (license.c) - * - * Copyright 1998 by Marcel Baur <mbaur(a)g26.ethz.ch> - * Adapted from Program Manager (Original by Ulrich Schmied) - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "windows.h" -#include "license.h" - -VOID WineLicense(HWND Wnd) -{ - /* FIXME: should load strings from resources */ - LICENSE *License = &WineLicense_En; - MessageBox(Wnd, License->License, License->LicenseCaption, - MB_ICONINFORMATION | MB_OK); -} - - -VOID WineWarranty(HWND Wnd) -{ - /* FIXME: should load strings from resources */ - LICENSE *License = &WineLicense_En; - MessageBox(Wnd, License->Warranty, License->WarrantyCaption, - MB_ICONEXCLAMATION | MB_OK); -} diff --git a/programs/clock/license.h b/programs/clock/license.h deleted file mode 100644 index 94dd3e8..0000000 --- a/programs/clock/license.h +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Clock (license.h) - * - * Copyright 1998 by Marcel Baur <mbaur(a)g26.ethz.ch> - * Adapted from Program Manager (Original by Ulrich Schmied) - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - - -/* function prototypes */ - -VOID WineLicense(HWND hWnd); -VOID WineWarranty(HWND hWnd); - - -/* typedefs */ - -typedef struct -{ - LPCSTR License, LicenseCaption; - LPCSTR Warranty, WarrantyCaption; -} LICENSE; - - -/* external references */ - -/* -extern LICENSE WineLicense_Ca; -extern LICENSE WineLicense_Cz; -extern LICENSE WineLicense_Da; -extern LICENSE WineLicense_De; -*/ - -extern LICENSE WineLicense_En; - -/* -extern LICENSE WineLicense_Eo; -extern LICENSE WineLicense_Es; -extern LICENSE WineLicense_Fi; -extern LICENSE WineLicense_Fr; -extern LICENSE WineLicense_Hu; -extern LICENSE WineLicense_It; -extern LICENSE WineLicense_Ko; -extern LICENSE WineLicense_No; -extern LICENSE WineLicense_Pl; -extern LICENSE WineLicense_Po; -extern LICENSE WineLicense_Sw; -extern LICENSE WineLicense_Va; -*/ diff --git a/programs/clock/main.c b/programs/clock/main.c index 754c1e9..cd6a772 100644 --- a/programs/clock/main.c +++ b/programs/clock/main.c @@ -29,7 +29,6 @@ #include "commdlg.h" #include "main.h" -#include "license.h" #include "winclock.h" #define INITIAL_WINDOW_SIZE 200 @@ -37,6 +36,22 @@ CLOCK_GLOBALS Globals; +static VOID WineLicense(HWND Wnd) +{ + char cap[20], text[1024]; + LoadString(Globals.hInstance, IDS_LICENSE, text, sizeof text); + LoadString(Globals.hInstance, IDS_LICENSE_CAPTION, cap, sizeof cap); + MessageBox(Wnd, text, cap, MB_ICONINFORMATION | MB_OK); +} + +static VOID WineWarranty(HWND Wnd) +{ + char cap[20], text[1024]; + LoadString(Globals.hInstance, IDS_WARRANTY, text, sizeof text); + LoadString(Globals.hInstance, IDS_WARRANTY_CAPTION, cap, sizeof cap); + MessageBox(Wnd, text, cap, MB_ICONEXCLAMATION | MB_OK); +} + static VOID CLOCK_UpdateMenuCheckmarks(VOID) { HMENU hPropertiesMenu;

1 0

Mike McCormack : imm32: Remove FIXME messages from some implemented functions.
by Alexandre Julliard 04 Feb '06

04 Feb '06

Module: wine Branch: refs/heads/master Commit: 46d3762a9478682cccdf2a26665694b1698f8fdf URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=46d3762a9478682cccdf2a2… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sat Feb 4 16:59:26 2006 +0100 imm32: Remove FIXME messages from some implemented functions. --- dlls/imm32/imm.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 7f85c7f..9b6040f 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -260,6 +260,7 @@ HIMC WINAPI ImmAssociateContext(HWND hWn BOOL WINAPI ImmAssociateContextEx(HWND hWnd, HIMC hIMC, DWORD dwFlags) { FIXME("(%p, %p, %ld): stub\n", hWnd, hIMC, dwFlags); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -577,12 +578,10 @@ LONG WINAPI ImmGetCompositionStringW( HIMC hIMC, DWORD dwIndex, LPVOID lpBuf, DWORD dwBufLen) { - LONG rc = 0; - InputContextData *data = (InputContextData*)hIMC; + LONG rc = 0; + InputContextData *data = (InputContextData*)hIMC; - TRACE("(%p, 0x%lx, %p, %ld)\n", - hIMC, dwIndex, lpBuf, dwBufLen - ); + TRACE("(%p, 0x%lx, %p, %ld)\n", hIMC, dwIndex, lpBuf, dwBufLen); if (!data) return FALSE; @@ -671,7 +670,7 @@ BOOL WINAPI ImmGetCompositionWindow(HIMC */ HIMC WINAPI ImmGetContext(HWND hWnd) { - FIXME("(%p): stub\n", hWnd); + TRACE("%p\n", hWnd); if (!root_context) return NULL; @@ -935,7 +934,6 @@ UINT WINAPI ImmGetVirtualKey(HWND hWnd) { OSVERSIONINFOA version; FIXME("(%p): stub\n", hWnd); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); GetVersionExA( &version ); switch(version.dwPlatformId) { @@ -1047,7 +1045,8 @@ BOOL WINAPI ImmNotifyIME( HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue) { BOOL rc = FALSE; - FIXME("(%p, %ld, %ld, %ld): stub\n", + + TRACE("(%p, %ld, %ld, %ld)\n", hIMC, dwAction, dwIndex, dwValue); if (!root_context) @@ -1377,7 +1376,7 @@ BOOL WINAPI ImmSetCompositionWindow( ShowWindow(hwndDefault,SW_HIDE); } - FIXME("STUB\n"); + /* FIXME: this is a partial stub */ if (reshow) ShowWindow(hwndDefault,SW_SHOWNOACTIVATE); @@ -1405,7 +1404,8 @@ BOOL WINAPI ImmSetConversionStatus( BOOL WINAPI ImmSetOpenStatus(HIMC hIMC, BOOL fOpen) { InputContextData *data = (InputContextData*)hIMC; - FIXME("Semi-Stub\n"); + + TRACE("%p %d\n", hIMC, fOpen); if (hIMC == (HIMC)FROM_IME) {

1 0

Neil Skrypuch : winecfg: Use already existing letter_to_index().
by Alexandre Julliard 04 Feb '06

04 Feb '06

Module: wine Branch: refs/heads/master Commit: ad4d9e7387e439004570adfca033a14f9fad445c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ad4d9e7387e439004570adf… Author: Neil Skrypuch <ns03ja(a)brocku.ca> Date: Sat Feb 4 16:58:18 2006 +0100 winecfg: Use already existing letter_to_index(). --- programs/winecfg/drive.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winecfg/drive.c b/programs/winecfg/drive.c index b0e5082..83bcde2 100644 --- a/programs/winecfg/drive.c +++ b/programs/winecfg/drive.c @@ -73,7 +73,7 @@ long drive_available_mask(char letter) for(i = 0; i < 26; i++) { if (!drives[i].in_use) continue; - result |= (1 << (toupper(drives[i].letter) - 'A')); + result |= (1 << (letter_to_index(drives[i].letter))); } result = ~result;

1 0

Alexandre Julliard : wine.inf: Make FourCC codes uppercase again until we can figure out
by Alexandre Julliard 03 Feb '06

03 Feb '06

Module: wine Branch: refs/heads/master Commit: 19b89289ee077f7cc56148f05c6aff4549af234b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=19b89289ee077f7cc56148f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 3 18:47:49 2006 +0100 wine.inf: Make FourCC codes uppercase again until we can figure out why lowercase doesn't work right. --- tools/wine.inf | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index bd81436..cd1f625 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -2105,12 +2105,12 @@ system.ini, drivers32,,"MSACM.imaadpcm=i system.ini, drivers32,,"MSACM.msadpcm=msadp32.acm" system.ini, drivers32,,"MSACM.msg711=msg711.acm" system.ini, drivers32,,"MSACM.winemp3=winemp3.acm" -system.ini, drivers32,,"vidc.mrle=msrle32.dll" -system.ini, drivers32,,"vidc.msvc=msvidc32.dll" -system.ini, drivers32,,"vidc.cvid=iccvid.dll" -system.ini, drivers32,,"; vidc.iv50=ir50_32.dll" -system.ini, drivers32,,"; vidc.iv31=ir32_32.dll" -system.ini, drivers32,,"; vidc.iv32=ir32_32.dll" +system.ini, drivers32,,"vidc.MRLE=msrle32.dll" +system.ini, drivers32,,"vidc.MSVC=msvidc32.dll" +system.ini, drivers32,,"vidc.CVID=iccvid.dll" +system.ini, drivers32,,"; vidc.IV50=ir50_32.dll" +system.ini, drivers32,,"; vidc.IV31=ir32_32.dll" +system.ini, drivers32,,"; vidc.IV32=ir32_32.dll" [Timezones] HKLM,%CurrentVersionNT%\Time Zones\Dateline Standard Time,"Display",,"Kwajalein"

1 0

Robert Shearman : widl: Add architecture for generating pointer layouts.
by Alexandre Julliard 03 Feb '06

03 Feb '06

Module: wine Branch: refs/heads/master Commit: ccf509b4c60841b2ff41ef3476c6c1181cbed0d0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ccf509b4c60841b2ff41ef3… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Feb 3 18:51:17 2006 +0100 widl: Add architecture for generating pointer layouts. --- tools/widl/typegen.c | 151 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 144 insertions(+), 7 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 1c1002e..bd0efde 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -569,6 +569,113 @@ static size_t type_memsize(const type_t return size; } +static int write_pointers(FILE *file, const attr_t *attrs, + const type_t *type, int ptr_level, + const expr_t *array, int level, + size_t *typestring_offset) +{ + int pointers_written = 0; + const var_t *v; + + /* don't generate a pointer for first-level arrays since we want to + * descend into them to write their pointers, not stop here */ + if ((level == 0 || ptr_level == 0) && is_array_type(attrs, ptr_level, array)) + { + return write_pointers(file, NULL, type, 0, NULL, level + 1, typestring_offset); + } + + if (ptr_level != 0) + { + /* FIXME: only general algorithm implemented, not the actual writing */ + error("write_pointers: Writing type format string for pointer is unimplemented\n"); + return 1; + } + + /* FIXME: search through all refs for pointers too */ + while(type_has_ref(type)) + type = type->ref; + + switch (type->type) + { + /* note: don't descend into complex structures or unions since these + * will always be generated as a separate type */ + case RPC_FC_STRUCT: + case RPC_FC_CVSTRUCT: + case RPC_FC_CPSTRUCT: + case RPC_FC_CSTRUCT: + case RPC_FC_PSTRUCT: + v = type->fields; + if (!v) break; + while (NEXT_LINK(v)) v = NEXT_LINK(v); + for (; v; v = PREV_LINK(v)) + pointers_written += write_pointers(file, v->attrs, v->type, + v->ptr_level, v->array, + level + 1, + typestring_offset); + + break; + + default: + /* nothing to do */ + break; + } + + return pointers_written; +} + +static size_t write_pointer_description(FILE *file, const attr_t *attrs, + const type_t *type, int ptr_level, + const expr_t *array, int level, + size_t typestring_offset) +{ + size_t size = 0; + const var_t *v; + + /* don't generate a pointer for first-level arrays since we want to + * descend into them to write their pointers, not stop here */ + if ((level == 0 || ptr_level == 0) && is_array_type(attrs, ptr_level, array)) + { + return write_pointer_description(file, NULL, type, 0, NULL, + level + 1, typestring_offset); + } + + if (ptr_level != 0) + { + /* FIXME: only general algorithm implemented, not the actual writing */ + error("write_pointer_description: Writing pointer description is unimplemented\n"); + return 0; + } + + /* FIXME: search through all refs for pointers too */ + + switch (type->type) + { + /* note: don't descend into complex structures or unions since these + * will always be generated as a separate type */ + case RPC_FC_STRUCT: + case RPC_FC_CVSTRUCT: + case RPC_FC_CPSTRUCT: + case RPC_FC_CSTRUCT: + case RPC_FC_PSTRUCT: + v = type->fields; + if (!v) break; + while (NEXT_LINK(v)) v = NEXT_LINK(v); + for (; v; v = PREV_LINK(v)) + size += write_pointer_description(file, v->attrs, v->type, + v->ptr_level, v->array, + level + 1, + typestring_offset); + + break; + + default: + /* nothing to do */ + break; + } + + return size; +} + static size_t write_string_tfs(FILE *file, const attr_t *attrs, const type_t *type, const expr_t *array, const char *name, size_t *typestring_offset) @@ -635,9 +742,7 @@ static size_t write_array_tfs(FILE *file const expr_t *size_is = get_attrp(attrs, ATTR_SIZEIS); int has_length = length_is && (length_is->type != EXPR_VOID); int has_size = (size_is && (size_is->type != EXPR_VOID)) || !array->is_const; - size_t start_offset = *typestring_offset; - - /* FIXME: need to analyse type for pointers */ + size_t start_offset; if (array && NEXT_LINK(array)) /* multi-dimensional array */ { @@ -646,6 +751,14 @@ static size_t write_array_tfs(FILE *file } else { + size_t pointer_start_offset = *typestring_offset; + int has_pointer = 0; + + if (write_pointers(file, attrs, type, 0, array, 0, typestring_offset) > 0) + has_pointer = 1; + + start_offset = *typestring_offset; + if (!has_length && !has_size) { /* fixed array */ @@ -669,7 +782,13 @@ static size_t write_array_tfs(FILE *file *typestring_offset += 6; } - /* FIXME: write out pointer descriptor if necessary */ + if (has_pointer) + { + print_file(file, 2, "0x%x, /* FC_PP */\n", RPC_FC_PP); + print_file(file, 2, "0x%x, /* FC_PAD */\n", RPC_FC_PAD); + write_pointer_description(file, attrs, type, 0, array, 0, pointer_start_offset); + print_file(file, 2, "0x%x, /* FC_END */\n", RPC_FC_END); + } print_file(file, 2, "0x0, /* FIXME: write out conversion data */\n"); print_file(file, 2, "FC_END,\n"); @@ -714,7 +833,13 @@ static size_t write_array_tfs(FILE *file current_structure, length_is); - /* FIXME: write out pointer descriptor if necessary */ + if (has_pointer) + { + print_file(file, 2, "0x%x, /* FC_PP */\n", RPC_FC_PP); + print_file(file, 2, "0x%x, /* FC_PAD */\n", RPC_FC_PAD); + write_pointer_description(file, attrs, type, 0, array, 0, pointer_start_offset); + print_file(file, 2, "0x%x, /* FC_END */\n", RPC_FC_END); + } print_file(file, 2, "0x0, /* FIXME: write out conversion data */\n"); print_file(file, 2, "FC_END,\n"); @@ -738,7 +863,13 @@ static size_t write_array_tfs(FILE *file current_structure, size_is ? size_is : array); - /* FIXME: write out pointer descriptor if necessary */ + if (has_pointer) + { + print_file(file, 2, "0x%x, /* FC_PP */\n", RPC_FC_PP); + print_file(file, 2, "0x%x, /* FC_PAD */\n", RPC_FC_PAD); + write_pointer_description(file, attrs, type, 0, array, 0, pointer_start_offset); + print_file(file, 2, "0x%x, /* FC_END */\n", RPC_FC_END); + } print_file(file, 2, "0x0, /* FIXME: write out conversion data */\n"); print_file(file, 2, "FC_END,\n"); @@ -765,7 +896,13 @@ static size_t write_array_tfs(FILE *file current_structure, length_is); - /* FIXME: write out pointer descriptor if necessary */ + if (has_pointer) + { + print_file(file, 2, "0x%x, /* FC_PP */\n", RPC_FC_PP); + print_file(file, 2, "0x%x, /* FC_PAD */\n", RPC_FC_PAD); + write_pointer_description(file, attrs, type, 0, array, 0, pointer_start_offset); + print_file(file, 2, "0x%x, /* FC_END */\n", RPC_FC_END); + } print_file(file, 2, "0x0, /* FIXME: write out conversion data */\n"); print_file(file, 2, "FC_END,\n");

1 0

Roderick Colenbrander : wined3d: Add a break which got lost in the POINTSCALEENABLE fix.
by Alexandre Julliard 03 Feb '06

03 Feb '06

Module: wine Branch: refs/heads/master Commit: da512ca6552f6bd5a9570811b4ca20a3e40c6b44 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=da512ca6552f6bd5a957081… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Fri Feb 3 18:51:30 2006 +0100 wined3d: Add a break which got lost in the POINTSCALEENABLE fix. --- dlls/wined3d/device.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c5c4c47..ec7dc60 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3525,6 +3525,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetRen } else { TRACE("POINT_PARAMETERS not supported in this version of opengl\n"); } + break; } case WINED3DRS_COLORWRITEENABLE : {

1 0