January 2008 - Wine-commits

Alistair Leslie-Hughes : msxml3: Return E_INVALIDARG when value is NULL.
by Alexandre Julliard 03 Jan '08

03 Jan '08

Module: wine Branch: master Commit: 7c1a7491ec2a3520fb114977ede5be961ef65ec7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c1a7491ec2a3520fb114977e… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jan 3 16:02:36 2008 +1100 msxml3: Return E_INVALIDARG when value is NULL. --- dlls/msxml3/node.c | 3 +++ dlls/msxml3/tests/domdoc.c | 4 ++++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 63f3ad5..7122f7d 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -219,6 +219,9 @@ static HRESULT WINAPI xmlnode_get_nodeValue( TRACE("%p %p\n", This, value); + if(!value) + return E_INVALIDARG; + V_BSTR(value) = NULL; V_VT(value) = VT_NULL; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index c226ad3..9c5e680 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -545,6 +545,10 @@ static void test_domnode( void ) VariantInit(&var); ok( V_VT(&var) == VT_EMPTY, "variant init failed\n"); + + r = IXMLDOMNode_get_nodeValue( doc, NULL ); + ok(r == E_INVALIDARG, "get_nodeValue ret %08x\n", r ); + r = IXMLDOMNode_get_nodeValue( doc, &var ); ok( r == S_FALSE, "nextNode returned wrong code\n"); ok( V_VT(&var) == VT_NULL, "variant wasn't empty\n");

1 0

Alexandre Julliard : ntdll: Print an error for unsupported shared writable mappings.
by Alexandre Julliard 03 Jan '08

03 Jan '08

Module: wine Branch: master Commit: a39ac0a701d6a4d0d10b1ea54360fe101164f695 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a39ac0a701d6a4d0d10b1ea54… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 3 13:20:03 2008 +0100 ntdll: Print an error for unsupported shared writable mappings. --- dlls/ntdll/virtual.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index b5e236f..cbd524a 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -824,7 +824,12 @@ static NTSTATUS map_file_into_view( struct file_view *view, int fd, size_t start /* page-aligned (EINVAL), or because the underlying filesystem */ /* does not support mmap() (ENOEXEC,ENODEV), we do it by hand. */ if ((errno != ENOEXEC) && (errno != EINVAL) && (errno != ENODEV)) return FILE_GetNtStatus(); - if (shared_write) return FILE_GetNtStatus(); /* we cannot fake shared write mappings */ + if (shared_write) /* we cannot fake shared write mappings */ + { + if (errno == EINVAL) return STATUS_INVALID_PARAMETER; + ERR( "shared writable mmap not supported, broken filesystem?\n" ); + return STATUS_NOT_SUPPORTED; + } } /* Reserve the memory with an anonymous mmap */

1 0

Michael Jung : imm32: Added some unit test cases.
by Alexandre Julliard 03 Jan '08

03 Jan '08

Module: wine Branch: master Commit: 0a31ab7e2ab8aeac61ba83ba2abef3ba9c77101d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a31ab7e2ab8aeac61ba83ba2… Author: Michael Jung <mjung(a)iss.tu-darmstadt.de> Date: Wed Jan 2 23:14:49 2008 +0100 imm32: Added some unit test cases. --- .gitignore | 4 + Makefile.in | 2 + configure | 3 + configure.ac | 1 + dlls/Makefile.in | 1 + dlls/imm32/tests/Makefile.in | 13 +++ dlls/imm32/tests/imm32.c | 222 +++++++++++++++++++++++++++++++++++++++++ programs/winetest/Makefile.in | 3 + programs/winetest/winetest.rc | 1 + 9 files changed, 250 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0a31ab7e2ab8aeac61ba8…

1 0

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

03 Jan '08

Module: wine Branch: master Commit: 464258b7cd2d3782ec15a0f33c8c4adb7a08c3ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=464258b7cd2d3782ec15a0f33… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Jan 2 17:46:32 2008 -0600 Spelling fixes. --- dlls/avifil32/acmstream.c | 2 +- dlls/gdi32/bidi.c | 4 ++-- dlls/gdi32/painting.c | 6 +++--- dlls/localspl/localmon.c | 2 +- dlls/oledlg/pastespl.c | 2 +- dlls/riched20/rtf.h | 2 +- dlls/wineoss.drv/audio.h | 2 +- dlls/wineps.drv/type1afm.c | 2 +- dlls/wldap32/parse.c | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/avifil32/acmstream.c b/dlls/avifil32/acmstream.c index 1501f41..47013ef 100644 --- a/dlls/avifil32/acmstream.c +++ b/dlls/avifil32/acmstream.c @@ -729,7 +729,7 @@ static HRESULT AVIFILE_OpenCompressor(IAVIStreamImpl *This) This->sInfo.dwQuality = (DWORD)ICQUALITY_DEFAULT; SetRectEmpty(&This->sInfo.rcFrame); - /* convert positions ansd sizes to output format */ + /* convert positions and sizes to output format */ CONVERT_STREAM_to_THIS(&This->sInfo.dwStart); CONVERT_STREAM_to_THIS(&This->sInfo.dwLength); CONVERT_STREAM_to_THIS(&This->sInfo.dwSuggestedBufferSize); diff --git a/dlls/gdi32/bidi.c b/dlls/gdi32/bidi.c index 5b787d3..b5fd469 100644 --- a/dlls/gdi32/bidi.c +++ b/dlls/gdi32/bidi.c @@ -367,7 +367,7 @@ static int resolveExplicit(int level, int dir, WORD *pcls, WORD *plevel, int cch enum states /* possible states */ { xa, /* arabic letter */ - xr, /* right leter */ + xr, /* right letter */ xl, /* left letter */ ao, /* arabic lett. foll by ON */ @@ -494,7 +494,7 @@ static int GetResolvedType(int action) States can be of two kinds: - Immediate Resolution State, where each input token - is resolved as soon as it is seen. These states havve + is resolved as soon as it is seen. These states have only single action codes (xxN) or the no-op (xxx) for static input tokens. - Deferred Resolution State, where input tokens either diff --git a/dlls/gdi32/painting.c b/dlls/gdi32/painting.c index 77d05c2..74b04f9 100644 --- a/dlls/gdi32/painting.c +++ b/dlls/gdi32/painting.c @@ -1041,7 +1041,7 @@ BOOL WINAPI LineDDA(INT nXStart, INT nYStart, INT nXEnd, INT nYEnd, * *Very* simple bezier drawing code, * * It uses a recursive algorithm to divide the curve in a series - * of straight line segements. Not ideal but for me sufficient. + * of straight line segments. Not ideal but for me sufficient. * If you are in need for something better look for some incremental * algorithm. * @@ -1085,7 +1085,7 @@ BOOL WINAPI LineDDA(INT nXStart, INT nYStart, INT nXEnd, INT nYEnd, * Points[0] and Points[3] are begin and endpoint * Points[1] and Points[2] are control points * level is the recursion depth -* returns true if the recusion can be terminated +* returns true if the recursion can be terminated */ static BOOL BezierCheck( int level, POINT *Points) { @@ -1200,7 +1200,7 @@ static void GDI_InternalBezier( POINT *Points, POINT **PtsOut, INT *dwOut, * * RETURNS * - * Ptr to an array of POINTs that contain the lines that approximinate the + * Ptr to an array of POINTs that contain the lines that approximate the * Beziers. The array is allocated on the process heap and it is the caller's * responsibility to HeapFree it. [this is not a particularly nice interface * but since we can't know in advance how many points will generate, the diff --git a/dlls/localspl/localmon.c b/dlls/localspl/localmon.c index 8f5f7af..b29b844 100644 --- a/dlls/localspl/localmon.c +++ b/dlls/localspl/localmon.c @@ -225,7 +225,7 @@ static DWORD get_ports_from_reg(DWORD level, LPBYTE pPorts, DWORD cbBuf, LPDWORD if ((res == ERROR_SUCCESS) && (portname[0])) { numentries++; - /* calsulate the required size */ + /* calculate the required size */ needed += entrysize; needed += (len + 1) * sizeof(WCHAR); if (level > 1) { diff --git a/dlls/oledlg/pastespl.c b/dlls/oledlg/pastespl.c index a3d399c..68bad06 100644 --- a/dlls/oledlg/pastespl.c +++ b/dlls/oledlg/pastespl.c @@ -434,7 +434,7 @@ static void update_result_text(HWND hdlg, const ps_struct_t *ps_struct) LoadStringW(OLEDLG_hInstance, res_id, resource_txt, sizeof(resource_txt)/sizeof(WCHAR)); if((ptr = strstrW(resource_txt, percent_s))) { - /* FIXME handle %s in ResultText. Sub appname if IDS_PS_PASTE_OBJECT{_AS_ICON}. Else sub appropiate type name */ + /* FIXME handle %s in ResultText. Sub appname if IDS_PS_PASTE_OBJECT{_AS_ICON}. Else sub appropriate type name */ size_t result_txt_len = strlenW(pent->lpstrResultText); ptrdiff_t offs = (char*)ptr - (char*)resource_txt; result_txt = HeapAlloc(GetProcessHeap(), 0, (strlenW(resource_txt) + result_txt_len - 1) * sizeof(WCHAR)); diff --git a/dlls/riched20/rtf.h b/dlls/riched20/rtf.h index 9befae7..5a12515 100644 --- a/dlls/riched20/rtf.h +++ b/dlls/riched20/rtf.h @@ -36,7 +36,7 @@ * that only care about gross token distinctions. * Major/minor numbers: Within their class, tokens have a major * number, and may also have a minor number to further - * distinquish tokens with the same major number. + * distinguish tokens with the same major number. * * *** Class, major and minor token numbers are all >= 0 *** * diff --git a/dlls/wineoss.drv/audio.h b/dlls/wineoss.drv/audio.h index be63145..a535d7e 100644 --- a/dlls/wineoss.drv/audio.h +++ b/dlls/wineoss.drv/audio.h @@ -137,7 +137,7 @@ typedef struct { DWORD dwThreadID; OSS_MSG_RING msgRing; - /* make accomodation for the inacuraccy of OSS when reporting buffer size remaining by using the clock instead of GETOSPACE */ + /* make accomodation for the inaccuracy of OSS when reporting buffer size remaining by using the clock instead of GETOSPACE */ DWORD dwProjectedFinishTime; } WINE_WAVEOUT; diff --git a/dlls/wineps.drv/type1afm.c b/dlls/wineps.drv/type1afm.c index ad8c16a..dd79eee 100644 --- a/dlls/wineps.drv/type1afm.c +++ b/dlls/wineps.drv/type1afm.c @@ -1166,7 +1166,7 @@ static BOOL ReadAFMDir(LPCSTR dirname) * Reads font metrics from Type 1 AFM font files in directories listed in the * [afmdirs] section of the Wine configuration file. * - * If this function fails (returns FALSE), the dirver will fail to initialize + * If this function fails (returns FALSE), the driver will fail to initialize * and the driver heap will be destroyed, so it's not necessary to HeapFree * everything in that event. * diff --git a/dlls/wldap32/parse.c b/dlls/wldap32/parse.c index a133302..61c6020 100644 --- a/dlls/wldap32/parse.c +++ b/dlls/wldap32/parse.c @@ -409,7 +409,7 @@ INT CDECL ldap_parse_vlv_controlA( WLDAP32_LDAP *ld, PLDAPControlA *control, * PARAMS * ld [I] Pointer to an LDAP context. * control [I] Controls obtained from a result message. - * targetpos [O] Positition of the target in the result list. + * targetpos [O] Position of the target in the result list. * listcount [O] Estimate of the number of results in the list. * context [O] Server side context. * errcode [O] Error code from the listview operation.

1 0

Zach Goldberg : Fix some typos.
by Alexandre Julliard 03 Jan '08

03 Jan '08

Module: wine Branch: master Commit: 17651d0d0cb83ba497c70bb862f454ba061bc325 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17651d0d0cb83ba497c70bb86… Author: Zach Goldberg <zgold(a)BlueSata.com> Date: Wed Jan 2 20:23:41 2008 -0500 Fix some typos. --- include/cvconst.h | 6 +++--- include/d3d8types.h | 2 +- include/ddraw.h | 2 +- include/digitalv.h | 2 +- include/dplobby.h | 2 +- include/exdisp.idl | 2 +- include/mmsystem.h | 2 +- include/winternl.h | 2 +- include/wintrust.h | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/include/cvconst.h b/include/cvconst.h index e058bc6..2b1cdf5 100644 --- a/include/cvconst.h +++ b/include/cvconst.h @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* information in this file is highly derivated from MSDN DIA information pages */ +/* information in this file is highly derived from MSDN DIA information pages */ /* symbols & types enumeration */ enum SymTagEnum @@ -186,7 +186,7 @@ enum CV_HREG_e CV_REG_LDTR = 114, CV_REG_TR = 115, - CV_REG_PSEUDO1 = 116, /* this includes Pseudo02 to Pseuso09 */ + CV_REG_PSEUDO1 = 116, /* this includes Pseudo02 to Pseudo09 */ CV_REG_ST0 = 128, /* this includes ST1 to ST7 */ CV_REG_CTRL = 136, CV_REG_STAT = 137, @@ -473,7 +473,7 @@ enum CV_HREG_e CV_AMD64_LDTR = CV_REG_LDTR, CV_AMD64_TR = CV_REG_TR, - CV_AMD64_PSEUDO1 = CV_REG_PSEUDO1, /* this includes Pseudo02 to Pseuso09 */ + CV_AMD64_PSEUDO1 = CV_REG_PSEUDO1, /* this includes Pseudo02 to Pseudo09 */ CV_AMD64_ST0 = CV_REG_ST0, /* this includes ST1 to ST7 */ CV_AMD64_CTRL = CV_REG_CTRL, CV_AMD64_STAT = CV_REG_STAT, diff --git a/include/d3d8types.h b/include/d3d8types.h index d49bd6a..2ed2bf9 100644 --- a/include/d3d8types.h +++ b/include/d3d8types.h @@ -170,7 +170,7 @@ typedef enum _D3DVSD_TOKENTYPE { D3DVSD_FORCE_DWORD = 0x7FFFFFFF } D3DVSD_TOKENTYPE; -/** input registers for vertes shaders functions */ +/** input registers for vertex shaders functions */ /* #define D3DVSDE_POSITION 0 #define D3DVSDE_BLENDWEIGHT 1 diff --git a/include/ddraw.h b/include/ddraw.h index 0f7a6c1..a5ca311 100644 --- a/include/ddraw.h +++ b/include/ddraw.h @@ -338,7 +338,7 @@ typedef struct _DDSCAPS { #define DDSCAPS2_RESERVED2 0x00000040 /* indicates surface will never be locked again */ #define DDSCAPS2_OPAQUE 0x00000080 -/* set at CreateSurface() time to indicate antialising will be used */ +/* set at CreateSurface() time to indicate antialiasing will be used */ #define DDSCAPS2_HINTANTIALIASING 0x00000100 /* set at CreateSurface() time to indicate cubic environment map */ #define DDSCAPS2_CUBEMAP 0x00000200 diff --git a/include/digitalv.h b/include/digitalv.h index 98fe282..d06fb63 100644 --- a/include/digitalv.h +++ b/include/digitalv.h @@ -199,7 +199,7 @@ extern "C" { #define MCI_DGV_MONITOR_METHOD 0x00010000L #define MCI_DGV_MONITOR_SOURCE 0x00020000L -/* values for dwSource parameter of the MCI_DGV_MONITOR_PARMS struture */ +/* values for dwSource parameter of the MCI_DGV_MONITOR_PARMS structure */ #define MCI_DGV_MONITOR_INPUT 0x00004000L #define MCI_DGV_MONITOR_FILE 0x00004001L diff --git a/include/dplobby.h b/include/dplobby.h index 16661b0..5a53c1d 100644 --- a/include/dplobby.h +++ b/include/dplobby.h @@ -193,7 +193,7 @@ typedef struct tagDPLMSG_NEWSESSIONHOST /***************************************************************************** * DirectPlay Address ID's - * A DirectPlay address is composed of multiple data chunks, each assocated with + * A DirectPlay address is composed of multiple data chunks, each associated with * a GUID to give significance to the type of data. All chunks have an associated * size so that unknown chunks can be ignored for backwards compatibility! * EnumAddresses function is used to parse the address data chunks. diff --git a/include/exdisp.idl b/include/exdisp.idl index 4e07400..70da5ac 100644 --- a/include/exdisp.idl +++ b/include/exdisp.idl @@ -3,7 +3,7 @@ * * Copyright (C) 2001 John R. Sheets (for CodeWeavers) * Copyright (C) 2003 Alexandre Julliard - * Copuright (C) 2004 Jacek Caban + * Copyright (C) 2004 Jacek Caban * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/include/mmsystem.h b/include/mmsystem.h index d75062f..37373e4 100644 --- a/include/mmsystem.h +++ b/include/mmsystem.h @@ -384,7 +384,7 @@ DECL_WINELIB_TYPE_AW(LPWAVEOUTCAPS2) #define WAVECAPS_PLAYBACKRATE 0x0002 /* supports playback rate control */ #define WAVECAPS_VOLUME 0x0004 /* supports volume control */ #define WAVECAPS_LRVOLUME 0x0008 /* separate left-right volume control */ -#define WAVECAPS_SYNC 0x0010 /* driver is synchrounous and playing is blocking */ +#define WAVECAPS_SYNC 0x0010 /* driver is synchronous and playing is blocking */ #define WAVECAPS_SAMPLEACCURATE 0x0020 /* position is sample accurate */ #define WAVECAPS_DIRECTSOUND 0x0040 /* ? */ diff --git a/include/winternl.h b/include/winternl.h index 95e2b19..43bc374 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1068,7 +1068,7 @@ typedef struct _SYSTEM_CPU_INFORMATION { #define CPU_FEATURE_PAT 0x00000400 /* Page Attribute Table */ #define CPU_FEATURE_FXSR 0x00000800 /* FXSAVE and FXSTORE instructions */ #define CPU_FEATURE_SEP 0x00001000 /* SYSENTER and SYSEXIT instructions */ -#define CPU_FEATURE_SSE 0x00002000 /* SSE extenstions (ext. MMX) */ +#define CPU_FEATURE_SSE 0x00002000 /* SSE extensions (ext. MMX) */ #define CPU_FEATURE_3DNOW 0x00008000 /* 3DNOW instructions available (FIXME: needs to be confirmed) */ #define CPU_FEATURE_SSE2 0x00010000 /* SSE2 extensions (XMMI64) */ diff --git a/include/wintrust.h b/include/wintrust.h index 7b0b276..0c4d535 100644 --- a/include/wintrust.h +++ b/include/wintrust.h @@ -564,7 +564,7 @@ typedef struct _CAT_MEMBERINFO typedef struct _WIN_CERTIFICATE { DWORD dwLength; - WORD wRevision; /* WIN_CERT_REVISON_xxx */ + WORD wRevision; /* WIN_CERT_REVISION_xxx */ WORD wCertificateType; /* WIN_CERT_TYPE_xxx */ BYTE bCertificate[ANYSIZE_ARRAY]; } WIN_CERTIFICATE, *LPWIN_CERTIFICATE;

1 0

Gerald Pfeifer : ws2_32: Remove two noop checks.
by Alexandre Julliard 03 Jan '08

03 Jan '08

Module: wine Branch: master Commit: 257f519eb509cbd75eea61d684bb303bb34105a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=257f519eb509cbd75eea61d68… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Wed Jan 2 15:59:59 2008 +0100 ws2_32: Remove two noop checks. --- dlls/ws2_32/tests/sock.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 80ffa61..4446e7f 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -816,10 +816,10 @@ static void do_test( test_setup *test ) WaitForSingleObject ( server_ready, INFINITE ); wait = WaitForMultipleObjects ( 1 + n, thread, TRUE, 1000 * TEST_TIMEOUT ); - ok ( wait >= WAIT_OBJECT_0 && wait <= WAIT_OBJECT_0 + n , + ok ( wait <= WAIT_OBJECT_0 + n , "some threads have not completed: %x\n", wait ); - if ( ! ( wait >= WAIT_OBJECT_0 && wait <= WAIT_OBJECT_0 + n ) ) + if ( ! ( wait <= WAIT_OBJECT_0 + n ) ) { for (i = 0; i <= n; i++) {

1 0

Gerald Pfeifer : msi: Remove an extraneous safety check and simplify generate_error_string().
by Alexandre Julliard 03 Jan '08

03 Jan '08

Module: wine Branch: master Commit: bb8471beace7ab1baf610837c22fd7b3ff30d863 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb8471beace7ab1baf610837c… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Wed Jan 2 16:30:45 2008 +0100 msi: Remove an extraneous safety check and simplify generate_error_string(). --- dlls/msi/helpers.c | 18 ++++++------------ 1 files changed, 6 insertions(+), 12 deletions(-) diff --git a/dlls/msi/helpers.c b/dlls/msi/helpers.c index 139a447..90055a1 100644 --- a/dlls/msi/helpers.c +++ b/dlls/msi/helpers.c @@ -1029,20 +1029,14 @@ WCHAR* generate_error_string(MSIPACKAGE *package, UINT error, DWORD count, ... ) va_end(va); MSI_FormatRecordW(package,rec,NULL,&size); - if (size >= 0) - { - size++; - data = msi_alloc(size*sizeof(WCHAR)); - if (size > 1) - MSI_FormatRecordW(package,rec,data,&size); - else - data[0] = 0; - msiobj_release( &rec->hdr ); - return data; - } + size++; + data = msi_alloc(size*sizeof(WCHAR)); + if (size > 1) + MSI_FormatRecordW(package,rec,data,&size); + else + data[0] = 0; msiobj_release( &rec->hdr ); - data = NULL; return data; }

1 0

Aric Stewart : imm32: When updating a NULL HIMCC with NULL just return NULL . Handle the NULL HIMCC for the compstr when doing a ImmNotifyIME for a reset .
by Alexandre Julliard 03 Jan '08

03 Jan '08

Module: wine Branch: master Commit: 1b997a9986ce7a23f8cf5cc30dd6c3aadd9134e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b997a9986ce7a23f8cf5cc30… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jan 2 13:34:46 2008 -0600 imm32: When updating a NULL HIMCC with NULL just return NULL. Handle the NULL HIMCC for the compstr when doing a ImmNotifyIME for a reset. --- dlls/imm32/imm.c | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 4f5f658..58d0e3e 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -240,6 +240,9 @@ static HIMCC updateCompStr(HIMCC old, LPWSTR compstr, DWORD len) TRACE("%s, %i\n",debugstr_wn(compstr,len),len); + if (old == NULL && compstr == NULL && len == 0) + return NULL; + if (old != NULL) { olddata = ImmLockIMCC(old); @@ -373,6 +376,9 @@ static HIMCC updateResultStr(HIMCC old, LPWSTR resultstr, DWORD len) TRACE("%s, %i\n",debugstr_wn(resultstr,len),len); + if (old == NULL && resultstr == NULL && len == 0) + return NULL; + if (old != NULL) { olddata = ImmLockIMCC(old); @@ -1419,7 +1425,7 @@ BOOL WINAPI ImmNotifyIME( pX11DRV_ForceXIMReset(root_context->IMC.hWnd); { HIMCC newCompStr; - DWORD cplen; + DWORD cplen = 0; LPWSTR cpstr; LPCOMPOSITIONSTRING cs = NULL; LPBYTE cdata = NULL; @@ -1429,11 +1435,14 @@ BOOL WINAPI ImmNotifyIME( ImmDestroyIMCC(root_context->IMC.hCompStr); root_context->IMC.hCompStr = newCompStr; - cdata = ImmLockIMCC(root_context->IMC.hCompStr); - cs = (LPCOMPOSITIONSTRING)cdata; - cplen = cs->dwCompStrLen; - cpstr = (LPWSTR)&(cdata[cs->dwCompStrOffset]); - ImmUnlockIMCC(root_context->IMC.hCompStr); + if (root_context->IMC.hCompStr) + { + cdata = ImmLockIMCC(root_context->IMC.hCompStr); + cs = (LPCOMPOSITIONSTRING)cdata; + cplen = cs->dwCompStrLen; + cpstr = (LPWSTR)&(cdata[cs->dwCompStrOffset]); + ImmUnlockIMCC(root_context->IMC.hCompStr); + } if (cplen > 0) { WCHAR param = cpstr[0];

1 0

Gerald Pfeifer : wined3d: Removed dead FIXME checks.
by Alexandre Julliard 03 Jan '08

03 Jan '08

Module: wine Branch: master Commit: 21a9c2d2f91ea36d865eaf75dffa2a821eb2b84d URL: http://source.winehq.org/git/wine.git/?a=commit;h=21a9c2d2f91ea36d865eaf75d… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Wed Jan 2 15:30:00 2008 +0100 wined3d: Removed dead FIXME checks. --- dlls/d3d8/device.c | 5 ----- dlls/d3d9/device.c | 5 ----- dlls/wined3d/device.c | 5 ----- 3 files changed, 0 insertions(+), 15 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 56ae145..1d1bef7 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -635,11 +635,6 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CreateSurface(LPDIRECT3DDEVICE8 iface IDirect3DSurface8Impl *object; IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; TRACE("(%p) Relay\n", This); - if(MultisampleQuality < 0) { - FIXME("MultisampleQuality out of range %d, substituting 0\n", MultisampleQuality); - /*FIXME: Find out what windows does with a MultisampleQuality < 0 */ - MultisampleQuality=0; - } if(MultisampleQuality > 0){ FIXME("MultisampleQuality set to %d, substituting 0\n" , MultisampleQuality); diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 6308eb5..9c50769 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -351,11 +351,6 @@ static HRESULT WINAPI IDirect3DDevice9Impl_CreateSurface(LPDIRECT3DDEVICE9 ifac IDirect3DSurface9Impl *object; IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; TRACE("(%p) Relay\n", This); - if(MultisampleQuality < 0) { - FIXME("MultisampleQuality out of range %d, substituting 0\n", MultisampleQuality); - /*FIXME: Find out what windows does with a MultisampleQuality < 0 */ - MultisampleQuality=0; - } if(MultisampleQuality > 0){ FIXME("MultisampleQuality set to %d, bstituting 0\n", MultisampleQuality); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9d17498..e9970a3 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -709,11 +709,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateSurface(IWineD3DDevice *iface, U *This flag has the same behavior as the constant, D3DPRESENTFLAG_DISCARD_DEPTHSTENCIL, in D3DPRESENTFLAG. ***************************/ - if(MultisampleQuality < 0) { - FIXME("Invalid multisample level %d\n", MultisampleQuality); - return WINED3DERR_INVALIDCALL; /* TODO: Check that this is the case! */ - } - if(MultisampleQuality > 0) { FIXME("MultisampleQuality set to %d, substituting 0\n", MultisampleQuality); MultisampleQuality=0;

1 0

H. Verbeet : wined3d: SFLAG_INTEXTURE is the same as SFLAG_INDRAWABLE for offscreen render targets when ORM_FBO is used .
by Alexandre Julliard 03 Jan '08

03 Jan '08

Module: wine Branch: master Commit: bf50e07f342a5d26ed1ceb600e9a9a989d58ba97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf50e07f342a5d26ed1ceb600… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Wed Jan 2 19:53:13 2008 +0100 wined3d: SFLAG_INTEXTURE is the same as SFLAG_INDRAWABLE for offscreen render targets when ORM_FBO is used. --- dlls/wined3d/surface.c | 34 ++++++++++++++++++++++++++++++++-- 1 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 98ab6b9..ceeb185 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3534,7 +3534,19 @@ static void WINAPI IWineD3DSurfaceImpl_ModifyLocation(IWineD3DSurface *iface, DW flag == SFLAG_INSYSMEM ? "SFLAG_INSYSMEM" : flag == SFLAG_INDRAWABLE ? "SFLAG_INDRAWABLE" : "SFLAG_INTEXTURE", persistent ? "TRUE" : "FALSE"); - /* TODO: For offscreen textures with fbo offscreen rendering the drawable is the same as the texture.*/ + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { + IWineD3DSwapChain *swapchain = NULL; + + if (SUCCEEDED(IWineD3DSurface_GetContainer(iface, &IID_IWineD3DSwapChain, (void **)&swapchain))) { + TRACE("Surface %p is an onscreen surface\n", iface); + + IWineD3DSwapChain_Release(swapchain); + } else { + /* With ORM_FBO, SFLAG_INTEXTURE and SFLAG_INDRAWABLE are the same for offscreen targets. */ + if (flag & (SFLAG_INTEXTURE | SFLAG_INDRAWABLE)) flag |= (SFLAG_INTEXTURE | SFLAG_INDRAWABLE); + } + } + if(persistent) { if((This->Flags & SFLAG_INTEXTURE) && !(flag & SFLAG_INTEXTURE)) { if (IWineD3DSurface_GetContainer(iface, &IID_IWineD3DBaseTexture, (void **)&texture) == WINED3D_OK) { @@ -3762,12 +3774,25 @@ static inline void surface_blt_to_drawable(IWineD3DSurfaceImpl *This, const RECT static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, DWORD flag, const RECT *rect) { IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *) iface; IWineD3DDeviceImpl *device = This->resource.wineD3DDevice; + IWineD3DSwapChain *swapchain = NULL; GLenum format, internal, type; CONVERT_TYPES convert; int bpp; int width, pitch, outpitch; BYTE *mem; + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { + if (SUCCEEDED(IWineD3DSurface_GetContainer(iface, &IID_IWineD3DSwapChain, (void **)&swapchain))) { + TRACE("Surface %p is an onscreen surface\n", iface); + + IWineD3DSwapChain_Release(swapchain); + } else { + /* With ORM_FBO, SFLAG_INTEXTURE and SFLAG_INDRAWABLE are the same for offscreen targets. + * Prefer SFLAG_INTEXTURE. */ + if (flag == SFLAG_INDRAWABLE) flag = SFLAG_INTEXTURE; + } + } + TRACE("(%p)->(%s, %p)\n", iface, flag == SFLAG_INSYSMEM ? "SFLAG_INSYSMEM" : flag == SFLAG_INDRAWABLE ? "SFLAG_INDRAWABLE" : "SFLAG_INTEXTURE", rect); @@ -3775,7 +3800,6 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, D TRACE("Rectangle: (%d,%d)-(%d,%d)\n", rect->left, rect->top, rect->right, rect->bottom); } - /* TODO: For fbo targets, texture == drawable */ if(This->Flags & flag) { TRACE("Location already up to date\n"); return WINED3D_OK; @@ -3921,6 +3945,12 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, D This->Flags |= flag; } + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO && !swapchain + && (This->Flags & (SFLAG_INTEXTURE | SFLAG_INDRAWABLE))) { + /* With ORM_FBO, SFLAG_INTEXTURE and SFLAG_INDRAWABLE are the same for offscreen targets. */ + This->Flags |= (SFLAG_INTEXTURE | SFLAG_INDRAWABLE); + } + return WINED3D_OK; }

1 0