April 2008 - Wine-Commits - list.winehq.org

Hwang YunSong(황윤성) : clock: Updated Korean resource.
by Alexandre Julliard April 4, 2008

April 4, 2008

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 +++ b/programs/clock/Ko.rc @@ -39,7 +39,7 @@ MAIN_MENU MENU } POPUP "��(&O)" { MENUITEM "��̼��(&L)...", IDM_LICENSE - MENUITEM "�� (&N)...", IDM_NOWARRANTY + MENUITEM "�� (&N)...", IDM_NOWARRANTY MENUITEM "�ð� ��(&A)...", IDM_ABOUT } }

1 0

Alexander Morozov : setupapi: Prevent of reallocating memory for _SP_DEVINFO_DATA structures.
by Alexandre Julliard April 4, 2008

April 4, 2008

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/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; }

1 0

Austin English : Spelling fixes.
by Alexandre Julliard April 4, 2008

April 4, 2008

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/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)

1 0

Allan Tong : wined3d: Call ActivateContext before any gl call in IWineD3DSurfaceImpl_Release.
by Alexandre Julliard April 4, 2008

April 4, 2008

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/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);

1 0

Alexandre Julliard : winex11: Don' t update the normal size hints when a window is minimized or maximized.
by Alexandre Julliard April 4, 2008

April 4, 2008

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/winex11.drv/window.c index 2953337..e035041 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -800,10 +800,11 @@ static void set_size_hints( Display *display, struct x11drv_win_data *data, DWOR { XSizeHints* size_hints; - if ((size_hints = XAllocSizeHints())) - { - size_hints->flags = 0; + if (!(size_hints = XAllocSizeHints())) return; + /* don't update size hints if window is not in normal state */ + if (!(style & (WS_MINIMIZE | WS_MAXIMIZE))) + { if (data->hwnd != GetDesktopWindow()) /* don't force position of desktop */ { size_hints->win_gravity = StaticGravity; @@ -820,9 +821,9 @@ static void set_size_hints( Display *display, struct x11drv_win_data *data, DWOR size_hints->min_height = size_hints->max_height; size_hints->flags |= PMinSize | PMaxSize; } - XSetWMNormalHints( display, data->whole_window, size_hints ); - XFree( size_hints ); } + XSetWMNormalHints( display, data->whole_window, size_hints ); + XFree( size_hints ); }

1 0

Dan Hipschman : qedit: Indicate the methods of IMediaDet are not implemented in the FIXMEs.
by Alexandre Julliard April 4, 2008

April 4, 2008

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/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; }

1 0

Alexander Dorofeyev : ddraw/tests: Extend p8_primary_test.
by Alexandre Julliard April 4, 2008

April 4, 2008

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/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);

1 0

Lei Zhang : user32: Use a bogus wildcard in listbox test, change wildcard string to a const.
by Alexandre Julliard April 4, 2008

April 4, 2008

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

Alexandre Julliard : winex11: Use the same test for resizable windows when setting size and mwm hints.
by Alexandre Julliard April 4, 2008

April 4, 2008

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.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;

1 0

Alexandre Julliard : winex11: Always update the window position without relying on the cached values.
by Alexandre Julliard April 4, 2008

April 4, 2008

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/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(); }

1 0