wine-commits September 2011

wine-commits@winehq.org

2 participants
996 discussions

Aurimas Fišeras : winecfg: Update Lithuanian translation.
by Alexandre Julliard 28 Sep '11

28 Sep '11

Module: wine Branch: master Commit: 27cca60115c0474c31cf1fe524515efd4a6b2c50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27cca60115c0474c31cf1fe52… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Tue Sep 27 22:43:07 2011 +0300 winecfg: Update Lithuanian translation. --- programs/winecfg/Lt.rc | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/programs/winecfg/Lt.rc b/programs/winecfg/Lt.rc index 6b4fe6b..14243b9 100644 --- a/programs/winecfg/Lt.rc +++ b/programs/winecfg/Lt.rc @@ -56,7 +56,7 @@ BEGIN 15,50,230,120 PUSHBUTTON "&Pridėti programą...",IDC_APP_ADDAPP, 90,174,75,14 PUSHBUTTON "Pa&šalinti programą",IDC_APP_REMOVEAPP, 170,174,75,14 - LTEXT "&Windows versija:",IDC_STATIC,17,196,58,8 + LTEXT "Windows &versija:",IDC_STATIC,17,196,58,8 COMBOBOX IDC_WINVER,83,194,163,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END @@ -67,7 +67,7 @@ BEGIN GROUPBOX " Langų nuostatos ",IDC_STATIC,8,4,244,84 CONTROL "Automatiškai &užvaldyti pelę viso ekrano languose",IDC_FULLSCREEN_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 CONTROL "Leisti langų tvarkytuvei &dekoruoti langus",IDC_ENABLE_DECORATED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,32,230,8 - CONTROL "Leisti langų tvarkytuvei kontroliuoti &langus",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,44,230,8 + CONTROL "Leisti langų tvarkytuvei &kontroliuoti langus",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,44,230,8 CONTROL "&Emuliuoti virtualų darbalaukį",IDC_ENABLE_DESKTOP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,15,56,230,8 LTEXT "Darbalaukio d&ydis:",IDC_DESKTOP_SIZE,15,70,60,8,WS_DISABLED @@ -76,7 +76,7 @@ BEGIN EDITTEXT IDC_DESKTOP_HEIGHT,133,68,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED GROUPBOX " Direct3D ",IDC_STATIC,8,95,244,49 - LTEXT "Verte&x Shader palaikymas: ",IDC_STATIC,15,110,90,32 + LTEXT "&Vertex Shader palaikymas: ",IDC_STATIC,15,110,90,32 COMBOBOX IDC_D3D_VSHADER_MODE,110,108,135,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "Leisti &Pixel Shader (jei palaiko aparatinė įranga)",IDC_D3D_PSHADER_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,126,230,10 @@ -109,11 +109,11 @@ CAPTION "Redaguoti nustelbimą" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " Įkėlimo tvarka ",IDC_STATIC,8,4,94,66 - CONTROL "&Įtaisyta (Wine)",IDC_RAD_BUILTIN,"Button", BS_AUTORADIOBUTTON | WS_GROUP,16,14,75,10 - CONTROL "&Sava (Windows)",IDC_RAD_NATIVE,"Button", BS_AUTORADIOBUTTON,16,24,75,10 - CONTROL "Į&taisyta po to sava",IDC_RAD_BUILTIN_NATIVE,"Button", BS_AUTORADIOBUTTON,16,34,75,10 - CONTROL "S&ava po to įtaisyta",IDC_RAD_NATIVE_BUILTIN,"Button", BS_AUTORADIOBUTTON,16,44,75,10 - CONTROL "&Išjungti",IDC_RAD_DISABLE,"Button", BS_AUTORADIOBUTTON,16,54,75,10 + CONTROL "&Įtaisyta (Wine)",IDC_RAD_BUILTIN,"Button", BS_AUTORADIOBUTTON | WS_GROUP,16,14,80,10 + CONTROL "&Sava (Windows)",IDC_RAD_NATIVE,"Button", BS_AUTORADIOBUTTON,16,24,80,10 + CONTROL "Į&taisyta, po to sava",IDC_RAD_BUILTIN_NATIVE,"Button", BS_AUTORADIOBUTTON,16,34,80,10 + CONTROL "S&ava, po to įtaisyta",IDC_RAD_NATIVE_BUILTIN,"Button", BS_AUTORADIOBUTTON,16,44,80,10 + CONTROL "&Išjungti",IDC_RAD_DISABLE,"Button", BS_AUTORADIOBUTTON,16,54,80,10 DEFPUSHBUTTON "Gerai",IDOK,8,74,45,14,WS_GROUP PUSHBUTTON "Atsisakyti",IDCANCEL,57,74,45,14,WS_GROUP END @@ -165,7 +165,7 @@ IDD_AUDIOCFG DIALOG 0, 0, 260, 220 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX " Driver Diagnostics ",IDC_STATIC,8,4,244,27 + GROUPBOX " Tvarkyklės diagnostika ",IDC_STATIC,8,4,244,27 LTEXT "",IDC_AUDIO_DRIVER,18,16,230,8 PUSHBUTTON "&Testuoti garsą",IDC_AUDIO_TEST,8,33,63,14 END

1 0

Andrew Eikum : dsound: Eliminate leftover driver structures.
by Alexandre Julliard 28 Sep '11

28 Sep '11

Module: wine Branch: master Commit: 6c33e8725966c31857a67771e3fde283ec4d1787 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c33e8725966c31857a67771e… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Sep 27 15:19:04 2011 -0500 dsound: Eliminate leftover driver structures. --- dlls/dsound/capture.c | 2 - dlls/dsound/dsound.c | 6 +--- dlls/dsound/dsound_private.h | 58 +---------------------------------------- dlls/dsound/primary.c | 1 - 4 files changed, 4 insertions(+), 63 deletions(-) diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index 9a56e65..7569254 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -1029,8 +1029,6 @@ static HRESULT DirectSoundCaptureDevice_Initialize( device->mmdevice = mmdevice; - device->drvdesc.dwFlags = 0; - device->drvcaps.dwFlags = 0; device->drvcaps.dwFormats = 0; diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 49b39a1..8006f5d 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -1335,10 +1335,8 @@ HRESULT DirectSoundDevice_GetCaps( lpDSCaps->dwTotalHwMemBytes = device->drvcaps.dwTotalHwMemBytes; lpDSCaps->dwFreeHwMemBytes = device->drvcaps.dwFreeHwMemBytes; lpDSCaps->dwMaxContigFreeHwMemBytes = device->drvcaps.dwMaxContigFreeHwMemBytes; - - /* driver doesn't have these */ - lpDSCaps->dwUnlockTransferRateHwBuffers = 4096; /* But we have none... */ - lpDSCaps->dwPlayCpuOverheadSwBuffers = 1; /* 1% */ + lpDSCaps->dwUnlockTransferRateHwBuffers = device->drvcaps.dwUnlockTransferRateHwBuffers; + lpDSCaps->dwPlayCpuOverheadSwBuffers = device->drvcaps.dwPlayCpuOverheadSwBuffers; return DS_OK; } diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index b6f7e7d..075f914 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -65,47 +65,6 @@ extern const mixfunc mixfunctions[4] DECLSPEC_HIDDEN; typedef void (*normfunc)(const void *, void *, unsigned); extern const normfunc normfunctions[4] DECLSPEC_HIDDEN; -typedef struct _DSDRIVERDESC -{ - DWORD dwFlags; - CHAR szDesc[256]; - CHAR szDrvname[256]; - DWORD dnDevNode; - WORD wVxdId; - WORD wReserved; - ULONG ulDeviceNum; - DWORD dwHeapType; - LPVOID pvDirectDrawHeap; - DWORD dwMemStartAddress; - DWORD dwMemEndAddress; - DWORD dwMemAllocExtra; - LPVOID pvReserved1; - LPVOID pvReserved2; -} DSDRIVERDESC,*PDSDRIVERDESC; - -typedef struct _DSDRIVERCAPS -{ - DWORD dwFlags; - DWORD dwMinSecondarySampleRate; - DWORD dwMaxSecondarySampleRate; - DWORD dwPrimaryBuffers; - DWORD dwMaxHwMixingAllBuffers; - DWORD dwMaxHwMixingStaticBuffers; - DWORD dwMaxHwMixingStreamingBuffers; - DWORD dwFreeHwMixingAllBuffers; - DWORD dwFreeHwMixingStaticBuffers; - DWORD dwFreeHwMixingStreamingBuffers; - DWORD dwMaxHw3DAllBuffers; - DWORD dwMaxHw3DStaticBuffers; - DWORD dwMaxHw3DStreamingBuffers; - DWORD dwFreeHw3DAllBuffers; - DWORD dwFreeHw3DStaticBuffers; - DWORD dwFreeHw3DStreamingBuffers; - DWORD dwTotalHwMemBytes; - DWORD dwFreeHwMemBytes; - DWORD dwMaxContigFreeHwMemBytes; -} DSDRIVERCAPS,*PDSDRIVERCAPS; - typedef struct _DSVOLUMEPAN { DWORD dwTotalLeftAmpFactor; @@ -117,14 +76,6 @@ typedef struct _DSVOLUMEPAN DWORD dwPanRightAmpFactor; } DSVOLUMEPAN,*PDSVOLUMEPAN; -typedef struct _DSCDRIVERCAPS -{ - DWORD dwSize; - DWORD dwFlags; - DWORD dwFormats; - DWORD dwChannels; -} DSCDRIVERCAPS,*PDSCDRIVERCAPS; - /***************************************************************************** * IDirectSoundDevice implementation structure */ @@ -133,8 +84,7 @@ struct DirectSoundDevice LONG ref; GUID guid; - DSDRIVERDESC drvdesc; - DSDRIVERCAPS drvcaps; + DSCAPS drvcaps; DWORD priolevel; PWAVEFORMATEX pwfx; UINT timerID, pwplay, pwqueue, prebuf, helfrags; @@ -272,15 +222,11 @@ void secondarybuffer_destroy(IDirectSoundBufferImpl *This) DECLSPEC_HIDDEN; */ struct DirectSoundCaptureDevice { - /* IDirectSoundCaptureImpl fields */ GUID guid; LONG ref; - /* DirectSound driver stuff */ - DSDRIVERDESC drvdesc; - DSCDRIVERCAPS drvcaps; + DSCCAPS drvcaps; - /* more stuff */ LPBYTE buffer; DWORD buflen, write_pos_bytes; diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index 24db07d..7243cc6 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -105,7 +105,6 @@ HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave) device->volume = NULL; } - device->drvdesc.dwFlags = 0; hres = IMMDevice_Activate(device->mmdevice, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void **)&device->client); if(FAILED(hres)){

1 0

Frédéric Delanoy : winedev: Signal that 'set +/ - foo' only works for debug channels in WINEDEBUG.
by Alexandre Julliard 28 Sep '11

28 Sep '11

Module: docs Branch: master Commit: 9052c1a1d9226a18a0bf83fd13f363a8c5ebcf1e URL: http://source.winehq.org/git/docs.git/?a=commit;h=9052c1a1d9226a18a0bf83fd1… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Sep 28 12:11:06 2011 +0200 winedev: Signal that 'set +/- foo' only works for debug channels in WINEDEBUG. --- en/winedev-debugger.sgml | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/en/winedev-debugger.sgml b/en/winedev-debugger.sgml index 587a470..b877063 100644 --- a/en/winedev-debugger.sgml +++ b/en/winedev-debugger.sgml @@ -2111,7 +2111,8 @@ set $BreakAllThreadsStartup = 1 <title>Debug channels</title> <para> It is possible to turn on and off debug messages as you - are debugging using the set command. + are debugging using the set command (only for debug channels + specified in WINEDEBUG environment variable). See <xref linkend="debugging"> for more details on debug channels. </para>

1 0

Hwang YunSong : po: Updated Korean translation.
by Alexandre Julliard 27 Sep '11

27 Sep '11

Module: wine Branch: master Commit: 3960ea844b0e6f3aeadf304ad79507d5172b21bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=3960ea844b0e6f3aeadf304ad… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Tue Sep 27 22:02:03 2011 +0900 po: Updated Korean translation. --- po/ko.po | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/po/ko.po b/po/ko.po index 41b3eb1..0ca949c 100644 --- a/po/ko.po +++ b/po/ko.po @@ -8938,9 +8938,8 @@ msgid "version 1.0" msgstr "버젼 1.0" #: oleview.rc:100 -#, fuzzy msgid "TypeLib files (*.tlb; *.olb; *.dll; *.ocx; *.exe)" -msgstr "TypeLib 파일 (*.tlb;*.olb;*.dll;*.ocx;*.exe)" +msgstr "TypeLib 파일들 (*.tlb;*.olb;*.dll;*.ocx;*.exe)" #: oleview.rc:103 msgid "Bind to file via a File Moniker" @@ -10380,9 +10379,8 @@ msgid "Default Settings" msgstr "기본 설정" #: winecfg.rc:59 -#, fuzzy msgid "Wine Programs (*.exe; *.exe.so)" -msgstr "Wine 프로그램 (*.exe,*.exe.so)" +msgstr "Wine 프로그램들 (*.exe,*.exe.so)" #: winecfg.rc:60 msgid "Use global settings" @@ -11127,9 +11125,8 @@ msgid "Unicode text document" msgstr "유니코드 텍스트 문서" #: wordpad.rc:143 -#, fuzzy msgid "Printer files (*.prn)" -msgstr "프린터 파일 (*.PRN)" +msgstr "프린터 파일들 (*.prn)" #: wordpad.rc:148 msgid "Left"

1 0

Huw Davies : gdi32: Forward StretchBlt calls from the dib driver to the null driver.
by Alexandre Julliard 27 Sep '11

27 Sep '11

Module: wine Branch: master Commit: 9b7ea6f417a68517745203123d9df0516ebc60b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b7ea6f417a68517745203123… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Sep 27 16:13:39 2011 +0100 gdi32: Forward StretchBlt calls from the dib driver to the null driver. --- dlls/gdi32/dibdrv/bitblt.c | 20 ++++++++++++++++++++ dlls/gdi32/dibdrv/dc.c | 2 +- dlls/gdi32/dibdrv/dibdrv.h | 2 ++ dlls/gdi32/tests/bitmap.c | 5 ----- 4 files changed, 23 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/dibdrv/bitblt.c b/dlls/gdi32/dibdrv/bitblt.c index 7014fcf..48afa8e 100644 --- a/dlls/gdi32/dibdrv/bitblt.c +++ b/dlls/gdi32/dibdrv/bitblt.c @@ -1113,3 +1113,23 @@ DWORD stretch_bitmapinfo( const BITMAPINFO *src_info, void *src_bits, struct bit offset_rect( &src->visrect, -src->visrect.left, -src->visrect.top ); return ERROR_SUCCESS; } + +/*********************************************************************** + * dibdrv_StretchBlt + */ +BOOL dibdrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, + PHYSDEV src_dev, struct bitblt_coords *src, DWORD rop ) +{ + BOOL ret; + DC *dc_dst = get_dc_ptr( dst_dev->hdc ); + + if (!dc_dst) return FALSE; + + if (dst->width == 1 && src->width > 1) src->width--; + if (dst->height == 1 && src->height > 1) src->height--; + + ret = dc_dst->nulldrv.funcs->pStretchBlt( &dc_dst->nulldrv, dst, + src_dev, src, rop ); + release_dc_ptr( dc_dst ); + return ret; +} diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index b02ae8a..9d8391a 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -611,7 +611,7 @@ const DC_FUNCTIONS dib_driver = NULL, /* pSetWorldTransform */ NULL, /* pStartDoc */ NULL, /* pStartPage */ - NULL, /* pStretchBlt */ + dibdrv_StretchBlt, /* pStretchBlt */ NULL, /* pStretchDIBits */ NULL, /* pStrokeAndFillPath */ NULL, /* pStrokePath */ diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index 155f1e9..21549f8 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -116,6 +116,8 @@ extern HBRUSH dibdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush ) DECLSPEC_HIDDEN extern HPEN dibdrv_SelectPen( PHYSDEV dev, HPEN hpen ) DECLSPEC_HIDDEN; extern COLORREF dibdrv_SetDCBrushColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; extern COLORREF dibdrv_SetDCPenColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; +extern BOOL dibdrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, + PHYSDEV src_dev, struct bitblt_coords *src, DWORD rop ) DECLSPEC_HIDDEN; static inline dibdrv_physdev *get_dibdrv_pdev( PHYSDEV dev ) { diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index ccca315..bb4d43f 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -2866,24 +2866,20 @@ static void test_StretchBlt(void) 0, 0, 1, 1, 0, 0, 2, 1, expected, __LINE__); expected[0] = srcBuffer[0] & srcBuffer[1]; -todo_wine check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, 0, 0, 1, 1, 0, 0, 3, 1, expected, __LINE__); expected[0] = srcBuffer[0] & srcBuffer[1] & srcBuffer[2]; -todo_wine check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, 0, 0, 1, 1, 0, 0, 4, 1, expected, __LINE__); /* this doesn't happen if the src width is -ve */ expected[0] = srcBuffer[1] & srcBuffer[2]; -todo_wine check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, 0, 0, 1, 1, 2, 0, -2, 1, expected, __LINE__); /* when dst width > 1 behaviour reverts to what one would expect */ expected[0] = srcBuffer[0] & srcBuffer[1], expected[1] = srcBuffer[2] & srcBuffer[3]; -todo_wine check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, 0, 0, 2, 1, 0, 0, 4, 1, expected, __LINE__); @@ -2899,7 +2895,6 @@ todo_wine SetViewportExtEx( hdcDst, 100, 100, NULL ); expected[0] = srcBuffer[0] & srcBuffer[1] & srcBuffer[2]; -todo_wine check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, 0, 0, 2, 2, 0, 0, 4, 1, expected, __LINE__); SetMapMode( hdcDst, MM_TEXT );

1 0

Huw Davies : gdi32: Implement stretch_bitmapinfo.
by Alexandre Julliard 27 Sep '11

27 Sep '11

Module: wine Branch: master Commit: 268b8382cd17bddb9db305b9bd22f042072b6fae URL: http://source.winehq.org/git/wine.git/?a=commit;h=268b8382cd17bddb9db305b9b… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Sep 27 16:13:38 2011 +0100 gdi32: Implement stretch_bitmapinfo. --- dlls/gdi32/dibdrv/bitblt.c | 218 ++++++++++++++++++++- dlls/gdi32/dibdrv/dibdrv.h | 13 ++ dlls/gdi32/dibdrv/primitives.c | 441 +++++++++++++++++++++++++++++++++++++++- 3 files changed, 662 insertions(+), 10 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=268b8382cd17bddb9db30…

1 0

Huw Davies : gdi32: stretch_bitmapinfo may need to adjust the dst visrect.
by Alexandre Julliard 27 Sep '11

27 Sep '11

Module: wine Branch: master Commit: 15c4754e803bcd9e1ed5e5cb3154862b0fc41031 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15c4754e803bcd9e1ed5e5cb3… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Sep 27 16:13:37 2011 +0100 gdi32: stretch_bitmapinfo may need to adjust the dst visrect. --- dlls/gdi32/dibdrv/bitblt.c | 2 +- dlls/gdi32/gdi_private.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/dibdrv/bitblt.c b/dlls/gdi32/dibdrv/bitblt.c index 01dfc3c..918e09c 100644 --- a/dlls/gdi32/dibdrv/bitblt.c +++ b/dlls/gdi32/dibdrv/bitblt.c @@ -885,7 +885,7 @@ done: } DWORD stretch_bitmapinfo( const BITMAPINFO *src_info, void *src_bits, struct bitblt_coords *src, - const BITMAPINFO *dst_info, void *dst_bits, const struct bitblt_coords *dst, + const BITMAPINFO *dst_info, void *dst_bits, struct bitblt_coords *dst, INT mode ) { FIXME( "should stretch %dx%d -> %dx%d\n", src->width, src->height, dst->width, dst->height ); diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 6cb8693..b3d027a 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -255,7 +255,7 @@ extern DWORD convert_bitmapinfo( const BITMAPINFO *src_info, void *src_bits, str const BITMAPINFO *dst_info, void *dst_bits ) DECLSPEC_HIDDEN; extern DWORD stretch_bitmapinfo( const BITMAPINFO *src_info, void *src_bits, struct bitblt_coords *src, - const BITMAPINFO *dst_info, void *dst_bits, const struct bitblt_coords *dst, + const BITMAPINFO *dst_info, void *dst_bits, struct bitblt_coords *dst, INT mode ) DECLSPEC_HIDDEN; /* driver.c */

1 0

Huw Davies : gdi32: Make clip_line external.
by Alexandre Julliard 27 Sep '11

27 Sep '11

Module: wine Branch: master Commit: c6e483cbd1ad5bc848cd38411ebba9eef7401425 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6e483cbd1ad5bc848cd38411… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Sep 27 16:13:36 2011 +0100 gdi32: Make clip_line external. --- dlls/gdi32/dibdrv/dibdrv.h | 24 ++++++++++++++++++------ dlls/gdi32/dibdrv/objects.c | 11 ++--------- 2 files changed, 20 insertions(+), 15 deletions(-) diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index 3c17841..e580ba5 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -124,12 +124,15 @@ static inline dibdrv_physdev *get_dibdrv_pdev( PHYSDEV dev ) typedef struct primitive_funcs { - void (* solid_rects)(const dib_info *dib, int num, const RECT *rc, DWORD and, DWORD xor); - void (* pattern_rects)(const dib_info *dib, int num, const RECT *rc, const POINT *orign, const dib_info *brush, void *and_bits, void *xor_bits); - void (* copy_rect)(const dib_info *dst, const RECT *rc, const dib_info *src, const POINT *origin, int rop2, int overlap); - DWORD (* colorref_to_pixel)(const dib_info *dib, COLORREF color); - BOOL (* convert_to)(dib_info *dst, const dib_info *src, const RECT *src_rect); - BOOL (* create_rop_masks)(const dib_info *dib, const dib_info *hatch, const rop_mask *fg, const rop_mask *bg, rop_mask_bits *bits); + void (* solid_rects)(const dib_info *dib, int num, const RECT *rc, DWORD and, DWORD xor); + void (* pattern_rects)(const dib_info *dib, int num, const RECT *rc, const POINT *orign, + const dib_info *brush, void *and_bits, void *xor_bits); + void (* copy_rect)(const dib_info *dst, const RECT *rc, const dib_info *src, + const POINT *origin, int rop2, int overlap); + DWORD (* colorref_to_pixel)(const dib_info *dib, COLORREF color); + BOOL (* convert_to)(dib_info *dst, const dib_info *src, const RECT *src_rect); + BOOL (* create_rop_masks)(const dib_info *dib, const dib_info *hatch, + const rop_mask *fg, const rop_mask *bg, rop_mask_bits *bits); } primitive_funcs; extern const primitive_funcs funcs_8888 DECLSPEC_HIDDEN; @@ -152,6 +155,13 @@ struct rop_codes #define OVERLAP_ABOVE 0x04 /* dest starts above source */ #define OVERLAP_BELOW 0x08 /* dest starts below source */ +typedef struct +{ + unsigned int dx, dy; + int bias; + DWORD octant; +} bres_params; + extern void get_rop_codes(INT rop, struct rop_codes *codes); extern void calc_and_xor_masks(INT rop, DWORD color, DWORD *and, DWORD *xor) DECLSPEC_HIDDEN; extern void update_brush_rop( dibdrv_physdev *pdev, INT rop ) DECLSPEC_HIDDEN; @@ -171,6 +181,8 @@ extern DWORD get_fg_color(dibdrv_physdev *pdev, COLORREF color) DECLSPEC_HIDDEN; extern BOOL brush_rects( dibdrv_physdev *pdev, int num, const RECT *rects ) DECLSPEC_HIDDEN; extern HRGN add_extra_clipping_region( dibdrv_physdev *pdev, HRGN rgn ) DECLSPEC_HIDDEN; extern void restore_clipping_region( dibdrv_physdev *pdev, HRGN rgn ) DECLSPEC_HIDDEN; +extern int clip_line(const POINT *start, const POINT *end, const RECT *clip, + const bres_params *params, POINT *pt1, POINT *pt2) DECLSPEC_HIDDEN; static inline BOOL defer_pen(dibdrv_physdev *pdev) { diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index 4833600..2dcd33a 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -288,13 +288,6 @@ static inline DWORD calc_outcode(const POINT *pt, const RECT *clip) return out; } -typedef struct -{ - unsigned int dx, dy; - int bias; - DWORD octant; -} bres_params; - /****************************************************************************** * clip_line * @@ -365,8 +358,8 @@ typedef struct * Moving end point from x2 to x2 - m find y2 - n * n = (2mdy + bias - dy - 1) / 2dx + 1 */ -static int clip_line(const POINT *start, const POINT *end, const RECT *clip, - const bres_params *params, POINT *pt1, POINT *pt2) +int clip_line(const POINT *start, const POINT *end, const RECT *clip, + const bres_params *params, POINT *pt1, POINT *pt2) { int m, n; BOOL clipped = FALSE;

1 0

Erich Hoover : hhctrl.ocx: Use separate icons for 'Hide' and 'Show' toolbar buttons based on the HIST_VIEWTREE icon.
by Alexandre Julliard 27 Sep '11

27 Sep '11

Module: wine Branch: master Commit: 442343a3db26a31ff12918dc42191abe85bcb120 URL: http://source.winehq.org/git/wine.git/?a=commit;h=442343a3db26a31ff12918dc4… Author: Erich Hoover <ehoover(a)mines.edu> Date: Tue Sep 27 08:11:36 2011 -0600 hhctrl.ocx: Use separate icons for 'Hide' and 'Show' toolbar buttons based on the HIST_VIEWTREE icon. --- dlls/hhctrl.ocx/help.c | 4 +- dlls/hhctrl.ocx/hhtoolbar.bmp | Bin 9338 -> 13946 bytes dlls/hhctrl.ocx/hhtoolbar.svg | 230 +++++++++++++++++++++++++---------------- dlls/hhctrl.ocx/resource.h | 4 +- 4 files changed, 146 insertions(+), 92 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=442343a3db26a31ff1291…

1 0

Erich Hoover : hhctrl.ocx: Use a modified (two color) refresh icon for the 'Sync' toolbar button.
by Alexandre Julliard 27 Sep '11

27 Sep '11

Module: wine Branch: master Commit: 54bb7bc51dd77d37d95967d063f738d80bd5ed76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54bb7bc51dd77d37d95967d06… Author: Erich Hoover <ehoover(a)mines.edu> Date: Tue Sep 27 08:11:05 2011 -0600 hhctrl.ocx: Use a modified (two color) refresh icon for the 'Sync' toolbar button. --- dlls/hhctrl.ocx/help.c | 11 +++--- dlls/hhctrl.ocx/hhtoolbar.bmp | Bin 7034 -> 9338 bytes dlls/hhctrl.ocx/hhtoolbar.svg | 75 ++++++++++++++++++++++++++++++---------- dlls/hhctrl.ocx/resource.h | 8 +++-- 4 files changed, 66 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=54bb7bc51dd77d37d9596…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2011