April 2008 - wine-commits

Alexandre Julliard : Wine release 0.9.59
by Alexandre Julliard 04 Apr '08

04 Apr '08

Module: website Branch: master Commit: 0937f04c0367d395c6944c2c6f5994a0f0121048 URL: http://source.winehq.org/git/website.git/?a=commit;h=0937f04c0367d395c6944c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 4 17:06:20 2008 +0200 Wine release 0.9.59 --- news/2008040401.xml | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/news/2008040401.xml b/news/2008040401.xml new file mode 100644 index 0000000..005a724 --- … [View More]

1 0

Tag wine-0.9.59 : Alexandre Julliard : Release 0.9.59
by Alexandre Julliard 04 Apr '08

04 Apr '08

Module: wine Branch: refs/tags/wine-0.9.59 Tag: 232830e2c089822184682922c4ddc97d5095c7a7 URL: http://source.winehq.org/git/wine.git/?a=tag;h=232830e2c089822184682922c4dd… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 4 16:55:13 2008 +0200 Release 0.9.59

1 0

Alexandre Julliard : Release 0.9.59.
by Alexandre Julliard 04 Apr '08

04 Apr '08

Module: wine Branch: master Commit: f294dda7498052dd7d3fa69d87cc539fa633217f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f294dda7498052dd7d3fa69d8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 4 16:55:13 2008 +0200 Release 0.9.59. --- ANNOUNCE | 1269 +++++++++++++++++------------- ChangeLog | 2558 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ VERSION | 2 +- configure | 18 +- 4 files changed, 3284 insertions(+), 563 … [View More]

1 0

Alexandre Julliard : winex11: Avoid updating the wm states inside a ConfigureNotify event.
by Alexandre Julliard 04 Apr '08

04 Apr '08

Module: wine Branch: master Commit: 6e643f3b57ea422b4dd871993505e8064e21a7fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e643f3b57ea422b4dd871993… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 4 13:41:27 2008 +0200 winex11: Avoid updating the wm states inside a ConfigureNotify event. --- dlls/winex11.drv/winpos.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c … [View More]

1 0

Alexandre Julliard : wininet: Avoid size_t type in trace.
by Alexandre Julliard 04 Apr '08

04 Apr '08

Module: wine Branch: master Commit: 631f469cb51af0e12ea329fb2cda41efed4b0c91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=631f469cb51af0e12ea329fb2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 4 13:12:21 2008 +0200 wininet: Avoid size_t type in trace. --- dlls/wininet/http.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 1bb3893..e2ee9af 100644 --- a/dlls/wininet/http.c +++… [View More]

1 0

Hwang YunSong(=?UTF-8?Q?=ED=99=A9=EC=9C=A4=EC=84=B1?=) : crypt32: Updated Korean resource.
by Alexandre Julliard 04 Apr '08

04 Apr '08

Module: wine Branch: master Commit: faa54aeac8ffe55583695ca9f0fc70b5ba4ac030 URL: http://source.winehq.org/git/wine.git/?a=commit;h=faa54aeac8ffe55583695ca9f… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Fri Apr 4 09:57:58 2008 +0900 crypt32: Updated Korean resource. --- dlls/crypt32/crypt32_Ko.rc | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/crypt32_Ko.rc b/dlls/crypt32/crypt32_Ko.rc index 2f6367b..cdb89fc 100644 --- a/… [View More]

1 0

Hwang YunSong(=?UTF-8?Q?=ED=99=A9=EC=9C=A4=EC=84=B1?=) : msrle32: Updated Korean resource.
by Alexandre Julliard 04 Apr '08

04 Apr '08

Module: wine Branch: master Commit: 521a217826cbd32a61decfba91e7f0b0c8b4d8f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=521a217826cbd32a61decfba9… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Fri Apr 4 10:14:34 2008 +0900 msrle32: Updated Korean resource. --- dlls/msrle32/msrle_Ko.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msrle32/msrle_Ko.rc b/dlls/msrle32/msrle_Ko.rc index 7732a2c..c56dede 100644 --- a/dlls/… [View More]

1 0

Hwang YunSong(=?UTF-8?Q?=ED=99=A9=EC=9C=A4=EC=84=B1?=) : msi: Updated Korean resource.
by Alexandre Julliard 04 Apr '08

04 Apr '08

Module: wine Branch: master Commit: 405b31aa96b9ba008080b33229e695f27c75a8cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=405b31aa96b9ba008080b3322… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Fri Apr 4 10:12:24 2008 +0900 msi: Updated Korean resource. --- dlls/msi/msi_Ko.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/msi_Ko.rc b/dlls/msi/msi_Ko.rc index 100a98e..e8f2eec 100644 --- a/dlls/msi/msi_Ko.rc +++ b/dlls/… [View More]

1 0

Hwang YunSong(=?UTF-8?Q?=ED=99=A9=EC=9C=A4=EC=84=B1?=) : devenum: New Korean resource.
by Alexandre Julliard 04 Apr '08

04 Apr '08

Module: wine Branch: master Commit: d18416d5f9f8d32b8ba9b770ff9e504d570210e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d18416d5f9f8d32b8ba9b770f… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Fri Apr 4 10:06:45 2008 +0900 devenum: New Korean resource. --- dlls/devenum/devenum.rc | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/devenum/devenum.rc b/dlls/devenum/devenum.rc index 916d63e..4db5821 100644 --- a/dlls/… [View More]

1 0

Hwang YunSong(=?UTF-8?Q?=ED=99=A9=EC=9C=A4=EC=84=B1?=) : credui: Updated Korean resource.
by Alexandre Julliard 04 Apr '08

04 Apr '08

Module: wine Branch: master Commit: 991be694abb2fa3c5c86e63fe40c3934c7822da1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=991be694abb2fa3c5c86e63fe… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Fri Apr 4 09:55:38 2008 +0900 credui: Updated Korean resource. --- dlls/credui/credui_Ko.rc | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/credui/credui_Ko.rc b/dlls/credui/credui_Ko.rc index 0e94469..95863d9 100644 --- a/dlls/… [View More]

1 0

Hwang YunSong(=?UTF-8?Q?=ED=99=A9=EC=9C=A4=EC=84=B1?=) : clock: Updated Korean resource.
by Alexandre Julliard 04 Apr '08

04 Apr '08

Module: wine Branch: master Commit: 1694f781ffb5239dfd48e22aebee2ec101e4db49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1694f781ffb5239dfd48e22ae… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Fri Apr 4 09:38:55 2008 +0900 clock: Updated Korean resource. --- programs/clock/Ko.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/clock/Ko.rc b/programs/clock/Ko.rc index dd52a1c..57aaa3a 100644 --- a/programs/clock/Ko.rc +++ … [View More]

1 0

Alexander Morozov : setupapi: Prevent of reallocating memory for _SP_DEVINFO_DATA structures.
by Alexandre Julliard 04 Apr '08

04 Apr '08

Module: wine Branch: master Commit: 62520da8d398c9b822428189dc0811ce9b1c7716 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62520da8d398c9b822428189d… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Thu Apr 3 19:19:40 2008 +0400 setupapi: Prevent of reallocating memory for _SP_DEVINFO_DATA structures. --- dlls/setupapi/devinst.c | 89 ++++++++++++++++++++++++++++------------------- 1 files changed, 53 insertions(+), 36 deletions(-) diff --git a/dlls/setupapi/… [View More]devinst.c b/dlls/setupapi/devinst.c index 75cb38b..bf952ef 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -98,7 +98,13 @@ struct DeviceInfoSet GUID ClassGuid; HWND hwndParent; DWORD cDevices; - SP_DEVINFO_DATA *devices; + struct list devices; +}; + +struct DeviceInstance +{ + struct list entry; + SP_DEVINFO_DATA data; }; /* Pointed to by SP_DEVICE_INTERFACE_DATA's Reserved member */ @@ -541,27 +547,24 @@ static BOOL SETUPDI_AddDeviceToSet(struct DeviceInfoSet *set, if (devInfo) { - if (set->devices) - set->devices = HeapReAlloc(GetProcessHeap(), 0, set->devices, - (set->cDevices + 1) * sizeof(SP_DEVINFO_DATA)); - else - set->devices = HeapAlloc(GetProcessHeap(), 0, - sizeof(SP_DEVINFO_DATA)); - if (set->devices) + struct DeviceInstance *devInst = + HeapAlloc(GetProcessHeap(), 0, sizeof(struct DeviceInstance)); + + if (devInst) { WCHAR classGuidStr[39]; - SP_DEVINFO_DATA *DeviceInfoData = &set->devices[set->cDevices++]; - DeviceInfoData->cbSize = sizeof(SP_DEVINFO_DATA); - DeviceInfoData->ClassGuid = *guid; - DeviceInfoData->DevInst = devInfo->devId; - DeviceInfoData->Reserved = (ULONG_PTR)devInfo; + list_add_tail(&set->devices, &devInst->entry); + set->cDevices++; + devInst->data.cbSize = sizeof(SP_DEVINFO_DATA); + devInst->data.ClassGuid = *guid; + devInst->data.DevInst = devInfo->devId; + devInst->data.Reserved = (ULONG_PTR)devInfo; SETUPDI_GuidToString(guid, classGuidStr); SetupDiSetDeviceRegistryPropertyW((HDEVINFO)set, - DeviceInfoData, SPDRP_CLASSGUID, (const BYTE *)classGuidStr, + &devInst->data, SPDRP_CLASSGUID, (const BYTE *)classGuidStr, lstrlenW(classGuidStr) * sizeof(WCHAR)); - if (dev) - *dev = DeviceInfoData; + if (dev) *dev = &devInst->data; ret = TRUE; } else @@ -1185,7 +1188,7 @@ SetupDiCreateDeviceInfoListExW(const GUID *ClassGuid, ClassGuid ? ClassGuid : &GUID_NULL, sizeof(list->ClassGuid)); list->cDevices = 0; - list->devices = NULL; + list_init(&list->devices); return (HDEVINFO)list; } @@ -1423,12 +1426,12 @@ BOOL WINAPI SetupDiCreateDeviceInfoW( if (set->cDevices) { - DWORD i, highestDevID = 0; + DWORD highestDevID = 0; + struct DeviceInstance *devInst; - for (i = 0; i < set->cDevices; i++) + LIST_FOR_EACH_ENTRY(devInst, &set->devices, struct DeviceInstance, entry) { - struct DeviceInfo *devInfo = - (struct DeviceInfo *)set->devices[i].Reserved; + struct DeviceInfo *devInfo = (struct DeviceInfo *)devInst->data.Reserved; LPCWSTR devName = strrchrW(devInfo->instanceId, '\\'); DWORD id; @@ -1460,14 +1463,13 @@ BOOL WINAPI SetupDiCreateDeviceInfoW( } else { - DWORD i; + struct DeviceInstance *devInst; ret = TRUE; instanceId = DeviceName; - for (i = 0; ret && i < set->cDevices; i++) + LIST_FOR_EACH_ENTRY(devInst, &set->devices, struct DeviceInstance, entry) { - struct DeviceInfo *devInfo = - (struct DeviceInfo *)set->devices[i].Reserved; + struct DeviceInfo *devInfo = (struct DeviceInfo *)devInst->data.Reserved; if (!lstrcmpiW(DeviceName, devInfo->instanceId)) { @@ -1579,7 +1581,18 @@ BOOL WINAPI SetupDiEnumDeviceInfo( { if (info->cbSize == sizeof(SP_DEVINFO_DATA)) { - memcpy(info, &list->devices[index], info->cbSize); + struct DeviceInstance *devInst; + DWORD i = 0; + + LIST_FOR_EACH_ENTRY(devInst, &list->devices, + struct DeviceInstance, entry) + { + if (i++ == index) + { + *info = devInst->data; + break; + } + } ret = TRUE; } else @@ -2817,16 +2830,17 @@ BOOL WINAPI SetupDiEnumDeviceInterfaces( } else { - DWORD i, cEnumerated = 0; + struct DeviceInstance *devInst; + DWORD cEnumerated = 0; BOOL found = FALSE; - for (i = 0; !found && cEnumerated < MemberIndex + 1 && - i < set->cDevices; i++) + LIST_FOR_EACH_ENTRY(devInst, &set->devices, struct DeviceInstance, entry) { - struct DeviceInfo *devInfo = - (struct DeviceInfo *)set->devices[i].Reserved; + struct DeviceInfo *devInfo = (struct DeviceInfo *)devInst->data.Reserved; struct InterfaceInstances *iface; + if (found || cEnumerated >= MemberIndex + 1) + break; if (SETUPDI_FindInterface(devInfo, InterfaceClassGuid, &iface)) { if (cEnumerated + iface->cInstances < MemberIndex + 1) @@ -2871,12 +2885,15 @@ BOOL WINAPI SetupDiDestroyDeviceInfoList(HDEVINFO devinfo) if (list->magic == SETUP_DEVICE_INFO_SET_MAGIC) { - DWORD i; + struct DeviceInstance *devInst, *devInst2; - for (i = 0; i < list->cDevices; i++) - SETUPDI_FreeDeviceInfo( - (struct DeviceInfo *)list->devices[i].Reserved); - HeapFree(GetProcessHeap(), 0, list->devices); + LIST_FOR_EACH_ENTRY_SAFE(devInst, devInst2, &list->devices, + struct DeviceInstance, entry) + { + SETUPDI_FreeDeviceInfo( (struct DeviceInfo *)devInst->data.Reserved ); + list_remove(&devInst->entry); + HeapFree(GetProcessHeap(), 0, devInst); + } HeapFree(GetProcessHeap(), 0, list); ret = TRUE; } [View Less]

1 0

Austin English : Spelling fixes.
by Alexandre Julliard 04 Apr '08

04 Apr '08

Module: wine Branch: master Commit: cb2274e6900057cbaab8d88287877d69c5bd48be URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb2274e6900057cbaab8d8828… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Apr 3 12:10:30 2008 -0500 Spelling fixes. --- dlls/gdi32/enhmetafile.c | 2 +- dlls/gdi32/font.c | 2 +- dlls/gdi32/tests/bitmap.c | 2 +- dlls/gdiplus/graphicspath.c | 2 +- dlls/gphoto2.ds/gphoto2_i.h | 2 +- dlls/icmp/… [View More]icmp_main.c | 2 +- dlls/imaadp32.acm/imaadp32.c | 4 ++-- dlls/iphlpapi/ifenum.h | 2 +- dlls/iphlpapi/iphlpapi_main.c | 4 ++-- dlls/itss/chm_lib.c | 2 +- dlls/kernel32/snoop16.c | 2 +- dlls/kernel32/tests/path.c | 2 +- dlls/kernel32/time.c | 2 +- dlls/localspl/localspl_main.c | 2 +- 14 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index 150b82a..39b6057 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -1670,7 +1670,7 @@ BOOL WINAPI PlayEnhMetaFileRecord( LPVOID lpPackedStruct; /* Check that offsets and data are contained within the record - * (including checking for wrap arounds). + * (including checking for wrap-arounds). */ if ( lpCreate->offBmi + lpCreate->cbBmi > mr->nSize || lpCreate->offBits + lpCreate->cbBits > mr->nSize diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 952e720..70a043e 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2418,7 +2418,7 @@ BOOL WINAPI CreateScalableFontResourceW( DWORD fHidden, debugstr_w(lpszCurrentPath) ); /* fHidden=1 - only visible for the calling app, read-only, not - * enumbered with EnumFonts/EnumFontFamilies + * enumerated with EnumFonts/EnumFontFamilies * lpszCurrentPath can be NULL */ diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 09b6287..67bb27f 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -1603,7 +1603,7 @@ static void test_GetDIBits_BI_BITFIELDS(void) * http://www.lesher.ws/highcolor.html * http://www.lesher.ws/vidfmt.c * It hinges on being able to retrieve the bitmaps - * for the three primary colors in nonpaletted 16 bit mode. + * for the three primary colors in non-paletted 16 bit mode. */ char dibinfo_buf[sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)]; LPBITMAPINFO dibinfo = (LPBITMAPINFO) dibinfo_buf; diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 69a9526..adeaa89 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -179,7 +179,7 @@ GpStatus WINGDIPAPI GdipAddPathEllipse(GpPath *path, REAL x, REAL y, REAL width, memset(&path->pathdata.Types[old_count + 1], PathPointTypeBezier, MAX_ARC_PTS - 1); - /* An ellipse is an instrinsic figure (always its own subpath). */ + /* An ellipse is an intrinsic figure (always is its own subpath). */ path->pathdata.Types[old_count] = PathPointTypeStart; path->pathdata.Types[old_count + MAX_ARC_PTS - 1] |= PathPointTypeCloseSubpath; path->newfigure = TRUE; diff --git a/dlls/gphoto2.ds/gphoto2_i.h b/dlls/gphoto2.ds/gphoto2_i.h index 265da49..e92a5e8 100644 --- a/dlls/gphoto2.ds/gphoto2_i.h +++ b/dlls/gphoto2.ds/gphoto2_i.h @@ -82,7 +82,7 @@ struct tagActiveDS GPContext *context; #endif - /* Capabiblities */ + /* Capabilities */ TW_UINT32 capXferMech; /* ICAP_XFERMECH */ TW_UINT16 pixeltype; /* ICAP_PIXELTYPE */ TW_UINT16 pixelflavor; /* ICAP_PIXELFLAVOR */ diff --git a/dlls/icmp/icmp_main.c b/dlls/icmp/icmp_main.c index 8834282..82243da 100644 --- a/dlls/icmp/icmp_main.c +++ b/dlls/icmp/icmp_main.c @@ -72,7 +72,7 @@ #include "icmpapi.h" #include "wine/debug.h" -/* Set up endiannes macros for the ip and ip_icmp BSD headers */ +/* Set up endianness macros for the ip and ip_icmp BSD headers */ #ifndef BIG_ENDIAN #define BIG_ENDIAN 4321 #endif diff --git a/dlls/imaadp32.acm/imaadp32.c b/dlls/imaadp32.acm/imaadp32.c index e5b1544..1b44c0b 100644 --- a/dlls/imaadp32.acm/imaadp32.c +++ b/dlls/imaadp32.acm/imaadp32.c @@ -711,7 +711,7 @@ static LRESULT ADPCM_StreamOpen(PACMDRVSTREAMINSTANCE adsi) /* we check that in a block, after the header, samples are present on * 4-sample packet pattern - * we also check that the block alignement is bigger than the expected size + * we also check that the block alignment is bigger than the expected size */ if (((nspb - 1) & 3) != 0) goto theEnd; if ((((nspb - 1) / 2) + 4) * adsi->pwfxSrc->nChannels < adsi->pwfxSrc->nBlockAlign) @@ -736,7 +736,7 @@ static LRESULT ADPCM_StreamOpen(PACMDRVSTREAMINSTANCE adsi) /* we check that in a block, after the header, samples are present on * 4-sample packet pattern - * we also check that the block alignement is bigger than the expected size + * we also check that the block alignment is bigger than the expected size */ if (((nspb - 1) & 3) != 0) goto theEnd; if ((((nspb - 1) / 2) + 4) * adsi->pwfxDst->nChannels < adsi->pwfxDst->nBlockAlign) diff --git a/dlls/iphlpapi/ifenum.h b/dlls/iphlpapi/ifenum.h index 30a48e3..775244c 100644 --- a/dlls/iphlpapi/ifenum.h +++ b/dlls/iphlpapi/ifenum.h @@ -73,7 +73,7 @@ char *getInterfaceNameByIndex(DWORD index, char *name); */ DWORD getInterfaceIndexByName(const char *name, PDWORD index); -/* Gets a few physical charactersistics of a device: MAC addr len, MAC addr, +/* Gets a few physical characteristics of a device: MAC addr len, MAC addr, * and type as one of the MIB_IF_TYPEs. * len's in-out: on in, needs to say how many bytes are available in addr, * which to be safe should be MAX_INTERFACE_PHYSADDR. On out, it's how many diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 748a74a..764ae58 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1769,7 +1769,7 @@ DWORD WINAPI GetUniDirectionalAdapterInfo(PIP_UNIDIRECTIONAL_ADAPTER_ADDRESS pIP /****************************************************************** * IpReleaseAddress (IPHLPAPI.@) * - * Release an IP optained through DHCP, + * Release an IP obtained through DHCP, * * PARAMS * AdapterInfo [In] adapter to release IP address @@ -1828,7 +1828,7 @@ DWORD WINAPI IpRenewAddress(PIP_ADAPTER_INDEX_MAP AdapterInfo) * Notify caller whenever the ip-interface map is changed. * * PARAMS - * Handle [Out] handle useable in asynchronus notification + * Handle [Out] handle usable in asynchronous notification * overlapped [In] overlapped structure that notifies the caller * * RETURNS diff --git a/dlls/itss/chm_lib.c b/dlls/itss/chm_lib.c index 6a9626f..3b98d5e 100644 --- a/dlls/itss/chm_lib.c +++ b/dlls/itss/chm_lib.c @@ -1162,7 +1162,7 @@ static Int64 _chm_decompress_block(struct chmFile *h, Int64 cmpLen; /* compressed len */ int indexSlot; /* cache index slot */ UChar *lbuffer; /* local buffer ptr */ - UInt32 blockAlign = (UInt32)(block % h->reset_blkcount); /* reset intvl. aln. */ + UInt32 blockAlign = (UInt32)(block % h->reset_blkcount); /* reset interval align */ UInt32 i; /* local loop index */ /* let the caching system pull its weight! */ diff --git a/dlls/kernel32/snoop16.c b/dlls/kernel32/snoop16.c index fb82ba9..210f74c 100644 --- a/dlls/kernel32/snoop16.c +++ b/dlls/kernel32/snoop16.c @@ -174,7 +174,7 @@ SNOOP16_GetProcAddress16(HMODULE16 hmod,DWORD ordinal,FARPROC16 origfun) { if (!TRACE_ON(snoop) || !pModule || !HIWORD(origfun)) return origfun; - if (!*(LPBYTE)MapSL((SEGPTR)origfun)) /* 0x00 is an imposs. opcode, poss. dataref. */ + if (!*(LPBYTE)MapSL((SEGPTR)origfun)) /* 0x00 is an impossible opcode, possible dataref. */ return origfun; while (dll) { if (hmod == dll->hmod) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index e3851df..44a936e 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -859,7 +859,7 @@ static void test_GetTempPathW(char* tmp_dir) /* This one is different from ANSI version: ANSI version doesn't * touch the buffer, unicode version usually truncates the buffer - * to zero size. NT still exagerates the required buffer size + * to zero size. NT still exaggerates the required buffer size * sometimes so we cannot test for an exact match. Finally, the * 'len_with_null - 1' case is so buggy on Windows it's not testable. * For instance on NT4 it will sometimes return a path without the diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index cd14f9f..9f33af6 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -391,7 +391,7 @@ BOOL WINAPI SetSystemTimeAdjustment( DWORD dwTimeAdjustment, BOOL bTimeAdjustmen * TIME_ZONE_ID_INVALID An error occurred * TIME_ZONE_ID_UNKNOWN There are no transition time known * TIME_ZONE_ID_STANDARD Current time is standard time - * TIME_ZONE_ID_DAYLIGHT Current time is dayligh savings time + * TIME_ZONE_ID_DAYLIGHT Current time is daylight savings time */ DWORD WINAPI GetTimeZoneInformation( LPTIME_ZONE_INFORMATION tzinfo ) { diff --git a/dlls/localspl/localspl_main.c b/dlls/localspl/localspl_main.c index 77fb730..8efb7cb 100644 --- a/dlls/localspl/localspl_main.c +++ b/dlls/localspl/localspl_main.c @@ -394,7 +394,7 @@ static BOOL WINAPI fpGetPrinterDriverDirectory(LPWSTR pName, LPWSTR pEnvironment * myAddPrinterDriverEx [internal] * * Install a Printer Driver with the Option to upgrade / downgrade the Files - * and a special mode with lazy error ckecking + * and a special mode with lazy error checking. * */ static BOOL WINAPI myAddPrinterDriverEx(DWORD level, LPBYTE pDriverInfo, DWORD dwFileCopyFlags, BOOL lazy) [View Less]

1 0

Dan Hipschman : qedit: Indicate the methods of IMediaDet are not implemented in the FIXMEs.
by Alexandre Julliard 04 Apr '08

04 Apr '08

Module: wine Branch: master Commit: f95a849a28948549b0870f7c3a76cf5cf64638d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f95a849a28948549b0870f7c3… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Thu Apr 3 17:54:45 2008 -0700 qedit: Indicate the methods of IMediaDet are not implemented in the FIXMEs. --- dlls/qedit/mediadet.c | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/qedit/mediadet.c b/dlls/qedit/… [View More]mediadet.c index f7e6966..eb9f81d 100644 --- a/dlls/qedit/mediadet.c +++ b/dlls/qedit/mediadet.c @@ -70,70 +70,70 @@ static HRESULT WINAPI MediaDet_QueryInterface(IMediaDet* iface, REFIID riid, static HRESULT WINAPI MediaDet_get_Filter(IMediaDet* iface, IUnknown **pVal) { MediaDetImpl *This = (MediaDetImpl *)iface; - FIXME("(%p)->(%p)\n", This, pVal); + FIXME("(%p)->(%p): not implemented!\n", This, pVal); return E_NOTIMPL; } static HRESULT WINAPI MediaDet_put_Filter(IMediaDet* iface, IUnknown *newVal) { MediaDetImpl *This = (MediaDetImpl *)iface; - FIXME("(%p)->(%p)\n", This, newVal); + FIXME("(%p)->(%p): not implemented!\n", This, newVal); return E_NOTIMPL; } static HRESULT WINAPI MediaDet_get_OutputStreams(IMediaDet* iface, long *pVal) { MediaDetImpl *This = (MediaDetImpl *)iface; - FIXME("(%p)->(%p)\n", This, pVal); + FIXME("(%p)->(%p): not implemented!\n", This, pVal); return E_NOTIMPL; } static HRESULT WINAPI MediaDet_get_CurrentStream(IMediaDet* iface, long *pVal) { MediaDetImpl *This = (MediaDetImpl *)iface; - FIXME("(%p)->(%p)\n", This, pVal); + FIXME("(%p)->(%p): not implemented!\n", This, pVal); return E_NOTIMPL; } static HRESULT WINAPI MediaDet_put_CurrentStream(IMediaDet* iface, long newVal) { MediaDetImpl *This = (MediaDetImpl *)iface; - FIXME("(%p)->(%ld)\n", This, newVal); + FIXME("(%p)->(%ld): not implemented!\n", This, newVal); return E_NOTIMPL; } static HRESULT WINAPI MediaDet_get_StreamType(IMediaDet* iface, GUID *pVal) { MediaDetImpl *This = (MediaDetImpl *)iface; - FIXME("(%p)->(%p)\n", This, debugstr_guid(pVal)); + FIXME("(%p)->(%p): not implemented!\n", This, debugstr_guid(pVal)); return E_NOTIMPL; } static HRESULT WINAPI MediaDet_get_StreamTypeB(IMediaDet* iface, BSTR *pVal) { MediaDetImpl *This = (MediaDetImpl *)iface; - FIXME("(%p)->(%p)\n", This, pVal); + FIXME("(%p)->(%p): not implemented!\n", This, pVal); return E_NOTIMPL; } static HRESULT WINAPI MediaDet_get_StreamLength(IMediaDet* iface, double *pVal) { MediaDetImpl *This = (MediaDetImpl *)iface; - FIXME("(%p)->(%p)\n", This, pVal); + FIXME("(%p)->(%p): not implemented!\n", This, pVal); return E_NOTIMPL; } static HRESULT WINAPI MediaDet_get_Filename(IMediaDet* iface, BSTR *pVal) { MediaDetImpl *This = (MediaDetImpl *)iface; - FIXME("(%p)->(%p)\n", This, pVal); + FIXME("(%p)->(%p): not implemented!\n", This, pVal); return E_NOTIMPL; } static HRESULT WINAPI MediaDet_put_Filename(IMediaDet* iface, BSTR newVal) { MediaDetImpl *This = (MediaDetImpl *)iface; - FIXME("(%p)->(%p)\n", This, newVal); + FIXME("(%p)->(%p): not implemented!\n", This, newVal); return E_NOTIMPL; } @@ -143,7 +143,7 @@ static HRESULT WINAPI MediaDet_GetBitmapBits(IMediaDet* iface, long Width, long Height) { MediaDetImpl *This = (MediaDetImpl *)iface; - FIXME("(%p)->(%f %p %p %ld %ld)\n", This, StreamTime, pBufferSize, pBuffer, + FIXME("(%p)->(%f %p %p %ld %ld): not implemented!\n", This, StreamTime, pBufferSize, pBuffer, Width, Height); return E_NOTIMPL; } @@ -153,7 +153,7 @@ static HRESULT WINAPI MediaDet_WriteBitmapBits(IMediaDet* iface, long Height, BSTR Filename) { MediaDetImpl *This = (MediaDetImpl *)iface; - FIXME("(%p)->(%f %ld %ld %p)\n", This, StreamTime, Width, Height, Filename); + FIXME("(%p)->(%f %ld %ld %p): not implemented!\n", This, StreamTime, Width, Height, Filename); return E_NOTIMPL; } @@ -161,7 +161,7 @@ static HRESULT WINAPI MediaDet_get_StreamMediaType(IMediaDet* iface, AM_MEDIA_TYPE *pVal) { MediaDetImpl *This = (MediaDetImpl *)iface; - FIXME("(%p)->(%p)\n", This, pVal); + FIXME("(%p)->(%p): not implemented!\n", This, pVal); return E_NOTIMPL; } @@ -169,14 +169,14 @@ static HRESULT WINAPI MediaDet_GetSampleGrabber(IMediaDet* iface, ISampleGrabber **ppVal) { MediaDetImpl *This = (MediaDetImpl *)iface; - FIXME("(%p)->(%p)\n", This, ppVal); + FIXME("(%p)->(%p): not implemented!\n", This, ppVal); return E_NOTIMPL; } static HRESULT WINAPI MediaDet_get_FrameRate(IMediaDet* iface, double *pVal) { MediaDetImpl *This = (MediaDetImpl *)iface; - FIXME("(%p)->(%p)\n", This, pVal); + FIXME("(%p)->(%p): not implemented!\n", This, pVal); return E_NOTIMPL; } @@ -184,7 +184,7 @@ static HRESULT WINAPI MediaDet_EnterBitmapGrabMode(IMediaDet* iface, double SeekTime) { MediaDetImpl *This = (MediaDetImpl *)iface; - FIXME("(%p)->(%f)\n", This, SeekTime); + FIXME("(%p)->(%f): not implemented!\n", This, SeekTime); return E_NOTIMPL; } [View Less]

1 0

Alexander Dorofeyev : ddraw/tests: Extend p8_primary_test.
by Alexandre Julliard 04 Apr '08

04 Apr '08

Module: wine Branch: master Commit: 18b9c2bb8371365be5a86ae534c3e86cb2dc5916 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18b9c2bb8371365be5a86ae53… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Fri Apr 4 01:19:22 2008 +0300 ddraw/tests: Extend p8_primary_test. Additional tests for blitting and locking. --- dlls/ddraw/tests/visual.c | 107 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 105 insertions(+), 2 deletions(-) diff --git a/dlls/… [View More]ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index ee5bc7f..def235f 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -1733,7 +1733,7 @@ static void p8_surface_fill_rect(IDirectDrawSurface *dest, UINT x, UINT y, UINT hr = IDirectDrawSurface_Lock(dest, NULL, &ddsd, DDLOCK_WRITEONLY | DDLOCK_WAIT, NULL); ok(hr==DD_OK, "IDirectDrawSurface_Lock returned: %x\n", hr); - p = (BYTE *)ddsd.lpSurface + ddsd.lPitch * y; + p = (BYTE *)ddsd.lpSurface + ddsd.lPitch * y + x; for (i = 0; i < h; i++) { for (i1 = 0; i1 < w; i1++) { @@ -1785,12 +1785,14 @@ static void p8_primary_test() HRESULT hr; PALETTEENTRY entries[256]; RGBQUAD coltable[256]; - UINT i; + UINT i, i1, i2; IDirectDrawPalette *ddprimpal = NULL; IDirectDrawSurface *offscreen = NULL; WNDCLASS wc = {0}; DDBLTFX ddbltfx; COLORREF color; + RECT rect; + unsigned differences; /* An IDirect3DDevice cannot be queryInterfaced from an IDirect3DDevice7 on windows */ hr = DirectDrawCreate(NULL, &DirectDraw1, NULL); @@ -1917,6 +1919,107 @@ static void p8_primary_test() "got R %02X G %02X B %02X, expected R 00 G FF B 00\n", GetRValue(color), GetGValue(color), GetBValue(color)); + /* Test blitting and locking patterns that are likely to trigger bugs in opengl renderer (p8 + surface conversion and uploading/downloading to/from opengl texture). Similar patterns ( + blitting front buffer areas to/from an offscreen surface mixed with locking) are used by C&C + Red Alert I. */ + IDirectDrawSurface_Release(offscreen); + + memset (&ddsd, 0, sizeof (ddsd)); + ddsd.dwSize = sizeof (ddsd); + ddsd.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH | DDSD_PIXELFORMAT; + ddsd.dwWidth = 640; + ddsd.dwHeight = 480; + ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; + ddsd.ddpfPixelFormat.dwSize = sizeof(ddsd.ddpfPixelFormat); + ddsd.ddpfPixelFormat.dwFlags = DDPF_RGB | DDPF_PALETTEINDEXED8; + U1(ddsd.ddpfPixelFormat).dwRGBBitCount = 8; + hr = IDirectDraw_CreateSurface(DirectDraw1, &ddsd, &offscreen, NULL); + ok(hr == DD_OK, "IDirectDraw_CreateSurface returned %08x\n", hr); + + if (FAILED(hr)) goto out; + + /* Test two times, first time front buffer has a palette and second time front buffer + has no palette; the latter is somewhat contrived example, but an app could set + front buffer palette later. */ + for (i2 = 0; i2 < 2; i2++) { + if (i2 == 1) { + hr = IDirectDrawSurface_SetPalette(Surface1, NULL); + ok(hr==DD_OK, "IDirectDrawSurface_SetPalette returned: %x\n", hr); + } + + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + hr = IDirectDrawSurface_Lock(Surface1, NULL, &ddsd, DDLOCK_WAIT, NULL); + ok(hr==DD_OK, "IDirectDrawSurface_Lock returned: %x\n", hr); + + for (i = 0; i < 256; i++) { + unsigned x = (i % 128) * 4; + unsigned y = (i / 128) * 4; + BYTE *p = (BYTE *)ddsd.lpSurface + ddsd.lPitch * y + x; + + for (i1 = 0; i1 < 4; i1++) { + p[0] = p[1] = p[2] = p[3] = i; + p += ddsd.lPitch; + } + } + + hr = IDirectDrawSurface_Unlock(Surface1, NULL); + ok(hr==DD_OK, "IDirectDrawSurface_UnLock returned: %x\n", hr); + + hr = IDirectDrawSurface_BltFast(offscreen, 0, 0, Surface1, NULL, 0); + ok(hr==DD_OK, "IDirectDrawSurface_BltFast returned: %x\n", hr); + + /* This ensures offscreen surface contens will be downloaded to system memory. */ + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + hr = IDirectDrawSurface_Lock(offscreen, NULL, &ddsd, DDLOCK_WAIT, NULL); + ok(hr==DD_OK, "IDirectDrawSurface_Lock returned: %x\n", hr); + hr = IDirectDrawSurface_Unlock(offscreen, NULL); + ok(hr==DD_OK, "IDirectDrawSurface_UnLock returned: %x\n", hr); + + /* Offscreen surface data will have to be converted and uploaded to texture. */ + rect.left = 0; + rect.top = 0; + rect.right = 16; + rect.bottom = 16; + hr = IDirectDrawSurface_BltFast(offscreen, 600, 400, Surface1, &rect, 0); + ok(hr==DD_OK, "IDirectDrawSurface_BltFast returned: %x\n", hr); + + /* This ensures offscreen surface contens will be downloaded to system memory. */ + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + hr = IDirectDrawSurface_Lock(offscreen, NULL, &ddsd, DDLOCK_WAIT, NULL); + ok(hr==DD_OK, "IDirectDrawSurface_Lock returned: %x\n", hr); + hr = IDirectDrawSurface_Unlock(offscreen, NULL); + ok(hr==DD_OK, "IDirectDrawSurface_UnLock returned: %x\n", hr); + + hr = IDirectDrawSurface_BltFast(Surface1, 0, 0, offscreen, NULL, 0); + ok(hr==DD_OK, "IDirectDrawSurface_BltFast returned: %x\n", hr); + + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + hr = IDirectDrawSurface_Lock(Surface1, NULL, &ddsd, DDLOCK_WAIT, NULL); + ok(hr==DD_OK, "IDirectDrawSurface_Lock returned: %x\n", hr); + + differences = 0; + + for (i = 0; i < 256; i++) { + unsigned x = (i % 128) * 4 + 1; + unsigned y = (i / 128) * 4 + 1; + BYTE *p = (BYTE *)ddsd.lpSurface + ddsd.lPitch * y + x; + + if (*p != i) differences++; + } + + hr = IDirectDrawSurface_Unlock(Surface1, NULL); + ok(hr==DD_OK, "IDirectDrawSurface_UnLock returned: %x\n", hr); + + ok(differences == 0, i2 == 0 ? "Pass 1. Unexpected front buffer contens after blit (%u differences)\n" : + "Pass 2 (with NULL front buffer palette). Unexpected front buffer contens after blit (%u differences)\n", + differences); + } + out: if(ddprimpal) IDirectDrawPalette_Release(ddprimpal); [View Less]

1 0

Allan Tong : wined3d: Call ActivateContext before any gl call in IWineD3DSurfaceImpl_Release.
by Alexandre Julliard 04 Apr '08

04 Apr '08

Module: wine Branch: master Commit: a68637b59b8c2a73f5ea8c51f8ce55b684ea34b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a68637b59b8c2a73f5ea8c51f… Author: Allan Tong <actong88(a)gmail.com> Date: Thu Apr 3 21:06:48 2008 -0400 wined3d: Call ActivateContext before any gl call in IWineD3DSurfaceImpl_Release. --- dlls/wined3d/surface.c | 35 +++++++++++++++-------------------- 1 files changed, 15 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/surface.c b/… [View More]dlls/wined3d/surface.c index 641c249..ac4224e 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -423,29 +423,31 @@ ULONG WINAPI IWineD3DSurfaceImpl_Release(IWineD3DSurface *iface) { renderbuffer_entry_t *entry, *entry2; TRACE("(%p) : cleaning up\n", This); - if (This->glDescription.textureName != 0) { /* release the openGL texture.. */ - - /* Need a context to destroy the texture. Use the currently active render target, but only if - * the primary render target exists. Otherwise lastActiveRenderTarget is garbage, see above. - * When destroying the primary rt, Uninit3D will activate a context before doing anything - */ - if(device->render_targets && device->render_targets[0]) { - ActivateContext(device, device->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); - } + /* Need a context to destroy the texture. Use the currently active render target, but only if + * the primary render target exists. Otherwise lastActiveRenderTarget is garbage, see above. + * When destroying the primary rt, Uninit3D will activate a context before doing anything + */ + if(device->render_targets && device->render_targets[0]) { + ActivateContext(device, device->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); + } + ENTER_GL(); + if (This->glDescription.textureName != 0) { /* release the openGL texture.. */ TRACE("Deleting texture %d\n", This->glDescription.textureName); - ENTER_GL(); glDeleteTextures(1, &This->glDescription.textureName); - LEAVE_GL(); } if(This->Flags & SFLAG_PBO) { /* Delete the PBO */ - ENTER_GL(); GL_EXTCALL(glDeleteBuffersARB(1, &This->pbo)); - LEAVE_GL(); } + LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &This->renderbuffers, renderbuffer_entry_t, entry) { + GL_EXTCALL(glDeleteRenderbuffersEXT(1, &entry->id)); + HeapFree(GetProcessHeap(), 0, entry); + } + LEAVE_GL(); + if(This->Flags & SFLAG_DIBSECTION) { /* Release the DC */ SelectObject(This->hDC, This->dib.holdbitmap); @@ -463,13 +465,6 @@ ULONG WINAPI IWineD3DSurfaceImpl_Release(IWineD3DSurface *iface) { if(iface == device->ddraw_primary) device->ddraw_primary = NULL; - ENTER_GL(); - LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &This->renderbuffers, renderbuffer_entry_t, entry) { - GL_EXTCALL(glDeleteRenderbuffersEXT(1, &entry->id)); - HeapFree(GetProcessHeap(), 0, entry); - } - LEAVE_GL(); - TRACE("(%p) Released\n", This); HeapFree(GetProcessHeap(), 0, This); [View Less]

1 0

Alexandre Julliard : winex11: Don' t update the normal size hints when a window is minimized or maximized.
by Alexandre Julliard 04 Apr '08

04 Apr '08

Module: wine Branch: master Commit: cf9d3e3a0030b952f487549ae0429c85c6daf4df URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf9d3e3a0030b952f487549ae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 4 11:28:30 2008 +0200 winex11: Don't update the normal size hints when a window is minimized or maximized. --- dlls/winex11.drv/window.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/… [View More]

1 0

Alexandre Julliard : winex11: Use the same test for resizable windows when setting size and mwm hints.
by Alexandre Julliard 04 Apr '08

04 Apr '08

Module: wine Branch: master Commit: 4d14adfea37f31970294d75b981025a9b4e90ec5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d14adfea37f31970294d75b9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 4 11:25:48 2008 +0200 winex11: Use the same test for resizable windows when setting size and mwm hints. --- dlls/winex11.drv/window.c | 35 +++++++++++++++++++++-------------- 1 files changed, 21 insertions(+), 14 deletions(-) diff --git a/dlls/winex11.… [View More]drv/window.c b/dlls/winex11.drv/window.c index 4d1148b..2953337 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -131,6 +131,20 @@ BOOL X11DRV_is_window_rect_mapped( const RECT *rect ) /*********************************************************************** + * is_window_resizable + * + * Check if window should be made resizable by the window manager + */ +static inline BOOL is_window_resizable( struct x11drv_win_data *data, DWORD style ) +{ + if (style & WS_THICKFRAME) return TRUE; + /* Metacity needs the window to be resizable to make it fullscreen */ + return (data->whole_rect.left <= 0 && data->whole_rect.right >= screen_width && + data->whole_rect.top <= 0 && data->whole_rect.bottom >= screen_height); +} + + +/*********************************************************************** * get_mwm_decorations */ static unsigned long get_mwm_decorations( DWORD style, DWORD ex_style ) @@ -798,20 +812,13 @@ static void set_size_hints( Display *display, struct x11drv_win_data *data, DWOR size_hints->flags |= PWinGravity | PPosition; } - if ( !(style & WS_THICKFRAME) ) + if (!is_window_resizable( data, style )) { - /* If we restrict window resizing Metacity decides that it should - * disable fullscreen support for this window as well. - */ - if (!(data->whole_rect.left <= 0 && data->whole_rect.right >= screen_width && - data->whole_rect.top <= 0 && data->whole_rect.bottom >= screen_height)) - { - size_hints->max_width = data->whole_rect.right - data->whole_rect.left; - size_hints->max_height = data->whole_rect.bottom - data->whole_rect.top; - size_hints->min_width = size_hints->max_width; - size_hints->min_height = size_hints->max_height; - size_hints->flags |= PMinSize | PMaxSize; - } + size_hints->max_width = data->whole_rect.right - data->whole_rect.left; + size_hints->max_height = data->whole_rect.bottom - data->whole_rect.top; + size_hints->min_width = size_hints->max_width; + size_hints->min_height = size_hints->max_height; + size_hints->flags |= PMinSize | PMaxSize; } XSetWMNormalHints( display, data->whole_window, size_hints ); XFree( size_hints ); @@ -958,7 +965,7 @@ void X11DRV_set_wm_hints( Display *display, struct x11drv_win_data *data ) mwm_hints.flags = MWM_HINTS_FUNCTIONS | MWM_HINTS_DECORATIONS; mwm_hints.decorations = get_mwm_decorations( style, ex_style ); mwm_hints.functions = MWM_FUNC_MOVE; - if (style & WS_THICKFRAME) mwm_hints.functions |= MWM_FUNC_RESIZE; + if (is_window_resizable( data, style )) mwm_hints.functions |= MWM_FUNC_RESIZE; if (style & WS_MINIMIZEBOX) mwm_hints.functions |= MWM_FUNC_MINIMIZE; if (style & WS_MAXIMIZEBOX) mwm_hints.functions |= MWM_FUNC_MAXIMIZE; if (style & WS_SYSMENU) mwm_hints.functions |= MWM_FUNC_CLOSE; [View Less]

1 0

Alexandre Julliard : winex11: Ignore ConfigureNotify events on unmapped windows.
by Alexandre Julliard 04 Apr '08

04 Apr '08

Module: wine Branch: master Commit: 3f6fec362f7f51bdcf68e6cb78ca932df4ed2e96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f6fec362f7f51bdcf68e6cb7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 4 11:22:18 2008 +0200 winex11: Ignore ConfigureNotify events on unmapped windows. --- dlls/winex11.drv/winpos.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c index 912ddfb..… [View More]

1 0

Alexandre Julliard : winex11: Always update the window position without relying on the cached values.
by Alexandre Julliard 04 Apr '08

04 Apr '08

Module: wine Branch: master Commit: cef3bc62ce28b1e19624dd6c121bf1aa3247c3b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cef3bc62ce28b1e19624dd6c1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 4 11:20:45 2008 +0200 winex11: Always update the window position without relying on the cached values. --- dlls/winex11.drv/window.c | 44 ++++++++++++++++++++++++-------------------- 1 files changed, 24 insertions(+), 20 deletions(-) diff --git a/dlls/… [View More]winex11.drv/window.c b/dlls/winex11.drv/window.c index ffeed8e..4d1148b 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1036,8 +1036,22 @@ void X11DRV_sync_window_position( Display *display, struct x11drv_win_data *data UINT swp_flags, const RECT *old_client_rect, const RECT *old_whole_rect ) { + DWORD style = GetWindowLongW( data->hwnd, GWL_STYLE ); XWindowChanges changes; - int mask = get_window_changes( &changes, old_whole_rect, &data->whole_rect ); + int mask = CWWidth | CWHeight; + + if (data->managed && data->iconic) return; + + if ((changes.width = data->whole_rect.right - data->whole_rect.left) <= 0) changes.width = 1; + if ((changes.height = data->whole_rect.bottom - data->whole_rect.top) <= 0) changes.height = 1; + + /* only the size is allowed to change for the desktop window */ + if (data->whole_window != root_window) + { + changes.x = data->whole_rect.left - virtual_screen_rect.left; + changes.y = data->whole_rect.top - virtual_screen_rect.top; + mask |= CWX | CWY; + } if (!(swp_flags & SWP_NOZORDER)) { @@ -1054,26 +1068,16 @@ void X11DRV_sync_window_position( Display *display, struct x11drv_win_data *data /* and Above with a sibling doesn't work so well either, so we ignore it */ } - /* only the size is allowed to change for the desktop window */ - if (data->whole_window == root_window) mask &= CWWidth | CWHeight; - - if (mask) - { - DWORD style = GetWindowLongW( data->hwnd, GWL_STYLE ); - - TRACE( "setting win %p/%lx pos %d,%d,%dx%d after %lx changes=%x\n", - data->hwnd, data->whole_window, data->whole_rect.left, data->whole_rect.top, - data->whole_rect.right - data->whole_rect.left, - data->whole_rect.bottom - data->whole_rect.top, changes.sibling, mask ); + TRACE( "setting win %p/%lx pos %d,%d,%dx%d after %lx changes=%x\n", + data->hwnd, data->whole_window, data->whole_rect.left, data->whole_rect.top, + data->whole_rect.right - data->whole_rect.left, + data->whole_rect.bottom - data->whole_rect.top, changes.sibling, mask ); - wine_tsx11_lock(); - if (mask & (CWWidth|CWHeight)) set_size_hints( display, data, style ); - if (mask & CWX) changes.x -= virtual_screen_rect.left; - if (mask & CWY) changes.y -= virtual_screen_rect.top; - XReconfigureWMWindow( display, data->whole_window, - DefaultScreen(display), mask, &changes ); - wine_tsx11_unlock(); - } + wine_tsx11_lock(); + set_size_hints( display, data, style ); + XReconfigureWMWindow( display, data->whole_window, + DefaultScreen(display), mask, &changes ); + wine_tsx11_unlock(); } [View Less]

1 0

Lei Zhang : user32: Use a bogus wildcard in listbox test, change wildcard string to a const.
by Alexandre Julliard 04 Apr '08

04 Apr '08

Module: wine Branch: master Commit: 4bc0cd60cf87055b84b99d4e3e03fc7ddf7db5f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bc0cd60cf87055b84b99d4e3… Author: Lei Zhang <thestig(a)google.com> Date: Fri Apr 4 00:03:28 2008 -0700 user32: Use a bogus wildcard in listbox test, change wildcard string to a const. --- dlls/user32/tests/listbox.c | 64 ++++++++++++++++++++++--------------------- 1 files changed, 33 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4bc0cd60cf87055b84b99…

1 0

Stefan Dösinger : wined3d: Advertise shader emulation of bumpmap formats.
by Alexandre Julliard 04 Apr '08

04 Apr '08

Module: wine Branch: master Commit: 03bacf72479a3775380e832933cfe59abdb343f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03bacf72479a3775380e83293… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Apr 3 17:15:47 2008 +0200 wined3d: Advertise shader emulation of bumpmap formats. --- dlls/wined3d/directx.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 7450f3c..… [View More]

1 0

Stefan Dösinger : wined3d: Advertize postpixelshader blending for surfaces.
by Alexandre Julliard 04 Apr '08

04 Apr '08

Module: wine Branch: master Commit: ffbc96b43c8888dc9a5c07370a8f1ebd09241f54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffbc96b43c8888dc9a5c07370… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Apr 3 16:14:57 2008 +0200 wined3d: Advertize postpixelshader blending for surfaces. --- dlls/wined3d/directx.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 8e14309..… [View More]

1 0

Reece Dunn : shlwapi/tests: Fixed the wide-character strings.
by Alexandre Julliard 04 Apr '08

04 Apr '08

Module: wine Branch: master Commit: 33f788f7cbe125c863821169381ff80158796c05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33f788f7cbe125c8638211693… Author: Reece Dunn <msclrhd(a)googlemail.com> Date: Thu Apr 3 00:13:28 2008 +0100 shlwapi/tests: Fixed the wide-character strings. --- dlls/shlwapi/tests/istream.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/tests/istream.c b/dlls/shlwapi/tests/istream.c index 8eac740..7172e31 … [View More]

1 0

Andrew Talbot : rsaenh: Remove tentative declaration of static array with no size specifier.
by Alexandre Julliard 04 Apr '08

04 Apr '08

Module: wine Branch: master Commit: 722b659064afbf40caa843d0bf272e4ae68b1695 URL: http://source.winehq.org/git/wine.git/?a=commit;h=722b659064afbf40caa843d0b… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Apr 3 14:50:33 2008 +0100 rsaenh: Remove tentative declaration of static array with no size specifier. --- dlls/rsaenh/mpi.c | 80 ++++++++++++++++++++++++++--------------------------- 1 files changed, 39 insertions(+), 41 deletions(-) diff --git a/dlls/… [View More]rsaenh/mpi.c b/dlls/rsaenh/mpi.c index e06d2ee..45c3b94 100644 --- a/dlls/rsaenh/mpi.c +++ b/dlls/rsaenh/mpi.c @@ -31,9 +31,6 @@ #include <stdarg.h> #include "tomcrypt.h" -/* table of first PRIME_SIZE primes */ -static const mp_digit __prime_tab[]; - /* Known optimal configurations CPU /Compiler /MUL CUTOFF/SQR CUTOFF ------------------------------------------------------------- @@ -3034,6 +3031,45 @@ mp_mulmod (const mp_int * a, const mp_int * b, mp_int * c, mp_int * d) return res; } +/* table of first PRIME_SIZE primes */ +static const mp_digit __prime_tab[] = { + 0x0002, 0x0003, 0x0005, 0x0007, 0x000B, 0x000D, 0x0011, 0x0013, + 0x0017, 0x001D, 0x001F, 0x0025, 0x0029, 0x002B, 0x002F, 0x0035, + 0x003B, 0x003D, 0x0043, 0x0047, 0x0049, 0x004F, 0x0053, 0x0059, + 0x0061, 0x0065, 0x0067, 0x006B, 0x006D, 0x0071, 0x007F, 0x0083, + 0x0089, 0x008B, 0x0095, 0x0097, 0x009D, 0x00A3, 0x00A7, 0x00AD, + 0x00B3, 0x00B5, 0x00BF, 0x00C1, 0x00C5, 0x00C7, 0x00D3, 0x00DF, + 0x00E3, 0x00E5, 0x00E9, 0x00EF, 0x00F1, 0x00FB, 0x0101, 0x0107, + 0x010D, 0x010F, 0x0115, 0x0119, 0x011B, 0x0125, 0x0133, 0x0137, + + 0x0139, 0x013D, 0x014B, 0x0151, 0x015B, 0x015D, 0x0161, 0x0167, + 0x016F, 0x0175, 0x017B, 0x017F, 0x0185, 0x018D, 0x0191, 0x0199, + 0x01A3, 0x01A5, 0x01AF, 0x01B1, 0x01B7, 0x01BB, 0x01C1, 0x01C9, + 0x01CD, 0x01CF, 0x01D3, 0x01DF, 0x01E7, 0x01EB, 0x01F3, 0x01F7, + 0x01FD, 0x0209, 0x020B, 0x021D, 0x0223, 0x022D, 0x0233, 0x0239, + 0x023B, 0x0241, 0x024B, 0x0251, 0x0257, 0x0259, 0x025F, 0x0265, + 0x0269, 0x026B, 0x0277, 0x0281, 0x0283, 0x0287, 0x028D, 0x0293, + 0x0295, 0x02A1, 0x02A5, 0x02AB, 0x02B3, 0x02BD, 0x02C5, 0x02CF, + + 0x02D7, 0x02DD, 0x02E3, 0x02E7, 0x02EF, 0x02F5, 0x02F9, 0x0301, + 0x0305, 0x0313, 0x031D, 0x0329, 0x032B, 0x0335, 0x0337, 0x033B, + 0x033D, 0x0347, 0x0355, 0x0359, 0x035B, 0x035F, 0x036D, 0x0371, + 0x0373, 0x0377, 0x038B, 0x038F, 0x0397, 0x03A1, 0x03A9, 0x03AD, + 0x03B3, 0x03B9, 0x03C7, 0x03CB, 0x03D1, 0x03D7, 0x03DF, 0x03E5, + 0x03F1, 0x03F5, 0x03FB, 0x03FD, 0x0407, 0x0409, 0x040F, 0x0419, + 0x041B, 0x0425, 0x0427, 0x042D, 0x043F, 0x0443, 0x0445, 0x0449, + 0x044F, 0x0455, 0x045D, 0x0463, 0x0469, 0x047F, 0x0481, 0x048B, + + 0x0493, 0x049D, 0x04A3, 0x04A9, 0x04B1, 0x04BD, 0x04C1, 0x04C7, + 0x04CD, 0x04CF, 0x04D5, 0x04E1, 0x04EB, 0x04FD, 0x04FF, 0x0503, + 0x0509, 0x050B, 0x0511, 0x0515, 0x0517, 0x051B, 0x0527, 0x0529, + 0x052F, 0x0551, 0x0557, 0x055D, 0x0565, 0x0577, 0x0581, 0x058F, + 0x0593, 0x0595, 0x0599, 0x059F, 0x05A7, 0x05AB, 0x05AD, 0x05B3, + 0x05BF, 0x05C9, 0x05CB, 0x05CF, 0x05D1, 0x05D5, 0x05DB, 0x05E7, + 0x05F3, 0x05FB, 0x0607, 0x060D, 0x0611, 0x0617, 0x061F, 0x0623, + 0x062B, 0x062F, 0x063D, 0x0641, 0x0647, 0x0649, 0x064D, 0x0653 +}; + /* determines if an integers is divisible by one * of the first PRIME_SIZE primes or not * @@ -3810,44 +3846,6 @@ mp_zero (mp_int * a) memset (a->dp, 0, sizeof (mp_digit) * a->alloc); } -static const mp_digit __prime_tab[] = { - 0x0002, 0x0003, 0x0005, 0x0007, 0x000B, 0x000D, 0x0011, 0x0013, - 0x0017, 0x001D, 0x001F, 0x0025, 0x0029, 0x002B, 0x002F, 0x0035, - 0x003B, 0x003D, 0x0043, 0x0047, 0x0049, 0x004F, 0x0053, 0x0059, - 0x0061, 0x0065, 0x0067, 0x006B, 0x006D, 0x0071, 0x007F, 0x0083, - 0x0089, 0x008B, 0x0095, 0x0097, 0x009D, 0x00A3, 0x00A7, 0x00AD, - 0x00B3, 0x00B5, 0x00BF, 0x00C1, 0x00C5, 0x00C7, 0x00D3, 0x00DF, - 0x00E3, 0x00E5, 0x00E9, 0x00EF, 0x00F1, 0x00FB, 0x0101, 0x0107, - 0x010D, 0x010F, 0x0115, 0x0119, 0x011B, 0x0125, 0x0133, 0x0137, - - 0x0139, 0x013D, 0x014B, 0x0151, 0x015B, 0x015D, 0x0161, 0x0167, - 0x016F, 0x0175, 0x017B, 0x017F, 0x0185, 0x018D, 0x0191, 0x0199, - 0x01A3, 0x01A5, 0x01AF, 0x01B1, 0x01B7, 0x01BB, 0x01C1, 0x01C9, - 0x01CD, 0x01CF, 0x01D3, 0x01DF, 0x01E7, 0x01EB, 0x01F3, 0x01F7, - 0x01FD, 0x0209, 0x020B, 0x021D, 0x0223, 0x022D, 0x0233, 0x0239, - 0x023B, 0x0241, 0x024B, 0x0251, 0x0257, 0x0259, 0x025F, 0x0265, - 0x0269, 0x026B, 0x0277, 0x0281, 0x0283, 0x0287, 0x028D, 0x0293, - 0x0295, 0x02A1, 0x02A5, 0x02AB, 0x02B3, 0x02BD, 0x02C5, 0x02CF, - - 0x02D7, 0x02DD, 0x02E3, 0x02E7, 0x02EF, 0x02F5, 0x02F9, 0x0301, - 0x0305, 0x0313, 0x031D, 0x0329, 0x032B, 0x0335, 0x0337, 0x033B, - 0x033D, 0x0347, 0x0355, 0x0359, 0x035B, 0x035F, 0x036D, 0x0371, - 0x0373, 0x0377, 0x038B, 0x038F, 0x0397, 0x03A1, 0x03A9, 0x03AD, - 0x03B3, 0x03B9, 0x03C7, 0x03CB, 0x03D1, 0x03D7, 0x03DF, 0x03E5, - 0x03F1, 0x03F5, 0x03FB, 0x03FD, 0x0407, 0x0409, 0x040F, 0x0419, - 0x041B, 0x0425, 0x0427, 0x042D, 0x043F, 0x0443, 0x0445, 0x0449, - 0x044F, 0x0455, 0x045D, 0x0463, 0x0469, 0x047F, 0x0481, 0x048B, - - 0x0493, 0x049D, 0x04A3, 0x04A9, 0x04B1, 0x04BD, 0x04C1, 0x04C7, - 0x04CD, 0x04CF, 0x04D5, 0x04E1, 0x04EB, 0x04FD, 0x04FF, 0x0503, - 0x0509, 0x050B, 0x0511, 0x0515, 0x0517, 0x051B, 0x0527, 0x0529, - 0x052F, 0x0551, 0x0557, 0x055D, 0x0565, 0x0577, 0x0581, 0x058F, - 0x0593, 0x0595, 0x0599, 0x059F, 0x05A7, 0x05AB, 0x05AD, 0x05B3, - 0x05BF, 0x05C9, 0x05CB, 0x05CF, 0x05D1, 0x05D5, 0x05DB, 0x05E7, - 0x05F3, 0x05FB, 0x0607, 0x060D, 0x0611, 0x0617, 0x061F, 0x0623, - 0x062B, 0x062F, 0x063D, 0x0641, 0x0647, 0x0649, 0x064D, 0x0653 -}; - /* reverse an array, used for radix code */ void bn_reverse (unsigned char *s, int len) [View Less]

1 0

Andrew Talbot : msi: Remove tentative declaration of static array with no size specifier.
by Alexandre Julliard 04 Apr '08

04 Apr '08

Module: wine Branch: master Commit: 9e85ec3bad2df40e05dd3b738cd9e7b084003692 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e85ec3bad2df40e05dd3b738… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Apr 3 14:50:28 2008 +0100 msi: Remove tentative declaration of static array with no size specifier. --- dlls/msi/action.c | 103 ++++++++++++++++++++++++++--------------------------- 1 files changed, 51 insertions(+), 52 deletions(-) diff --git a/dlls/msi/… [View More]action.c b/dlls/msi/action.c index ef0e136..e7edabe 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -47,6 +47,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msi); static UINT ACTION_ProcessExecSequence(MSIPACKAGE *package, BOOL UIran); static UINT ACTION_ProcessUISequence(MSIPACKAGE *package); static UINT ACTION_PerformActionSequence(MSIPACKAGE *package, UINT seq, BOOL UI); +static BOOL ACTION_HandleStandardAction(MSIPACKAGE *package, LPCWSTR action, UINT* rc, BOOL force); /* * consts and values used @@ -233,8 +234,6 @@ struct _actions { STANDARDACTIONHANDLER handler; }; -static const struct _actions StandardActions[]; - /******************************************************** * helper functions @@ -965,56 +964,6 @@ static UINT ACTION_ProcessUISequence(MSIPACKAGE *package) /******************************************************** * ACTION helper functions and functions that perform the actions *******************************************************/ -static BOOL ACTION_HandleStandardAction(MSIPACKAGE *package, LPCWSTR action, - UINT* rc, BOOL force ) -{ - BOOL ret = FALSE; - BOOL run = force; - int i; - - if (!run && !package->script->CurrentlyScripting) - run = TRUE; - - if (!run) - { - if (strcmpW(action,szInstallFinalize) == 0 || - strcmpW(action,szInstallExecute) == 0 || - strcmpW(action,szInstallExecuteAgain) == 0) - run = TRUE; - } - - i = 0; - while (StandardActions[i].action != NULL) - { - if (strcmpW(StandardActions[i].action, action)==0) - { - if (!run) - { - ui_actioninfo(package, action, TRUE, 0); - *rc = schedule_action(package,INSTALL_SCRIPT,action); - ui_actioninfo(package, action, FALSE, *rc); - } - else - { - ui_actionstart(package, action); - if (StandardActions[i].handler) - { - *rc = StandardActions[i].handler(package); - } - else - { - FIXME("unhandled standard action %s\n",debugstr_w(action)); - *rc = ERROR_SUCCESS; - } - } - ret = TRUE; - break; - } - i++; - } - return ret; -} - static BOOL ACTION_HandleCustomAction( MSIPACKAGE* package, LPCWSTR action, UINT* rc, UINT script, BOOL force ) { @@ -5852,3 +5801,53 @@ static const struct _actions StandardActions[] = { { szWriteRegistryValues, ACTION_WriteRegistryValues }, { NULL, NULL }, }; + +static BOOL ACTION_HandleStandardAction(MSIPACKAGE *package, LPCWSTR action, + UINT* rc, BOOL force ) +{ + BOOL ret = FALSE; + BOOL run = force; + int i; + + if (!run && !package->script->CurrentlyScripting) + run = TRUE; + + if (!run) + { + if (strcmpW(action,szInstallFinalize) == 0 || + strcmpW(action,szInstallExecute) == 0 || + strcmpW(action,szInstallExecuteAgain) == 0) + run = TRUE; + } + + i = 0; + while (StandardActions[i].action != NULL) + { + if (strcmpW(StandardActions[i].action, action)==0) + { + if (!run) + { + ui_actioninfo(package, action, TRUE, 0); + *rc = schedule_action(package,INSTALL_SCRIPT,action); + ui_actioninfo(package, action, FALSE, *rc); + } + else + { + ui_actionstart(package, action); + if (StandardActions[i].handler) + { + *rc = StandardActions[i].handler(package); + } + else + { + FIXME("unhandled standard action %s\n",debugstr_w(action)); + *rc = ERROR_SUCCESS; + } + } + ret = TRUE; + break; + } + i++; + } + return ret; +} [View Less]

1 0

Dmitry Timoshkov : gdi32: Add a font scaling test when lfHeight == 0 and lfWidth != 0, make it pass under Wine.
by Alexandre Julliard 04 Apr '08

04 Apr '08

Module: wine Branch: master Commit: 90265ac5863f30bee34db60bffc408d470af16ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=90265ac5863f30bee34db60bf… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Apr 3 21:55:49 2008 +0900 gdi32: Add a font scaling test when lfHeight == 0 and lfWidth != 0, make it pass under Wine. --- dlls/gdi32/freetype.c | 3 +-- dlls/gdi32/tests/font.c | 34 +++++++++++++++++++++++++--------- 2 files changed, 26 insertions(+), … [View More]11 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 6356c1f..0284a00 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3378,14 +3378,13 @@ found: TRACE("Chosen: %s %s (%s/%p:%ld)\n", debugstr_w(family->FamilyName), debugstr_w(face->StyleName), face->file, face->font_data_ptr, face->face_index); - ret->aveWidth = abs(lf.lfWidth); + ret->aveWidth = height ? abs(lf.lfWidth) : 0; if(!face->scalable) { /* Windows uses integer scaling factors for bitmap fonts */ INT scale, scaled_height; if (height != 0) height = diff; - else height = 0; height += face->size.height; scale = (height + face->size.height - 1) / face->size.height; diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index d85ab12..a91adcb 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -158,7 +158,8 @@ static INT CALLBACK font_enum_proc(const LOGFONT *elf, const TEXTMETRIC *ntm, DW return 1; /* continue enumeration */ } -static void test_font_metrics(HDC hdc, HFONT hfont, LONG lfHeight, const char *test_str, +static void test_font_metrics(HDC hdc, HFONT hfont, LONG lfHeight, + LONG lfWidth, const char *test_str, INT test_str_len, const TEXTMETRICA *tm_orig, const SIZE *size_orig, INT width_of_A_orig, INT scale_x, INT scale_y) @@ -188,9 +189,14 @@ static void test_font_metrics(HDC hdc, HFONT hfont, LONG lfHeight, const char *t ok(tm.tmAveCharWidth == tm_orig->tmAveCharWidth * scale_x, "%d != %d\n", tm.tmAveCharWidth, tm_orig->tmAveCharWidth * scale_x); ok(tm.tmMaxCharWidth == tm_orig->tmMaxCharWidth * scale_x, "%d != %d\n", tm.tmAveCharWidth, tm_orig->tmMaxCharWidth * scale_x); - ok(lf.lfHeight == lfHeight, "lf %d != %d\n", lf.lfHeight, lfHeight); - if (lf.lfWidth) - ok(lf.lfWidth == tm.tmAveCharWidth, "lf %d != tm %d\n", lf.lfWidth, tm.tmAveCharWidth); + ok(lf.lfHeight == lfHeight, "lf %d != %d\n", lf.lfHeight, lfHeight); + if (lf.lfHeight) + { + if (lf.lfWidth) + ok(lf.lfWidth == tm.tmAveCharWidth, "lf %d != tm %d\n", lf.lfWidth, tm.tmAveCharWidth); + } + else + ok(lf.lfWidth == lfWidth, "lf %d != %d\n", lf.lfWidth, lfWidth); GetTextExtentPoint32A(hdc, test_str, test_str_len, &size); @@ -213,7 +219,7 @@ static void test_bitmap_font(void) HFONT hfont, old_hfont; TEXTMETRICA tm_orig; SIZE size_orig; - INT ret, i, width_orig, height_orig, scale; + INT ret, i, width_orig, height_orig, scale, lfWidth; hdc = GetDC(0); @@ -229,8 +235,9 @@ static void test_bitmap_font(void) trace("found bitmap font %s, height %d\n", bitmap_lf.lfFaceName, bitmap_lf.lfHeight); height_orig = bitmap_lf.lfHeight; - hfont = create_font("bitmap", &bitmap_lf); + lfWidth = bitmap_lf.lfWidth; + hfont = create_font("bitmap", &bitmap_lf); old_hfont = SelectObject(hdc, hfont); ok(GetTextMetricsA(hdc, &tm_orig), "GetTextMetricsA failed\n"); ok(GetTextExtentPoint32A(hdc, test_str, sizeof(test_str), &size_orig), "GetTextExtentPoint32A failed\n"); @@ -238,6 +245,15 @@ static void test_bitmap_font(void) SelectObject(hdc, old_hfont); DeleteObject(hfont); + bitmap_lf.lfHeight = 0; + bitmap_lf.lfWidth = 4; + hfont = create_font("bitmap", &bitmap_lf); + test_font_metrics(hdc, hfont, 0, 4, test_str, sizeof(test_str), &tm_orig, &size_orig, width_orig, 1, 1); + DeleteObject(hfont); + + bitmap_lf.lfHeight = height_orig; + bitmap_lf.lfWidth = lfWidth; + /* test fractional scaling */ for (i = 1; i <= height_orig * 3; i++) { @@ -249,7 +265,7 @@ static void test_bitmap_font(void) nearest_height = scale * height_orig; /* XP allows not more than 10% deviation */ if (scale > 1 && nearest_height - i > nearest_height / 10) scale--; - test_font_metrics(hdc, hfont, bitmap_lf.lfHeight, test_str, sizeof(test_str), &tm_orig, &size_orig, width_orig, 1, scale); + test_font_metrics(hdc, hfont, bitmap_lf.lfHeight, 0, test_str, sizeof(test_str), &tm_orig, &size_orig, width_orig, 1, scale); DeleteObject(hfont); } @@ -257,14 +273,14 @@ static void test_bitmap_font(void) bitmap_lf.lfHeight = height_orig * 2; bitmap_lf.lfWidth *= 3; hfont = create_font("3x2", &bitmap_lf); - test_font_metrics(hdc, hfont, bitmap_lf.lfHeight, test_str, sizeof(test_str), &tm_orig, &size_orig, width_orig, 3, 2); + test_font_metrics(hdc, hfont, bitmap_lf.lfHeight, 0, test_str, sizeof(test_str), &tm_orig, &size_orig, width_orig, 3, 2); DeleteObject(hfont); /* test integer scaling 3x3 */ bitmap_lf.lfHeight = height_orig * 3; bitmap_lf.lfWidth = 0; hfont = create_font("3x3", &bitmap_lf); - test_font_metrics(hdc, hfont, bitmap_lf.lfHeight, test_str, sizeof(test_str), &tm_orig, &size_orig, width_orig, 3, 3); + test_font_metrics(hdc, hfont, bitmap_lf.lfHeight, 0, test_str, sizeof(test_str), &tm_orig, &size_orig, width_orig, 3, 3); DeleteObject(hfont); ReleaseDC(0, hdc); [View Less]

1 0

Paul Vriens : rsabase: Remove rsabase tests as they are covered in rsaenh.
by Alexandre Julliard 04 Apr '08

04 Apr '08

Module: wine Branch: master Commit: 4f3dbb7f7d6b7da9bcdb92189fae5fbe4abfb261 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f3dbb7f7d6b7da9bcdb92189… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Apr 4 08:12:13 2008 +0200 rsabase: Remove rsabase tests as they are covered in rsaenh. --- .gitignore | 4 -- Makefile.in | 2 - configure | 3 - configure.ac | 1 - dlls/… [View More]Makefile.in | 1 - dlls/rsabase/tests/Makefile.in | 13 ------ dlls/rsabase/tests/rsabase.c | 84 ---------------------------------------- programs/winetest/Makefile.in | 3 - programs/winetest/winetest.rc | 1 - 9 files changed, 0 insertions(+), 112 deletions(-) diff --git a/.gitignore b/.gitignore index 7837b5b..dc40bde 100644 --- a/.gitignore +++ b/.gitignore @@ -350,9 +350,6 @@ dlls/rpcrt4/tests/server.h dlls/rpcrt4/tests/server_c.c dlls/rpcrt4/tests/server_s.c dlls/rpcrt4/tests/testlist.c -dlls/rsabase/tests/*.ok -dlls/rsabase/tests/rsabase_crosstest.exe -dlls/rsabase/tests/testlist.c dlls/rsaenh/librsaenh.def dlls/rsaenh/tests/*.ok dlls/rsaenh/tests/rsaenh_crosstest.exe @@ -673,7 +670,6 @@ programs/winetest/quartz_test.exe programs/winetest/riched20_test.exe programs/winetest/riched32_test.exe programs/winetest/rpcrt4_test.exe -programs/winetest/rsabase_test.exe programs/winetest/rsaenh_test.exe programs/winetest/schannel_test.exe programs/winetest/secur32_test.exe diff --git a/Makefile.in b/Makefile.in index b8962a9..cc9211d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -412,7 +412,6 @@ ALL_MAKEFILES = \ dlls/rpcrt4/Makefile \ dlls/rpcrt4/tests/Makefile \ dlls/rsabase/Makefile \ - dlls/rsabase/tests/Makefile \ dlls/rsaenh/Makefile \ dlls/rsaenh/tests/Makefile \ dlls/sane.ds/Makefile \ @@ -837,7 +836,6 @@ dlls/riched32/tests/Makefile: dlls/riched32/tests/Makefile.in dlls/Maketest.rule dlls/rpcrt4/Makefile: dlls/rpcrt4/Makefile.in dlls/Makedll.rules dlls/rpcrt4/tests/Makefile: dlls/rpcrt4/tests/Makefile.in dlls/Maketest.rules dlls/rsabase/Makefile: dlls/rsabase/Makefile.in dlls/Makedll.rules -dlls/rsabase/tests/Makefile: dlls/rsabase/tests/Makefile.in dlls/Maketest.rules dlls/rsaenh/Makefile: dlls/rsaenh/Makefile.in dlls/Makedll.rules dlls/rsaenh/tests/Makefile: dlls/rsaenh/tests/Makefile.in dlls/Maketest.rules dlls/sane.ds/Makefile: dlls/sane.ds/Makefile.in dlls/Makedll.rules diff --git a/configure b/configure index 86b9bf0..a0f73f8 100755 --- a/configure +++ b/configure @@ -21772,8 +21772,6 @@ ac_config_files="$ac_config_files dlls/rpcrt4/tests/Makefile" ac_config_files="$ac_config_files dlls/rsabase/Makefile" -ac_config_files="$ac_config_files dlls/rsabase/tests/Makefile" - ac_config_files="$ac_config_files dlls/rsaenh/Makefile" ac_config_files="$ac_config_files dlls/rsaenh/tests/Makefile" @@ -22912,7 +22910,6 @@ do "dlls/rpcrt4/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/rpcrt4/Makefile" ;; "dlls/rpcrt4/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/rpcrt4/tests/Makefile" ;; "dlls/rsabase/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/rsabase/Makefile" ;; - "dlls/rsabase/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/rsabase/tests/Makefile" ;; "dlls/rsaenh/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/rsaenh/Makefile" ;; "dlls/rsaenh/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/rsaenh/tests/Makefile" ;; "dlls/sane.ds/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/sane.ds/Makefile" ;; diff --git a/configure.ac b/configure.ac index 0cab238..3e14bdc 100644 --- a/configure.ac +++ b/configure.ac @@ -1915,7 +1915,6 @@ AC_CONFIG_FILES([dlls/riched32/tests/Makefile]) AC_CONFIG_FILES([dlls/rpcrt4/Makefile]) AC_CONFIG_FILES([dlls/rpcrt4/tests/Makefile]) AC_CONFIG_FILES([dlls/rsabase/Makefile]) -AC_CONFIG_FILES([dlls/rsabase/tests/Makefile]) AC_CONFIG_FILES([dlls/rsaenh/Makefile]) AC_CONFIG_FILES([dlls/rsaenh/tests/Makefile]) AC_CONFIG_FILES([dlls/sane.ds/Makefile]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index bb473e2..6f171d7 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -342,7 +342,6 @@ TESTSUBDIRS = \ riched20/tests \ riched32/tests \ rpcrt4/tests \ - rsabase/tests \ rsaenh/tests \ schannel/tests \ secur32/tests \ diff --git a/dlls/rsabase/tests/Makefile.in b/dlls/rsabase/tests/Makefile.in deleted file mode 100644 index bd5c77d..0000000 --- a/dlls/rsabase/tests/Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ -TOPSRCDIR = @top_srcdir@ -TOPOBJDIR = ../../.. -SRCDIR = @srcdir@ -VPATH = @srcdir@ -TESTDLL = rsabase.dll -IMPORTS = advapi32 kernel32 - -CTESTS = \ - rsabase.c - -@MAKE_TEST_RULES@ - -@DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/rsabase/tests/rsabase.c b/dlls/rsabase/tests/rsabase.c deleted file mode 100644 index b7746b1..0000000 --- a/dlls/rsabase/tests/rsabase.c +++ /dev/null @@ -1,84 +0,0 @@ -/* - * Unit tests for rsabase functions - * - * Copyright (c) 2004 Michael Jung - * - * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include <string.h> -#include "wine/test.h" -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "wincrypt.h" - -HCRYPTPROV hProv; -static const char szContainer[] = "Wine Test Container"; -static const char szProvider[] = MS_DEF_PROV_A; - -static int init_environment(void) -{ - hProv = (HCRYPTPROV)INVALID_HANDLE_VALUE; - - if (!CryptAcquireContext(&hProv, szContainer, szProvider, PROV_RSA_FULL, 0)) - { - if (GetLastError()==NTE_BAD_KEYSET) - { - if(!CryptAcquireContext(&hProv, szContainer, szProvider, PROV_RSA_FULL, CRYPT_NEWKEYSET)) - { - trace("%08x\n", GetLastError()); - return 0; - } - } - else - { - trace("%08x\n", GetLastError()); - return 0; - } - } - - return 1; -} - -static void clean_up_environment(void) -{ - CryptAcquireContext(&hProv, szContainer, szProvider, PROV_RSA_FULL, CRYPT_DELETEKEYSET); -} - -static void test_gen_random(void) -{ - BOOL result; - BYTE rnd1[16], rnd2[16]; - - memset(rnd1, 0, sizeof(rnd1)); - memset(rnd2, 0, sizeof(rnd2)); - - result = CryptGenRandom(hProv, sizeof(rnd1), rnd1); - ok(result, "%08x\n", GetLastError()); - - result = CryptGenRandom(hProv, sizeof(rnd2), rnd2); - ok(result, "%08x\n", GetLastError()); - - ok(memcmp(rnd1, rnd2, sizeof(rnd1)), "CryptGenRandom generates non random data\n"); -} - -START_TEST(rsabase) -{ - if (!init_environment()) - return; - test_gen_random(); - clean_up_environment(); -} diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in index 7ccce18..5a188b6 100644 --- a/programs/winetest/Makefile.in +++ b/programs/winetest/Makefile.in @@ -83,7 +83,6 @@ TESTBINS = \ riched20_test.exe \ riched32_test.exe \ rpcrt4_test.exe \ - rsabase_test.exe \ rsaenh_test.exe \ schannel_test.exe \ secur32_test.exe \ @@ -223,8 +222,6 @@ riched32_test.exe: $(DLLDIR)/riched32/tests/riched32_test.exe$(DLLEXT) cp $(DLLDIR)/riched32/tests/riched32_test.exe$(DLLEXT) $@ && $(STRIP) $@ rpcrt4_test.exe: $(DLLDIR)/rpcrt4/tests/rpcrt4_test.exe$(DLLEXT) cp $(DLLDIR)/rpcrt4/tests/rpcrt4_test.exe$(DLLEXT) $@ && $(STRIP) $@ -rsabase_test.exe: $(DLLDIR)/rsabase/tests/rsabase_test.exe$(DLLEXT) - cp $(DLLDIR)/rsabase/tests/rsabase_test.exe$(DLLEXT) $@ && $(STRIP) $@ rsaenh_test.exe: $(DLLDIR)/rsaenh/tests/rsaenh_test.exe$(DLLEXT) cp $(DLLDIR)/rsaenh/tests/rsaenh_test.exe$(DLLEXT) $@ && $(STRIP) $@ schannel_test.exe: $(DLLDIR)/schannel/tests/schannel_test.exe$(DLLEXT) diff --git a/programs/winetest/winetest.rc b/programs/winetest/winetest.rc index 8c36d63..299e0e3 100644 --- a/programs/winetest/winetest.rc +++ b/programs/winetest/winetest.rc @@ -144,7 +144,6 @@ quartz_test.exe TESTRES "quartz_test.exe" riched20_test.exe TESTRES "riched20_test.exe" riched32_test.exe TESTRES "riched32_test.exe" rpcrt4_test.exe TESTRES "rpcrt4_test.exe" -rsabase_test.exe TESTRES "rsabase_test.exe" rsaenh_test.exe TESTRES "rsaenh_test.exe" schannel_test.exe TESTRES "schannel_test.exe" secur32_test.exe TESTRES "secur32_test.exe" [View Less]

1 0

Paul Vriens : rsaenh/tests: Add a few skips for non implemented parameters.
by Alexandre Julliard 04 Apr '08

04 Apr '08

Module: wine Branch: master Commit: 9666218ca8fc5a56857b40f26bb05bb458f32869 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9666218ca8fc5a56857b40f26… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu Apr 3 13:09:11 2008 +0200 rsaenh/tests: Add a few skips for non implemented parameters. --- dlls/rsaenh/tests/rsaenh.c | 30 +++++++++++++++++++++++------- 1 files changed, 23 insertions(+), 7 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/… [View More]tests/rsaenh.c index 1a8bb92..4fef6e9 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -175,12 +175,20 @@ static void test_prov(void) DWORD dwLen, dwInc; dwLen = (DWORD)sizeof(DWORD); + SetLastError(0xdeadbeef); result = CryptGetProvParam(hProv, PP_SIG_KEYSIZE_INC, (BYTE*)&dwInc, &dwLen, 0); - ok(result && dwInc==8, "%08x, %d\n", GetLastError(), dwInc); + if (!result && GetLastError() == NTE_BAD_TYPE) + skip("PP_SIG_KEYSIZE_INC is not supported (win9x or NT)\n"); + else + ok(result && dwInc==8, "%08x, %d\n", GetLastError(), dwInc); dwLen = (DWORD)sizeof(DWORD); + SetLastError(0xdeadbeef); result = CryptGetProvParam(hProv, PP_KEYX_KEYSIZE_INC, (BYTE*)&dwInc, &dwLen, 0); - ok(result && dwInc==8, "%08x, %d\n", GetLastError(), dwInc); + if (!result && GetLastError() == NTE_BAD_TYPE) + skip("PP_KEYX_KEYSIZE_INC is not supported (win9x or NT)\n"); + else + ok(result && dwInc==8, "%08x, %d\n", GetLastError(), dwInc); } static void test_gen_random(void) @@ -1823,9 +1831,13 @@ static void test_null_provider(void) ok(result && dataLen == sizeof(dwParam) && (dwParam & CRYPT_SEC_DESCR), "Expected CRYPT_SEC_DESCR to be set, got 0x%08X\n",dwParam); dataLen = sizeof(keySpec); + SetLastError(0xdeadbeef); result = CryptGetProvParam(prov, PP_KEYSPEC, (LPBYTE)&keySpec, &dataLen, 0); - ok(result && keySpec == (AT_KEYEXCHANGE | AT_SIGNATURE), - "Expected AT_KEYEXCHANGE | AT_SIGNATURE, got %08x\n", keySpec); + if (!result && GetLastError() == NTE_BAD_TYPE) + skip("PP_KEYSPEC is not supported (win9x or NT)\n"); + else + ok(result && keySpec == (AT_KEYEXCHANGE | AT_SIGNATURE), + "Expected AT_KEYEXCHANGE | AT_SIGNATURE, got %08x\n", keySpec); /* PP_CONTAINER parameter */ dataLen = sizeof(szName); result = CryptGetProvParam(prov, PP_CONTAINER, (LPBYTE)szName, &dataLen, 0); @@ -1834,10 +1846,14 @@ static void test_null_provider(void) (result)? "TRUE":"FALSE",GetLastError(),dataLen); /* PP_UNIQUE_CONTAINER parameter */ dataLen = sizeof(szName); + SetLastError(0xdeadbeef); result = CryptGetProvParam(prov, PP_UNIQUE_CONTAINER, (LPBYTE)szName, &dataLen, 0); - ok(result && dataLen == strlen(szContainer)+1 && strcmp(szContainer,szName) == 0, - "failed getting PP_UNIQUE_CONTAINER. result = %s. Error 0x%08X. returned length = %d\n", - (result)? "TRUE":"FALSE",GetLastError(),dataLen); + if (!result && GetLastError() == NTE_BAD_TYPE) + skip("PP_UNIQUE_CONTAINER is not supported (win9x or NT)\n"); + else + ok(result && dataLen == strlen(szContainer)+1 && strcmp(szContainer,szName) == 0, + "failed getting PP_UNIQUE_CONTAINER. result = %s. Error 0x%08X. returned length = %d\n", + (result)? "TRUE":"FALSE",GetLastError(),dataLen); result = CryptGetUserKey(prov, AT_KEYEXCHANGE, &key); ok(!result && GetLastError() == NTE_NO_KEY, "Expected NTE_NO_KEY, got %08x\n", GetLastError()); [View Less]

1 0

Lei Zhang : website: add links to cvs web interface and documentation writing
by Jeremy Newman 03 Apr '08

03 Apr '08

Module: website Branch: master Commit: 109a7800eb6b62214ff4220a5c8c6dae27c76577 URL: http://source.winehq.org/git/website.git/?a=commit;h=109a7800eb6b62214ff422… Author: Lei Zhang <thestig(a)google.com> Date: Thu Apr 3 11:54:54 2008 -0700 website: add links to cvs web interface and documentation writing Hi, This adds a couple more useful links to the cvs page. >From be495374b484f2081d337ba4e8baee8f46a0a169 Mon Sep 17 00:00:00 2001 From: Lei Zhang <thestig(a)google.com> … [View More]

1 0

Stefan Dösinger : wined3d: Deactivate GL_FRAGMENT_SHADER_ATI before deactivating a context.
by Alexandre Julliard 03 Apr '08

03 Apr '08

Module: wine Branch: master Commit: ddf52dda15e83eae639ef2ce0ec4071b321ce34f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddf52dda15e83eae639ef2ce0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Mar 30 14:52:18 2008 +0200 wined3d: Deactivate GL_FRAGMENT_SHADER_ATI before deactivating a context. Mesa has a bug that causes a crash due to a NULL pointer dereference with the R200 driver when making a context current that has GL_FRAGMENT_SHADER_ATI enabled. … [View More]This patch works around this bug by making sure that GL_FRAGMENT_SHADER_ATI is disabled before deactivating a context, and reactivates it afterwards. The context manager keeps GL_ATI_FRAGMENT_SHADER generally enabled, except if the context is in 2D blit mode. --- dlls/wined3d/context.c | 29 ++++++++++++++++++++++++++--- 1 files changed, 26 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 0934180..d20f5f2 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -351,6 +351,11 @@ WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *tar /* Set up the context defaults */ oldCtx = pwglGetCurrentContext(); oldDrawable = pwglGetCurrentDC(); + if(oldCtx && oldDrawable && GL_SUPPORT(ATI_FRAGMENT_SHADER)) { + /* See comment in ActivateContext context switching */ + glDisable(GL_FRAGMENT_SHADER_ATI); + checkGLcall("glEnable(GL_FRAGMENT_SHADER_ATI)"); + } if(pwglMakeCurrent(hdc, ctx) == FALSE) { ERR("Cannot activate context to set up defaults\n"); goto out; @@ -414,9 +419,6 @@ WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *tar glTexEnvi(GL_TEXTURE_SHADER_NV, GL_PREVIOUS_TEXTURE_INPUT_NV, GL_TEXTURE0_ARB + s - 1); checkGLcall("glTexEnvi(GL_TEXTURE_SHADER_NV, GL_PREVIOUS_TEXTURE_INPUT_NV, ...\n"); } - } else if(GL_SUPPORT(ATI_FRAGMENT_SHADER)) { - glEnable(GL_FRAGMENT_SHADER_ATI); - checkGLcall("glEnable(GL_FRAGMENT_SHADER_ATI)"); } if(GL_SUPPORT(ARB_POINT_SPRITE)) { @@ -428,9 +430,16 @@ WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *tar } LEAVE_GL(); + /* Never keep GL_FRAGMENT_SHADER_ATI enabled on a context that we switch away from, + * but enable it for the first context we create, and reenable it on the old context + */ if(oldDrawable && oldCtx) { pwglMakeCurrent(oldDrawable, oldCtx); } + if(GL_SUPPORT(ATI_FRAGMENT_SHADER)) { + glEnable(GL_FRAGMENT_SHADER_ATI); + checkGLcall("glEnable(GL_FRAGMENT_SHADER_ATI)"); + } out: return ret; @@ -928,9 +937,23 @@ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextU } else { TRACE("Switching gl ctx to %p, hdc=%p ctx=%p\n", context, context->hdc, context->glCtx); + + if(GL_SUPPORT(ATI_FRAGMENT_SHADER)) { + /* Mesa crashes when enabling a context with GL_FRAGMENT_SHADER_ATI enabled. + * Thus we disable it before deactivating any context, and re-enable it afterwards. + * + * This bug is filed as bug #15269 on bugs.freedesktop.org + */ + glDisable(GL_FRAGMENT_SHADER_ATI); + checkGLcall("glEnable(GL_FRAGMENT_SHADER_ATI)"); + } + ret = pwglMakeCurrent(context->hdc, context->glCtx); if(ret == FALSE) { ERR("Failed to activate the new context\n"); + } else if(GL_SUPPORT(ATI_FRAGMENT_SHADER) && !context->last_was_blit) { + glEnable(GL_FRAGMENT_SHADER_ATI); + checkGLcall("glEnable(GL_FRAGMENT_SHADER_ATI)"); } } if(This->activeContext->vshader_const_dirty) { [View Less]

1 0

Stefan Dösinger : d3d9: Improve an ok line.
by Alexandre Julliard 03 Apr '08

03 Apr '08

Module: wine Branch: master Commit: de5a8db58b51be2f65baf3b9b67d79bc9c49a17e URL: http://source.winehq.org/git/wine.git/?a=commit;h=de5a8db58b51be2f65baf3b9b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Mar 29 23:06:38 2008 +0100 d3d9: Improve an ok line. --- dlls/d3d9/tests/visual.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index a22b168..d4e840a 100644 --- a/dlls/d3d9/tests/… [View More]

1 0

Stefan Dösinger : wined3d: Initialize some ARB shader output parameters.
by Alexandre Julliard 03 Apr '08

03 Apr '08

Module: wine Branch: master Commit: 20e63160df1be7f43af17c251247c8412d741b1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=20e63160df1be7f43af17c251… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Apr 3 11:41:02 2008 +0200 wined3d: Initialize some ARB shader output parameters. --- dlls/wined3d/arb_program_shader.c | 27 +++++++++++++++++++++------ 1 files changed, 21 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/… [View More]wined3d/arb_program_shader.c index 7a841cd..a8d2c70 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1987,12 +1987,27 @@ static void shader_arb_generate_vshader(IWineD3DVertexShader *iface, SHADER_BUFF /* We need a constant to fixup the final position */ shader_addline(buffer, "PARAM posFixup = program.env[%d];\n", ARB_SHADER_PRIVCONST_POS); - if((GLINFO_LOCATION).set_texcoord_w) { - int i; - for(i = 0; i < min(8, MAX_REG_TEXCRD); i++) { - if(This->baseShader.reg_maps.texcoord_mask[i] != 0 && - This->baseShader.reg_maps.texcoord_mask[i] != WINED3DSP_WRITEMASK_ALL) { - shader_addline(buffer, "MOV result.texcoord[%u].w, -helper_const.y;\n", i); + /* Initialize output parameters. GL_ARB_vertex_program does not require special initialization values + * for output parameters. D3D in theory does not do that either, but some applications depend on a + * proper initialization of the secondary color, and programs using the fixed function pipeline without + * a replacement shader depend on the texcoord.w beeing set properly. + * + * GL_NV_vertex_program defines that all output values are initialized to {0.0, 0.0, 0.0, 1.0}. This + * assetion is in effect even when using GL_ARB_vertex_program without any NV specific additions. So + * skip this if NV_vertex_program is supported. Otherwise, initialize the secondary color. For the tex- + * coords, we have a flag in the opengl caps. Many cards do not require the texcoord beeing set, and + * this can eat a number of instructions, so skip it unless this cap is set as well + */ + if(!GL_SUPPORT(NV_VERTEX_PROGRAM)) { + shader_addline(buffer, "MOV result.color.secondary, -helper_const.wwwy;\n"); + + if((GLINFO_LOCATION).set_texcoord_w) { + int i; + for(i = 0; i < min(8, MAX_REG_TEXCRD); i++) { + if(This->baseShader.reg_maps.texcoord_mask[i] != 0 && + This->baseShader.reg_maps.texcoord_mask[i] != WINED3DSP_WRITEMASK_ALL) { + shader_addline(buffer, "MOV result.texcoord[%u].w, -helper_const.y;\n", i); + } } } } [View Less]

1 0

Maarten Lankhorst : user32: Implement BroadcastSystemMessage.
by Alexandre Julliard 03 Apr '08

03 Apr '08

Module: wine Branch: master Commit: 70a6495a31cc01d6ea4284d4a6dadf037d9b60df URL: http://source.winehq.org/git/wine.git/?a=commit;h=70a6495a31cc01d6ea4284d4a… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Apr 1 12:15:55 2008 -0700 user32: Implement BroadcastSystemMessage. --- dlls/user32/message.c | 174 ++++++++++++++++++--- dlls/user32/tests/Makefile.in | 1 + dlls/user32/tests/broadcast.c | 348 ++++++++++++++++++++++++++++++++++++++++ dlls/… [View More]

1 0

Jason Edmeades : comctl32: Add basic custom draw support for tooltips.
by Alexandre Julliard 03 Apr '08

03 Apr '08

Module: wine Branch: master Commit: f54570fdbd2b3d06586bd3824f5473c66b70fd00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f54570fdbd2b3d06586bd3824… Author: Jason Edmeades <jason.edmeades(a)googlemail.com> Date: Thu Apr 3 00:25:38 2008 +0100 comctl32: Add basic custom draw support for tooltips. --- dlls/comctl32/tests/tooltips.c | 173 ++++++++++++++++++++++++++++++++++++++++ dlls/comctl32/tooltips.c | 59 +++++++++++++- 2 files changed, 229 insertions(+), 3 … [View More]

1 0

Austin English : ddraw: Spelling fixes.
by Alexandre Julliard 03 Apr '08

03 Apr '08

Module: wine Branch: master Commit: 825baa23a2d77476b06299f853685216ef651ea0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=825baa23a2d77476b06299f85… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Apr 2 14:26:42 2008 -0500 ddraw: Spelling fixes. --- dlls/ddraw/ddraw.c | 8 ++++---- dlls/ddraw/device.c | 4 ++-- dlls/ddraw/direct3d.c | 4 ++-- dlls/ddraw/light.c | 2 +- dlls/ddraw/main.c | 6 +++--- … [View More]

1 0

Alexander Dorofeyev : wined3d: Improve detection of device palette change.
by Alexandre Julliard 03 Apr '08

03 Apr '08

Module: wine Branch: master Commit: d6ba069d9e07590d2086dcd9489812b2cd598ef0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6ba069d9e07590d2086dcd94… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Thu Apr 3 00:12:16 2008 +0300 wined3d: Improve detection of device palette change. --- dlls/d3d8/tests/visual.c | 56 ++++++++++++++++++---------------------- dlls/wined3d/cubetexture.c | 13 +++++++++ dlls/wined3d/device.c | 18 ++++++++++++- … [View More]

1 0

Alexander Dorofeyev : wined3d: Support index in alpha in BltOverride colorfill codepath.
by Alexandre Julliard 03 Apr '08

03 Apr '08

Module: wine Branch: master Commit: 1c89795438894c3ee00606929fb7d091dfbaff59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c89795438894c3ee00606929… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Thu Apr 3 00:12:13 2008 +0300 wined3d: Support index in alpha in BltOverride colorfill codepath. Fixes a failure in ddraw p8_primary_test when running with opengl ddraw renderer. --- dlls/wined3d/surface.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 … [View More]

1 0

Alexander Dorofeyev : ddraw/tests: Additional colorfill test in p8_primary_test.
by Alexandre Julliard 03 Apr '08

03 Apr '08

Module: wine Branch: master Commit: 003f679cbe105e95b30c40c6b88df02e3722876e URL: http://source.winehq.org/git/wine.git/?a=commit;h=003f679cbe105e95b30c40c6b… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Thu Apr 3 00:12:11 2008 +0300 ddraw/tests: Additional colorfill test in p8_primary_test. --- dlls/ddraw/tests/visual.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index … [View More]

1 0

Alexander Dorofeyev : wined3d: Remove ENTER_GL/ LEAVE_GL in IWineD3DCubeTextureImpl_PreLoad.
by Alexandre Julliard 03 Apr '08

03 Apr '08

Module: wine Branch: master Commit: 8ec63a9cf78b73a0c733fc824b0c396ccb16cb31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ec63a9cf78b73a0c733fc824… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Thu Apr 3 00:12:08 2008 +0300 wined3d: Remove ENTER_GL/LEAVE_GL in IWineD3DCubeTextureImpl_PreLoad. --- dlls/wined3d/cubetexture.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index … [View More]

1 0

Alexander Dorofeyev : wined3d: Remove ENTER_GL/ LEAVE_GL in IWineD3DTextureImpl_PreLoad.
by Alexandre Julliard 03 Apr '08

03 Apr '08

Module: wine Branch: master Commit: 9b048221709c31c46f3dbc6ee4b6406c0961a452 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b048221709c31c46f3dbc6ee… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Thu Apr 3 00:12:04 2008 +0300 wined3d: Remove ENTER_GL/LEAVE_GL in IWineD3DTextureImpl_PreLoad. --- dlls/wined3d/texture.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 294dd1d..a6919ef … [View More]

1 0

Alexander Dorofeyev : wined3d: Avoid calling LoadTexture with gl lock held in IWineD3DSurfaceImpl_PreLoad .
by Alexandre Julliard 03 Apr '08

03 Apr '08

Module: wine Branch: master Commit: b54553a2537d4b44b7e6d36caa6c893b1862b9e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b54553a2537d4b44b7e6d36ca… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Thu Apr 3 00:12:00 2008 +0300 wined3d: Avoid calling LoadTexture with gl lock held in IWineD3DSurfaceImpl_PreLoad. Needed to prevent ActivateContext being called while holding gl lock. --- dlls/wined3d/surface.c | 5 ++++- 1 files changed, 4 insertions(+), 1 … [View More]

1 0

Alexander Dorofeyev : wined3d: Add ENTER_GL/ LEAVE_GL in IWineD3DSurfaceImpl_Release.
by Alexandre Julliard 03 Apr '08

03 Apr '08

Module: wine Branch: master Commit: 1e6f02ed2b56944c5f74ccc9eb4ba90417ecbdc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e6f02ed2b56944c5f74ccc9e… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Thu Apr 3 00:11:57 2008 +0300 wined3d: Add ENTER_GL/LEAVE_GL in IWineD3DSurfaceImpl_Release. --- dlls/wined3d/surface.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index d164c2f..28ffdcb … [View More]

1 0

Alexander Dorofeyev : wined3d: Add ENTER_GL/ LEAVE_GL in surface_allocate_surface.
by Alexandre Julliard 03 Apr '08

03 Apr '08

Module: wine Branch: master Commit: 088c34ec1c465728b5cb2d07bb1d69958bbc5279 URL: http://source.winehq.org/git/wine.git/?a=commit;h=088c34ec1c465728b5cb2d07b… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Thu Apr 3 00:11:54 2008 +0300 wined3d: Add ENTER_GL/LEAVE_GL in surface_allocate_surface. --- dlls/wined3d/surface.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index e233ce2..d164c2f 100644 -… [View More]

1 0

Alexander Dorofeyev : wined3d: Add ENTER_GL/ LEAVE_GL in surface_bind_and_dirtify.
by Alexandre Julliard 03 Apr '08

03 Apr '08

Module: wine Branch: master Commit: d5b400307bd02ff70adaf51caa4d8def7e89db0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5b400307bd02ff70adaf51ca… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Thu Apr 3 00:11:50 2008 +0300 wined3d: Add ENTER_GL/LEAVE_GL in surface_bind_and_dirtify. --- dlls/wined3d/surface.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 573ac36..e233ce2 100644 -… [View More]

1 0

Alexander Dorofeyev : ddraw: Set surface to NULL on failure in GetAttachedSurface.
by Alexandre Julliard 03 Apr '08

03 Apr '08

Module: wine Branch: master Commit: 2caa797e76273852f3aa52491261e24a6d1229a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2caa797e76273852f3aa52491… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Thu Apr 3 00:11:43 2008 +0300 ddraw: Set surface to NULL on failure in GetAttachedSurface. --- dlls/ddraw/surface.c | 2 ++ dlls/ddraw/surface_thunks.c | 5 ++--- dlls/ddraw/tests/dsurface.c | 4 ++++ 3 files changed, 8 insertions(+), 3 deletions(-) … [View More]diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index c48e07e..da152de 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -540,6 +540,8 @@ IDirectDrawSurfaceImpl_GetAttachedSurface(IDirectDrawSurface7 *iface, TRACE("(%p) Didn't find a valid surface\n", This); LeaveCriticalSection(&ddraw_cs); + + *Surface = NULL; return DDERR_NOTFOUND; } diff --git a/dlls/ddraw/surface_thunks.c b/dlls/ddraw/surface_thunks.c index ef6d48f..a0786bb 100644 --- a/dlls/ddraw/surface_thunks.c +++ b/dlls/ddraw/surface_thunks.c @@ -228,9 +228,8 @@ IDirectDrawSurface3Impl_GetAttachedSurface(LPDIRECTDRAWSURFACE3 This, hr = IDirectDrawSurface7_GetAttachedSurface(CONVERT(This), &caps, &pAttached7); - if (FAILED(hr)) return hr; - - *ppAttached = CONVERT_REV(pAttached7); + if (FAILED(hr)) *ppAttached = NULL; + else *ppAttached = CONVERT_REV(pAttached7); return hr; } diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 7ff1fe7..1e35e37 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -1012,6 +1012,7 @@ static void EnumTest(void) ok(rc == DD_OK, "GetAttachedSurface returned %08x\n", rc); rc = IDirectDrawSurface_GetAttachedSurface(ctx.expected[2], &ddsd.ddsCaps, &ctx.expected[3]); ok(rc == DDERR_NOTFOUND, "GetAttachedSurface returned %08x\n", rc); + ok(!ctx.expected[3], "expected NULL pointer\n"); ctx.count = 0; rc = IDirectDraw_EnumSurfaces(lpDD, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_ALL, &ddsd, (void *) &ctx, enumCB); @@ -1077,6 +1078,9 @@ static void AttachmentTest7(void) ok(num == 0, "Second mip level has %d surfaces attached, expected 1\n", num); /* Done level 2 */ /* Mip level 3 is still needed */ + hr = IDirectDrawSurface7_GetAttachedSurface(surface3, &caps, &surface4); + ok(hr == DDERR_NOTFOUND, "GetAttachedSurface returned %08x\n", hr); + ok(!surface4, "expected NULL pointer\n"); /* Try to attach a 16x16 miplevel - Should not work as far I can see */ memset(&ddsd, 0, sizeof(ddsd)); [View Less]

1 0

Alexander Nicolaysen Sørnes : winecfg: Update Norwegian Bokmål resource.
by Alexandre Julliard 03 Apr '08

03 Apr '08

Module: wine Branch: master Commit: 9183b472ebac3fd4642655bd2e8c75713b011dee URL: http://source.winehq.org/git/wine.git/?a=commit;h=9183b472ebac3fd4642655bd2… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Apr 3 00:43:09 2008 +0200 winecfg: Update Norwegian Bokmål resource. --- programs/winecfg/No.rc | 55 ++++++++++++++++++++++++++++++----------------- 1 files changed, 35 insertions(+), 20 deletions(-) diff --git a/programs/winecfg/No.rc b/… [View More]programs/winecfg/No.rc index e9550d5..384a197 100644 --- a/programs/winecfg/No.rc +++ b/programs/winecfg/No.rc @@ -2,7 +2,7 @@ * WineCfg resources * Norwegian Bokm�l Language Support * - * Copyright 2005-2007 Alexander N. S�rnes <alex(a)thehandofagony.com> + * Copyright 2005-2008 Alexander N. S�rnes <alex(a)thehandofagony.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -46,7 +46,7 @@ STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " Programminnstillinger ",IDC_STATIC, 8,4,244,240 - LTEXT "Wine kan etterligne forskjellige Windows-versjoner for hvert program. Denne fanen er koblet med bibliotek- og grafikkfanene, s�nn at du kan endre innstillinger for hele systemet eller enkelte program der ogs�.", + LTEXT "Wine kan etterligne forskjellige Windows-versjoner for hvert program. Denne fanen er koblet med bibliotek- og grafikkfanene, s�nn at du kan endre innstillinger for hele systemet eller enkelte programmer der ogs�.", IDC_STATIC,15,20,227,30 CONTROL "Programmer",IDC_APP_LISTVIEW,"SysListView32",WS_BORDER | WS_TABSTOP | LVS_LIST | LVS_SINGLESEL | LVS_SHOWSELALWAYS, 15,50,230,150 @@ -62,27 +62,27 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " Vinduinnstillinger ",IDC_STATIC,8,5,244,180 - CONTROL "Tillat DirectX-programmer � hindre musen fra � forlate vinduet",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,15,230,8 - LTEXT "Hvis vinduer kontrolleres av din standardvindusbehandler, f�r de vanlige rammer, og respekterer det virtuelle skrivebordet ditt og vises i vinduslisten.\n\nHvis de er ukontrollerte er de koblet fra vindusbehandleren. Dette betyr at de ikke integreres like godt med skrivebordet ditt, men emuleringen blir mer presis s�nn at noen programmer virker bedre.", - IDC_STATIC,15,38,228,80 - CONTROL "Tillat vindusbehandleren � kontrollere vinduene",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,112,230,8 - + CONTROL "Tillat DirectX-programmer � hindre musen fra � forlate vinduet",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,19,230,8 + + CONTROL "Tillat vindusbehandleren � kontrollere vinduene",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,40,230,8 + LTEXT "Hvis vinduer kontrolleres av din standardvindusbehandler, f�r de vanlige rammer, og respekterer det virtuelle skrivebordet ditt og vises i vinduslisten.\n\nHvis de er ukontrollerte er de koblet fra vindusbehandleren. Dette betyr at de ikke integreres like godt med skrivebordet ditt, men emuleringen blir mer presis s�nn at noen programmer virker bedre.", + IDC_STATIC,19,51,225,80 + + CONTROL "Vis et virtuelt skrivebord",IDC_ENABLE_DESKTOP,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,15,128,230,10 LTEXT "Du kan velge � emulere et Windows-skrivebord, der alle vinduene er bundet i en virtuell skjerm, eller du kan f� vinduene til � oppf�re seg som andre programmer p� skrivebordet.", - IDC_STATIC,15,126,228,28 + IDC_STATIC,19,138,225,28 LTEXT "St�rrelse:",IDC_DESKTOP_SIZE,15,168,44,8,WS_DISABLED - LTEXT "X",IDC_DESKTOP_BY,108,168,8,8,WS_DISABLED - CONTROL "Vis et virtuelt skrivebord",IDC_ENABLE_DESKTOP,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,15,153,230,10 - - EDITTEXT IDC_DESKTOP_WIDTH,64,168,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED - EDITTEXT IDC_DESKTOP_HEIGHT,117,168,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED + LTEXT "X",IDC_DESKTOP_BY,109,168,8,8,WS_DISABLED + EDITTEXT IDC_DESKTOP_WIDTH,64,166,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED + EDITTEXT IDC_DESKTOP_HEIGHT,117,166,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED - GROUPBOX " Direct3D ",IDC_STATIC,8,190,244,50 + GROUPBOX " Direct3D ",IDC_STATIC,8,190,244,48 - LTEXT "Verteks-skyggelegging: ",IDC_STATIC,15,200,80,30 - COMBOBOX IDC_D3D_VSHADER_MODE,100,198,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Verteks-skyggelegging: ",IDC_STATIC,15,203,80,32 + COMBOBOX IDC_D3D_VSHADER_MODE,100,201,145,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Tillat piksel-skyggelegger (hvis maskinvaren st�tter det)",IDC_D3D_PSHADER_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,217,230,10 + CONTROL "Tillat piksel-skyggelegger (hvis maskinvaren st�tter det)",IDC_D3D_PSHADER_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,219,230,10 GROUPBOX " Skjermoppl�sning (styrer skriftst�rrelse) ",IDC_STATIC,8,242,244,25 CONTROL "", IDC_RES_TRACKBAR, "msctls_trackbar32",WS_TABSTOP,12,250,187,15 EDITTEXT IDC_RES_DPIEDIT,204,250,23,13,ES_NUMBER|WS_TABSTOP @@ -196,7 +196,7 @@ BEGIN EDITTEXT IDC_SYSPARAM_SIZE,166,74,23,13,ES_AUTOHSCROLL | WS_TABSTOP | WS_DISABLED CONTROL "",IDC_SYSPARAM_SIZE_UD,UPDOWN_CLASS,UDS_SETBUDDYINT | WS_DISABLED,187,74,15,13 PUSHBUTTON "Skrift",IDC_SYSPARAM_FONT,208,74,37,13,WS_DISABLED - GROUPBOX " Skallkatalog ",IDC_STATIC,8,114,244,100 + GROUPBOX " Spesielle mapper ",IDC_STATIC,8,114,244,100 CONTROL "Listevisning",IDC_LIST_SFPATHS,"SysListView32",LVS_REPORT | LVS_AUTOARRANGE | LVS_ALIGNLEFT | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP, 15,126,230,64 CONTROL "Pek til:",IDC_LINK_SFPATH,"Button",BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED,15,195,50,13 @@ -222,7 +222,7 @@ BEGIN IDS_THEMEFILE "Temafiler" IDS_THEMEFILE_SELECT "Velg en temafil" IDS_AUDIO_MISSING "Ingen lyddriver er oppgitt i registeret.\n\nEn anbefalt driver er valgt for deg;\nbruk den eller velg en annen,\n\nog trykk �Bruk� for at endringene skal tre i kraft." - IDS_SHELL_FOLDER "Skallkatalog" + IDS_SHELL_FOLDER "Mappe" IDS_LINKS_TO "Peker til" END @@ -306,4 +306,19 @@ BEGIN IDC_SYSPARAMS_INACTIVE_TITLE "Inaktiv tittellinje" IDC_SYSPARAMS_INACTIVE_TITLE_TEXT "Inaktiv titteltekst" IDC_SYSPARAMS_MSGBOX_TEXT "Meldingsvindutekst" + IDC_SYSPARAMS_APPWORKSPACE "Arbeidsomr�de i program" + IDC_SYSPARAMS_WINDOW_FRAME "Visrusramme" + IDC_SYSPARAMS_ACTIVE_BORDER "Aktiv kant" + IDC_SYSPARAMS_INACTIVE_BORDER "Inaktiv kant" + IDC_SYSPARAMS_BUTTON_SHADOW "Kontrollerskygge" + IDC_SYSPARAMS_GRAY_TEXT "Gr� tekst" + IDC_SYSPARAMS_BUTTON_HILIGHT "Merket kontroller" + IDC_SYSPARAMS_BUTTON_DARK_SHADOW "M�rk skygge i kontroller" + IDC_SYSPARAMS_BUTTON_LIGHT "Kontrollerlys" + IDC_SYSPARAMS_BUTTON_ALTERNATE "Bakgrunn for skiftende kontroller" + IDC_SYSPARAMS_HOT_TRACKING "Merket element" + IDC_SYSPARAMS_ACTIVE_TITLE_GRADIENT "Gradient for aktiv tittellinje" + IDC_SYSPARAMS_INACTIVE_TITLE_GRADIENT "Gradient for inaktiv tittellinje" + IDC_SYSPARAMS_MENU_HILIGHT "Menymerking" + IDC_SYSPARAMS_MENUBAR "Menylinje" END [View Less]

1 0

Paul Vriens : rsaenh: Add some new flags to wincrypt.h and use one of them.
by Alexandre Julliard 03 Apr '08

03 Apr '08

Module: wine Branch: master Commit: 51ee956b953501903ec13c9a2b052882d56429b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51ee956b953501903ec13c9a2… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu Apr 3 08:46:53 2008 +0200 rsaenh: Add some new flags to wincrypt.h and use one of them. --- dlls/rsaenh/rsaenh.c | 8 ++++---- include/wincrypt.h | 13 +++++-------- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/… [View More]dlls/rsaenh/rsaenh.c index e31bace..14e67d7 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -3027,11 +3027,11 @@ BOOL WINAPI RSAENH_CPGetProvParam(HCRYPTPROV hProv, DWORD dwParam, BYTE *pbData, DWORD dwTemp; HKEY hKey; - /* This is for dwParam 41, which does not seem to be documented - * on MSDN. IE6 SP1 asks for it in the 'About' dialog, however. + /* This is for dwParam PP_CRYPT_COUNT_KEY_USE. + * IE6 SP1 asks for it in the 'About' dialog. * Returning this BLOB seems to satisfy IE. The marked 0x00 seem * to be 'don't care's. If you know anything more specific about - * provider parameter 41, please report to wine-devel(a)winehq.org */ + * this provider parameter, please report to wine-devel(a)winehq.org */ static CONST BYTE abWTF[96] = { 0xb0, 0x25, 0x63, 0x86, 0x9c, 0xab, 0xb6, 0x37, 0xe8, 0x82, /**/0x00,/**/ 0x72, 0x06, 0xb2, /**/0x00,/**/ 0x3b, @@ -3175,7 +3175,7 @@ BOOL WINAPI RSAENH_CPGetProvParam(HCRYPTPROV hProv, DWORD dwParam, BYTE *pbData, sizeof(PROV_ENUMALGS_EX)); } - case 41: /* Undocumented. Asked for by IE About dialog */ + case PP_CRYPT_COUNT_KEY_USE: /* Asked for by IE About dialog */ return copy_param(pbData, pdwDataLen, abWTF, sizeof(abWTF)); default: diff --git a/include/wincrypt.h b/include/wincrypt.h index bf15b93..5d8b203 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -1816,14 +1816,6 @@ static const WCHAR MS_ENH_RSA_AES_PROV_W[] = { 'M','i','c','r','o','s' /* FLAGS Section */ -/* Provider Parameters */ -#define PP_ENUMALGS 1 -#define PP_ENUMCONTAINERS 2 -#define PP_IMPTYPE 3 -#define PP_NAME 4 -#define PP_VERSION 5 -#define PP_CONTAINER 6 - #define CRYPT_FIRST 1 #define CRYPT_NEXT 2 @@ -1880,6 +1872,11 @@ static const WCHAR MS_ENH_RSA_AES_PROV_W[] = { 'M','i','c','r','o','s' #define PP_USE_HARDWARE_RNG 38 #define PP_KEYSPEC 39 #define PP_ENUMEX_SIGNING_PROT 40 +#define PP_CRYPT_COUNT_KEY_USE 41 +#define PP_USER_CERTSTORE 42 +#define PP_SMARTCARD_READER 43 +#define PP_SMARTCARD_GUID 45 +#define PP_ROOT_CERTSTORE 46 /* Values returned by CryptGetProvParam of PP_KEYSTORAGE */ #define CRYPT_SEC_DESCR 0x00000001 [View Less]

1 0

Paul Vriens : rsaenh/tests: Fix a typo.
by Alexandre Julliard 03 Apr '08

03 Apr '08

Module: wine Branch: master Commit: 77d912e541eb793b2c05b8f6da21a57e315315aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=77d912e541eb793b2c05b8f6d… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu Apr 3 08:11:20 2008 +0200 rsaenh/tests: Fix a typo. --- dlls/rsaenh/tests/rsaenh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 5a7b474..1a8bb92 100644 --- a/dlls/rsaenh/… [View More]

1 0

Vitaliy Margolen : reg: Add Russian translation.
by Alexandre Julliard 03 Apr '08

03 Apr '08

Module: wine Branch: master Commit: 3eff12c056109fd27b4e72a42ae2bcbe42cda026 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3eff12c056109fd27b4e72a42… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Wed Apr 2 23:43:14 2008 -0600 reg: Add Russian translation. --- programs/reg/Ru.rc | 29 +++++++++++++++++++++++++++++ programs/reg/rsrc.rc | 1 + 2 files changed, 30 insertions(+), 0 deletions(-) diff --git a/programs/reg/Ru.rc b/programs/reg/Ru.rc new … [View More]

1 0

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 April 2008