February 2006 - Wine-commits

Petr Tesarik : hhctrl.ocx: Czech language resources encoding fix.
by Alexandre Julliard 13 Feb '06

13 Feb '06

Module: wine Branch: refs/heads/master Commit: 89a803215a3872cfd6c8b2b18554003d9aed6219 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=89a803215a3872cfd6c8b2b… Author: Petr Tesarik <hat(a)tesarici.cz> Date: Mon Feb 13 13:27:29 2006 +0100 hhctrl.ocx: Czech language resources encoding fix. --- dlls/hhctrl.ocx/Cs.rc | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/hhctrl.ocx/Cs.rc b/dlls/hhctrl.ocx/Cs.rc index 580a802..6024063 100644 --- a/dlls/hhctrl.ocx/Cs.rc +++ b/dlls/hhctrl.ocx/Cs.rc @@ -1,4 +1,5 @@ -/* +/* Hey, Emacs, open this file with -*- coding: cp1250 -*- + * * HTML Help resources * Czech Language Support * @@ -22,6 +23,8 @@ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT +/* Czech strings in CP1250 */ + STRINGTABLE BEGIN IDS_CONTENTS "&Obsah"

1 0

Petr Tesarik : commdlg: Czech language resources encoding fix.
by Alexandre Julliard 13 Feb '06

13 Feb '06

Module: wine Branch: refs/heads/master Commit: 390b9807a9f666f9833519be8c1cf3b4905d5fbb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=390b9807a9f666f9833519b… Author: Petr Tesarik <hat(a)tesarici.cz> Date: Mon Feb 13 13:27:21 2006 +0100 commdlg: Czech language resources encoding fix. --- dlls/commdlg/cdlg_Cs.rc | 107 ++++++++++++++++++++++++----------------------- 1 files changed, 55 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=390b9807a9f666f9833…

1 0

Petr Tesarik : comctl32: Czech language resources encoding fix.
by Alexandre Julliard 13 Feb '06

13 Feb '06

Module: wine Branch: refs/heads/master Commit: 58cc46c9dd03ecf1512e0ffe0d92178d107ba6a5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=58cc46c9dd03ecf1512e0ff… Author: Petr Tesarik <hat(a)tesarici.cz> Date: Mon Feb 13 13:27:10 2006 +0100 comctl32: Czech language resources encoding fix. --- dlls/comctl32/comctl_Cs.rc | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/comctl_Cs.rc b/dlls/comctl32/comctl_Cs.rc index 18eee5b..55a1476 100644 --- a/dlls/comctl32/comctl_Cs.rc +++ b/dlls/comctl32/comctl_Cs.rc @@ -1,4 +1,5 @@ -/* +/* Hey, Emacs, open this file with -*- coding: cp1250 -*- + * * Copyright 1999 Eric Kohl * * Czech resources for comctl32 @@ -21,6 +22,8 @@ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT +/* Czech strings in CP1250 */ + IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "Vlastnosti " @@ -28,7 +31,7 @@ FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP PUSHBUTTON "Storno", IDCANCEL,58,122,50,14 - PUSHBUTTON "&Pou��t", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED + PUSHBUTTON "&Pou��t", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED PUSHBUTTON "N�pov�da", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114 END @@ -40,7 +43,7 @@ CAPTION "Pr�vodce" FONT 8, "MS Shell Dlg" BEGIN PUSHBUTTON "< &Zp�t", IDC_BACK_BUTTON,71,138,50,14 - DEFPUSHBUTTON "&Dal�� >", IDC_NEXT_BUTTON,121,138,50,14 + DEFPUSHBUTTON "&Dal�� >", IDC_NEXT_BUTTON,121,138,50,14 DEFPUSHBUTTON "Dokon�it", IDC_FINISH_BUTTON,121,138,50,14 PUSHBUTTON "Storno", IDCANCEL,178,138,50,14 PUSHBUTTON "N�pov�da", IDHELP,235,138,50,14,WS_GROUP @@ -76,7 +79,7 @@ STRINGTABLE DISCARDABLE STRINGTABLE DISCARDABLE { IDM_TODAY "Dnes:" - IDM_GOTODAY "Jdi na dne�ek" + IDM_GOTODAY "Jdi na dne�ek" } STRINGTABLE DISCARDABLE @@ -86,5 +89,5 @@ STRINGTABLE DISCARDABLE STRINGTABLE DISCARDABLE { - HKY_NONE "��dn�" + HKY_NONE "��dn�" }

1 0

Petr Tesarik : avifil32: Czech language resources encoding fix.
by Alexandre Julliard 13 Feb '06

13 Feb '06

Module: wine Branch: refs/heads/master Commit: 41baefcd05642286acbd9a7cf16f7285b30729f3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=41baefcd05642286acbd9a7… Author: Petr Tesarik <hat(a)tesarici.cz> Date: Mon Feb 13 13:27:04 2006 +0100 avifil32: Czech language resources encoding fix. --- dlls/avifil32/avifile_Cs.rc | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/avifil32/avifile_Cs.rc b/dlls/avifil32/avifile_Cs.rc index e8da6f1..ee67170 100644 --- a/dlls/avifil32/avifile_Cs.rc +++ b/dlls/avifil32/avifile_Cs.rc @@ -1,4 +1,5 @@ -/* +/* Hey, Emacs, open this file with -*- coding: cp1250 -*- + * * Copyright 2002 Michael G�nnewig * * Czech resources for avifile @@ -21,6 +22,8 @@ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT +/* Czech strings in CP1250 */ + IDD_SAVEOPTIONS DIALOG FIXED IMPURE 43, 37, 196, 82 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Nastaven� komprese" @@ -30,21 +33,21 @@ BEGIN COMBOBOX IDC_STREAM,2,18,134,61,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "V&olby...",IDC_OPTIONS,145,17,45,14 - AUTOCHECKBOX "Prolo�&it ka�d�ch",IDC_INTERLEAVE,3,42,60,11,WS_TABSTOP + AUTOCHECKBOX "Prolo�&it ka�d�ch",IDC_INTERLEAVE,3,42,60,11,WS_TABSTOP EDITTEXT IDC_INTERLEAVEEVERY,66,41,32,12,ES_AUTOHSCROLL LTEXT "r�mc�",-1,104,43,36,9 LTEXT "Sou�asn� form�t:",-1,3,56,53,9 LTEXT "Zb�vaj�c� m�sto",IDC_FORMATTEXT,55,56,90,26 - DEFPUSHBUTTON "Budi�",IDOK,145,42,45,14 - PUSHBUTTON "Zru�it",IDCANCEL,145,61,45,14 + DEFPUSHBUTTON "Budi�",IDOK,145,42,45,14 + PUSHBUTTON "Zru�it",IDCANCEL,145,61,45,14 END STRINGTABLE DISCARDABLE { IDS_WAVESTREAMFORMAT "Waveform: %s" IDS_WAVEFILETYPE "Waveform" - IDS_ALLMULTIMEDIA "V�echny soubory multim�di�" - IDS_ALLFILES "V�echny soubory (*.*)(a)*.*" + IDS_ALLMULTIMEDIA "V�echny soubory multim�di�" + IDS_ALLFILES "V�echny soubory (*.*)(a)*.*" IDS_VIDEO "video" IDS_AUDIO "audio" IDS_AVISTREAMFORMAT "%s %s #%d"

1 0

Jacek Caban : mshtml: Handle IHlinkFrame service.
by Alexandre Julliard 13 Feb '06

13 Feb '06

Module: wine Branch: refs/heads/master Commit: cb880d7cc70f48804e052a3cd45d1e7804daa951 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cb880d7cc70f48804e052a3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 13 13:26:00 2006 +0100 mshtml: Handle IHlinkFrame service. --- dlls/mshtml/Makefile.in | 1 dlls/mshtml/hlink.c | 256 ++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 4 dlls/mshtml/navigate.c | 496 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/nsio.c | 36 +++ 5 files changed, 788 insertions(+), 5 deletions(-) create mode 100644 dlls/mshtml/navigate.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=cb880d7cc70f48804e0…

1 0

Stefan Dösinger : wined3d: Update the glOrtho between 2 rhw draws if the viewport was changed.
by Alexandre Julliard 13 Feb '06

13 Feb '06

Module: wine Branch: refs/heads/master Commit: 46e8d6778772de45c02f7dd206b35c004f176746 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=46e8d6778772de45c02f7dd… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Mon Feb 13 13:25:21 2006 +0100 wined3d: Update the glOrtho between 2 rhw draws if the viewport was changed. --- dlls/wined3d/device.c | 1 + dlls/wined3d/drawprim.c | 3 ++- dlls/wined3d/surface.c | 3 ++- dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 2f6910b..04a2fe8 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2695,6 +2695,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetVie TRACE("Recording... not performing anything\n"); return D3D_OK; } + This->viewport_changed = TRUE; ENTER_GL(); diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 1328967..4a7468b 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -200,10 +200,11 @@ static BOOL primitiveInitState(IWineD3DD if (!useVS && vtx_transformed) { /* If the last draw was transformed as well, no need to reapply all the matrixes */ - if (!This->last_was_rhw) { + if ( (!This->last_was_rhw) || (This->viewport_changed) ) { double X, Y, height, width, minZ, maxZ; This->last_was_rhw = TRUE; + This->viewport_changed = FALSE; /* Transformed already into viewport coordinates, so we do not need transform matrices. Reset all matrices to identity and leave the default matrix in world diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 4cb1b3e..766874a 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -708,10 +708,11 @@ HRESULT WINAPI IWineD3DSurfaceImpl_Unloc /* glDrawPixels transforms the raster position as though it was a vertex - we want to draw at screen position 0,0 - Set up ortho (rhw) mode as per drawprim (and leave set - it will sort itself out due to last_was_rhw */ - if (!myDevice->last_was_rhw) { + if ( (!myDevice->last_was_rhw) || (myDevice->viewport_changed) ) { double X, Y, height, width, minZ, maxZ; myDevice->last_was_rhw = TRUE; + myDevice->viewport_changed = FALSE; /* Transformed already into viewport coordinates, so we do not need transform matrices. Reset all matrices to identity and leave the default matrix in world diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9ba687c..990c6e3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -494,6 +494,7 @@ typedef struct IWineD3DDeviceImpl BOOL proj_valid; BOOL view_ident; /* true iff view matrix is identity */ BOOL last_was_rhw; /* true iff last draw_primitive was in xyzrhw mode */ + BOOL viewport_changed; /* Was the viewport changed since the last draw? */ GLenum tracking_parm; /* Which source is tracking current colour */ LONG tracking_color; /* used iff GL_COLOR_MATERIAL was enabled */ #define DISABLED_TRACKING 0 /* Disabled */

1 0

Cyril Margorin : x11drv: Fix X11DRV_DIB_SetImageBits and X11DRV_DIB_GetImageBits to
by Alexandre Julliard 13 Feb '06

13 Feb '06

Module: wine Branch: refs/heads/master Commit: 01d63a217a30846b7c9cf2766652e138c2333c07 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=01d63a217a30846b7c9cf27… Author: Cyril Margorin <comargo(a)gmail.com> Date: Mon Feb 13 13:25:01 2006 +0100 x11drv: Fix X11DRV_DIB_SetImageBits and X11DRV_DIB_GetImageBits to check for passed image, and do not use shared memory extension for temporary created image. --- dlls/x11drv/dib.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/x11drv/dib.c b/dlls/x11drv/dib.c index ed49e5f..f9321e6 100644 --- a/dlls/x11drv/dib.c +++ b/dlls/x11drv/dib.c @@ -3626,7 +3626,7 @@ static int X11DRV_DIB_SetImageBits( cons descr->xSrc, descr->ySrc, descr->xDest, descr->yDest, descr->width, descr->height); #ifdef HAVE_LIBXXSHM - if (descr->useShm) + if (descr->image && descr->useShm) { XShmPutImage( gdi_display, descr->drawable, descr->gc, bmpImage, descr->xSrc, descr->ySrc, descr->xDest, descr->yDest, @@ -3670,7 +3670,7 @@ static int X11DRV_DIB_GetImageBits( cons } #ifdef HAVE_LIBXXSHM - if (descr->useShm) + if (descr->image && descr->useShm) { int saveRed, saveGreen, saveBlue;

1 0

Cyril Margorin : x11drv: Fix X11DRV_GetDIBits to pass shared memory image to
by Alexandre Julliard 13 Feb '06

13 Feb '06

Module: wine Branch: refs/heads/master Commit: fc5e5eae8a5f616086469fc72a97eaf01c78abf5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fc5e5eae8a5f616086469fc… Author: Cyril Margorin <comargo(a)gmail.com> Date: Mon Feb 13 13:24:49 2006 +0100 x11drv: Fix X11DRV_GetDIBits to pass shared memory image to X11DRV_DIB_GetImageBits. --- dlls/x11drv/dib.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/x11drv/dib.c b/dlls/x11drv/dib.c index 5c6a2b9..ed49e5f 100644 --- a/dlls/x11drv/dib.c +++ b/dlls/x11drv/dib.c @@ -4080,7 +4080,7 @@ INT X11DRV_GetDIBits( X11DRV_PDEVICE *ph descr.physDev = physDev; descr.palentry = palette; descr.bits = bits; - descr.image = NULL; + descr.image = physBitmap->image; descr.infoWidth = width; descr.lines = lines; descr.depth = physBitmap->pixmap_depth;

1 0

Mike McCormack : msvcrt: Fix a typo.
by Alexandre Julliard 13 Feb '06

13 Feb '06

Module: wine Branch: refs/heads/master Commit: 968445ca7702a342ea4db6be6cb9ff87d281ebe8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=968445ca7702a342ea4db6b… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Feb 13 13:24:26 2006 +0100 msvcrt: Fix a typo. --- dlls/msvcrt/exit.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c index c4e6f70..a1527cf 100644 --- a/dlls/msvcrt/exit.c +++ b/dlls/msvcrt/exit.c @@ -167,7 +167,7 @@ void MSVCRT__assert(const char* str, con if (MSVCRT_app_type == 2) { char text[2048]; - snprintf(text, sizeof(text), "File: %s\nLine: %d\n\nEpression: \"%s\"", file, line, str); + snprintf(text, sizeof(text), "File: %s\nLine: %d\n\nExpression: \"%s\"", file, line, str); DoMessageBox("Assertion failed!", text); } else

1 0

Stefan Leichter : psapi: Fix output parameter of function GetModuleBaseName in spec
by Alexandre Julliard 13 Feb '06

13 Feb '06

Module: wine Branch: refs/heads/master Commit: 3c5fc25b88f48d38f514c0acc642919bbcb75cbb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3c5fc25b88f48d38f514c0a… Author: Stefan Leichter <Stefan.Leichter(a)camLine.com> Date: Mon Feb 13 13:24:15 2006 +0100 psapi: Fix output parameter of function GetModuleBaseName in spec file. --- dlls/psapi/psapi.spec | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/psapi/psapi.spec b/dlls/psapi/psapi.spec index a7066af..e9bc146 100644 --- a/dlls/psapi/psapi.spec +++ b/dlls/psapi/psapi.spec @@ -10,8 +10,8 @@ @ stdcall GetDeviceDriverFileNameW(ptr wstr long) @ stdcall GetMappedFileNameA(long ptr str long) @ stdcall GetMappedFileNameW(long ptr wstr long) -@ stdcall GetModuleBaseNameA(long long str long) -@ stdcall GetModuleBaseNameW(long long wstr long) +@ stdcall GetModuleBaseNameA(long long ptr long) +@ stdcall GetModuleBaseNameW(long long ptr long) @ stdcall GetModuleFileNameExA(long long str long) @ stdcall GetModuleFileNameExW(long long wstr long) @ stdcall GetModuleInformation(long long ptr long)

1 0