June 2007 - Wine-commits - list.winehq.org

Alexandre Julliard : user32/tests: Avoid strlen in trace.
by Alexandre Julliard 15 Jun '07

15 Jun '07

Module: wine Branch: master Commit: bd8a4e3aae876808139d8f8b9b3f3112b9f19a17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd8a4e3aae876808139d8f8b9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 15 12:43:31 2007 +0200 user32/tests: Avoid strlen in trace. --- dlls/user32/tests/edit.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index a4f7be7..534bd9b 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -1023,7 +1023,7 @@ static void test_espassword(void) /* get text */ r = SendMessage(hwEdit, WM_GETTEXT, 1024, (LPARAM) buffer); - ok(r == strlen(password), "Expected: %d, got: %d\n", strlen(password), r); + ok(r == strlen(password), "Expected: %s, got len %d\n", password, r); ok(strcmp(buffer, password) == 0, "expected %s, got %s\n", password, buffer); r = OpenClipboard(hwEdit);

1 0

Alexandre Julliard : ntdll: Implemented reading of the CDROM TOC on Mac OS.
by Alexandre Julliard 15 Jun '07

15 Jun '07

Module: wine Branch: master Commit: e6ce0da2f99cc8c249a453489b9b199bec1fe435 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6ce0da2f99cc8c249a453489… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 15 12:42:06 2007 +0200 ntdll: Implemented reading of the CDROM TOC on Mac OS. --- dlls/ntdll/cdrom.c | 40 +++++++++++++++++++++++++++++++++------- 1 files changed, 33 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index 45a2b47..f288bfe 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -76,13 +76,12 @@ #endif #ifdef HAVE_IOKIT_IOKITLIB_H -# ifndef SENSEBUFLEN -# include <sys/disk.h> -# include <IOKit/IOKitLib.h> -# include <IOKit/storage/IOMedia.h> -# include <IOKit/scsi/SCSICmds_REQUEST_SENSE_Defs.h> -# define SENSEBUFLEN kSenseDefaultSize -# endif +# include <sys/disk.h> +# include <IOKit/IOKitLib.h> +# include <IOKit/storage/IOMedia.h> +# include <IOKit/storage/IOCDMediaBSDClient.h> +# include <IOKit/scsi/SCSICmds_REQUEST_SENSE_Defs.h> +# define SENSEBUFLEN kSenseDefaultSize #endif #define NONAMELESSUNION @@ -491,6 +490,33 @@ static NTSTATUS CDROM_SyncCache(int dev, int fd) } cdrom_cache[dev].toc_good = 1; return STATUS_SUCCESS; + +#elif defined(__APPLE__) + int i; + dk_cd_read_toc_t hdr; + CDROM_TOC *toc = &cdrom_cache[dev].toc; + cdrom_cache[dev].toc_good = 0; + + memset( &hdr, 0, sizeof(hdr) ); + hdr.buffer = toc; + hdr.bufferLength = sizeof(*toc); + if (ioctl(fd, DKIOCCDREADTOC, &hdr) == -1) + { + WARN("(%d) -- Error occurred (%s)!\n", dev, strerror(errno)); + return FILE_GetNtStatus(); + } + for (i = toc->FirstTrack; i <= toc->LastTrack + 1; i++) + { + /* convert address format */ + TRACK_DATA *data = &toc->TrackData[i - toc->FirstTrack]; + DWORD frame = (((DWORD)data->Address[0] << 24) | ((DWORD)data->Address[1] << 16) | + ((DWORD)data->Address[2] << 8) | data->Address[3]); + MSF_OF_FRAME( data->Address[1], frame ); + data->Address[0] = 0; + } + + cdrom_cache[dev].toc_good = 1; + return STATUS_SUCCESS; #else return STATUS_NOT_SUPPORTED; #endif

1 0

Alexandre Julliard : server: Enable kqueue support on Mac OS >= 10. 5 now that it's fixed.
by Alexandre Julliard 15 Jun '07

15 Jun '07

Module: wine Branch: master Commit: 8143d42c4c477c4ad88badd995987d0a8710b4fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=8143d42c4c477c4ad88badd99… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 15 12:41:43 2007 +0200 server: Enable kqueue support on Mac OS >= 10.5 now that it's fixed. --- server/fd.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/server/fd.c b/server/fd.c index 11cf294..7a7d572 100644 --- a/server/fd.c +++ b/server/fd.c @@ -55,6 +55,9 @@ #ifdef HAVE_SYS_STATFS_H #include <sys/statfs.h> #endif +#ifdef HAVE_SYS_SYSCTL_H +#include <sys/sysctl.h> +#endif #ifdef HAVE_SYS_EVENT_H #include <sys/event.h> #undef LIST_INIT @@ -518,9 +521,17 @@ static int kqueue_fd = -1; static inline void init_epoll(void) { -#ifndef __APPLE__ /* kqueue support is broken in the MacOS kernel so we can't use it */ - kqueue_fd = kqueue(); +#ifdef __APPLE__ /* kqueue support is broken in Mac OS < 10.5 */ + int mib[2]; + char release[32]; + size_t len = sizeof(release); + + mib[0] = CTL_KERN; + mib[1] = KERN_OSRELEASE; + if (sysctl( mib, 2, release, &len, NULL, 0 ) == -1) return; + if (atoi(release) < 9) return; #endif + kqueue_fd = kqueue(); } static inline void set_fd_epoll_events( struct fd *fd, int user, int events )

1 0

Jacek Caban : mshtml: Added IOleInPlaceSiteEx tests.
by Alexandre Julliard 15 Jun '07

15 Jun '07

Module: wine Branch: master Commit: 077e9c22b837a67abbb33fd246b846225943378c URL: http://source.winehq.org/git/wine.git/?a=commit;h=077e9c22b837a67abbb33fd24… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 14 21:11:02 2007 +0200 mshtml: Added IOleInPlaceSiteEx tests. --- dlls/mshtml/tests/htmldoc.c | 122 +++++++++++++++++++++++++++++++------------ 1 files changed, 89 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=077e9c22b837a67abbb33…

1 0

Andrew Talbot : msrle32: Constify some variables.
by Alexandre Julliard 15 Jun '07

15 Jun '07

Module: wine Branch: master Commit: bea2ba50cf836b054cabb9b65a22bd5f3fc7b66c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bea2ba50cf836b054cabb9b65… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Jun 14 20:47:14 2007 +0100 msrle32: Constify some variables. --- dlls/msrle32/msrle32.c | 60 ++++++++++++++++++++++++++++++----------------- 1 files changed, 38 insertions(+), 22 deletions(-) diff --git a/dlls/msrle32/msrle32.c b/dlls/msrle32/msrle32.c index 5decd74..bf611dd 100644 --- a/dlls/msrle32/msrle32.c +++ b/dlls/msrle32/msrle32.c @@ -60,23 +60,27 @@ static BOOL isSupportedMRLE(LPCBITMAPINFOHEADER lpbi); static BYTE MSRLE32_GetNearestPaletteIndex(UINT count, const RGBQUAD *clrs, RGBQUAD clr); /* compression functions */ -static void computeInternalFrame(CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn, LPBYTE lpIn); +static void computeInternalFrame(CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn, const BYTE *lpIn); static LONG MSRLE32_GetMaxCompressedSize(LPCBITMAPINFOHEADER lpbi); -static LRESULT MSRLE32_CompressRLE4(CodecInfo *pi, LPBITMAPINFOHEADER lpbiIn, LPBYTE lpIn, LPBITMAPINFOHEADER lpbiOut, LPBYTE lpOut, BOOL isKey); -static LRESULT MSRLE32_CompressRLE8(CodecInfo *pi, LPBITMAPINFOHEADER lpbiIn, LPBYTE lpIn, LPBITMAPINFOHEADER lpbiOut, LPBYTE lpOut, BOOL isKey); +static LRESULT MSRLE32_CompressRLE4(const CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn, + const BYTE *lpIn, LPBITMAPINFOHEADER lpbiOut, + LPBYTE lpOut, BOOL isKey); +static LRESULT MSRLE32_CompressRLE8(const CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn, + const BYTE *lpIn, LPBITMAPINFOHEADER lpbiOut, + LPBYTE lpOut, BOOL isKey); /* decompression functions */ -static LRESULT MSRLE32_DecompressRLE4(CodecInfo *pi, LPCBITMAPINFOHEADER lpbi, - LPBYTE lpIn, LPBYTE lpOut); -static LRESULT MSRLE32_DecompressRLE8(CodecInfo *pi, LPCBITMAPINFOHEADER lpbi, - LPBYTE lpIn, LPBYTE lpOut); +static LRESULT MSRLE32_DecompressRLE4(const CodecInfo *pi, LPCBITMAPINFOHEADER lpbi, + const BYTE *lpIn, LPBYTE lpOut); +static LRESULT MSRLE32_DecompressRLE8(const CodecInfo *pi, LPCBITMAPINFOHEADER lpbi, + const BYTE *lpIn, LPBYTE lpOut); /* API functions */ static LRESULT CompressGetFormat(CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn, LPBITMAPINFOHEADER lpbiOut); static LRESULT CompressGetSize(CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn, LPCBITMAPINFOHEADER lpbiOut); -static LRESULT CompressQuery(CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn, +static LRESULT CompressQuery(const CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn, LPCBITMAPINFOHEADER lpbiOut); static LRESULT CompressBegin(CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn, LPCBITMAPINFOHEADER lpbiOut); @@ -183,7 +187,7 @@ static BYTE MSRLE32_GetNearestPaletteIndex(UINT count, const RGBQUAD *clrs, RGBQ /*****************************************************************************/ -void computeInternalFrame(CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn, LPBYTE lpIn) +void computeInternalFrame(CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn, const BYTE *lpIn) { WORD wIntensityTbl[256]; DWORD lInLine, lOutLine; @@ -258,7 +262,7 @@ static LONG MSRLE32_GetMaxCompressedSize(LPCBITMAPINFOHEADER lpbi) * lpA => previous pos in current frame * lpB => current pos in current frame */ -static INT countDiffRLE4(LPWORD lpP, LPWORD lpA, LPWORD lpB, INT pos, LONG lDist, LONG width) +static INT countDiffRLE4(const WORD *lpP, const WORD *lpA, const WORD *lpB, INT pos, LONG lDist, LONG width) { INT count; WORD clr1, clr2; @@ -317,7 +321,7 @@ static INT countDiffRLE4(LPWORD lpP, LPWORD lpA, LPWORD lpB, INT pos, LONG lDist * lpA => previous pos in current frame * lpB => current pos in current frame */ -static INT countDiffRLE8(LPWORD lpP, LPWORD lpA, LPWORD lpB, INT pos, LONG lDist, LONG width) +static INT countDiffRLE8(const WORD *lpP, const WORD *lpA, const WORD *lpB, INT pos, LONG lDist, LONG width) { INT count; @@ -346,7 +350,11 @@ static INT countDiffRLE8(LPWORD lpP, LPWORD lpA, LPWORD lpB, INT pos, LONG lDist return count; } -static INT MSRLE32_CompressRLE4Line(CodecInfo *pi, LPWORD lpP, LPWORD lpC, LPCBITMAPINFOHEADER lpbi, BYTE *lpIn, LONG lDist, INT x, LPBYTE *ppOut, DWORD *lpSizeImage) +static INT MSRLE32_CompressRLE4Line(const CodecInfo *pi, const WORD *lpP, + const WORD *lpC, LPCBITMAPINFOHEADER lpbi, + const BYTE *lpIn, LONG lDist, + INT x, LPBYTE *ppOut, + DWORD *lpSizeImage) { LPBYTE lpOut = *ppOut; INT count, pos; @@ -445,7 +453,11 @@ static INT MSRLE32_CompressRLE4Line(CodecInfo *pi, LPWORD lpP, LPWORD lpC, LPCBI return x; } -static INT MSRLE32_CompressRLE8Line(CodecInfo *pi, LPWORD lpP, LPWORD lpC, LPCBITMAPINFOHEADER lpbi, BYTE *lpIn, LONG lDist, INT x, LPBYTE *ppOut, DWORD *lpSizeImage) +static INT MSRLE32_CompressRLE8Line(const CodecInfo *pi, const WORD *lpP, + const WORD *lpC, LPCBITMAPINFOHEADER lpbi, + const BYTE *lpIn, LONG lDist, + INT x, LPBYTE *ppOut, + DWORD *lpSizeImage) { LPBYTE lpOut = *ppOut; INT count, pos; @@ -528,7 +540,9 @@ static INT MSRLE32_CompressRLE8Line(CodecInfo *pi, LPWORD lpP, LPWORD lpC, LPCBI return x; } -LRESULT MSRLE32_CompressRLE4(CodecInfo *pi, LPBITMAPINFOHEADER lpbiIn, LPBYTE lpIn, LPBITMAPINFOHEADER lpbiOut, LPBYTE lpOut, BOOL isKey) +LRESULT MSRLE32_CompressRLE4(const CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn, + const BYTE *lpIn, LPBITMAPINFOHEADER lpbiOut, + LPBYTE lpOut, BOOL isKey) { LPWORD lpC; LONG lLine, lInLine, lDist; @@ -680,7 +694,9 @@ LRESULT MSRLE32_CompressRLE4(CodecInfo *pi, LPBITMAPINFOHEADER lpbiIn, LPBYTE lp return ICERR_OK; } -LRESULT MSRLE32_CompressRLE8(CodecInfo *pi, LPBITMAPINFOHEADER lpbiIn, LPBYTE lpIn, LPBITMAPINFOHEADER lpbiOut, LPBYTE lpOut, BOOL isKey) +LRESULT MSRLE32_CompressRLE8(const CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn, + const BYTE *lpIn, LPBITMAPINFOHEADER lpbiOut, + LPBYTE lpOut, BOOL isKey) { LPWORD lpC; LONG lDist, lInLine, lLine; @@ -820,8 +836,8 @@ LRESULT MSRLE32_CompressRLE8(CodecInfo *pi, LPBITMAPINFOHEADER lpbiIn, LPBYTE lp /*****************************************************************************/ -static LRESULT MSRLE32_DecompressRLE4(CodecInfo *pi, LPCBITMAPINFOHEADER lpbi, - LPBYTE lpIn, LPBYTE lpOut) +static LRESULT MSRLE32_DecompressRLE4(const CodecInfo *pi, LPCBITMAPINFOHEADER lpbi, + const BYTE *lpIn, LPBYTE lpOut) { int bytes_per_pixel; int line_size; @@ -982,8 +998,8 @@ static LRESULT MSRLE32_DecompressRLE4(CodecInfo *pi, LPCBITMAPINFOHEADER lpbi, return ICERR_OK; } -static LRESULT MSRLE32_DecompressRLE8(CodecInfo *pi, LPCBITMAPINFOHEADER lpbi, - LPBYTE lpIn, LPBYTE lpOut) +static LRESULT MSRLE32_DecompressRLE8(const CodecInfo *pi, LPCBITMAPINFOHEADER lpbi, + const BYTE *lpIn, LPBYTE lpOut) { int bytes_per_pixel; int line_size; @@ -1153,7 +1169,7 @@ static LRESULT Close(CodecInfo *pi) return 1; } -static LRESULT GetInfo(CodecInfo *pi, ICINFO *icinfo, DWORD dwSize) +static LRESULT GetInfo(const CodecInfo *pi, ICINFO *icinfo, DWORD dwSize) { /* pre-condition */ assert(pi != NULL); @@ -1192,7 +1208,7 @@ static LRESULT SetQuality(CodecInfo *pi, LONG lQuality) return ICERR_OK; } -static LRESULT Configure(CodecInfo *pi, HWND hWnd) +static LRESULT Configure(const CodecInfo *pi, HWND hWnd) { /* pre-condition */ assert(pi != NULL); @@ -1313,7 +1329,7 @@ static LRESULT CompressGetSize(CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn, return MSRLE32_GetMaxCompressedSize(lpbiOut); } -static LRESULT CompressQuery(CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn, +static LRESULT CompressQuery(const CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn, LPCBITMAPINFOHEADER lpbiOut) { /* pre-condition */

1 0

James Hawkins : msi: Set the UserSID and ProductCode properties for deferred custom actions.
by Alexandre Julliard 15 Jun '07

15 Jun '07

Module: wine Branch: master Commit: 3c444ea350e0688247bd2056b3861dac4af08fbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c444ea350e0688247bd2056b… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Jun 14 13:19:38 2007 -0700 msi: Set the UserSID and ProductCode properties for deferred custom actions. --- dlls/msi/custom.c | 64 ++++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 47 insertions(+), 17 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 9170a7e..c89acbf 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -38,6 +38,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(msi); static const WCHAR c_collen[] = {'C',':','\\',0}; static const WCHAR cszTempFolder[]= {'T','e','m','p','F','o','l','d','e','r',0}; + +static const WCHAR szActionData[] = { + 'C','u','s','t','o','m','A','c','t','i','o','n','D','a','t','a',0 +}; +static const WCHAR ProdCode[] = { + 'P','r','o','d','u','c','t','C','o','d','e',0 +}; +static const WCHAR UserSID[] = {'U','s','e','r','S','I','D',0}; + typedef struct tagMSIRUNNINGACTION { struct list entry; @@ -123,31 +132,48 @@ static BOOL check_execution_scheduling_options(MSIPACKAGE *package, LPCWSTR acti return TRUE; } -/* stores the CustomActionData before the action: - * [CustomActionData]Action +/* stores the following properties before the action: + * + * [CustomActionData;UserSID;ProductCode]Action */ -static LPWSTR msi_get_deferred_action(LPCWSTR action, LPCWSTR actiondata) +static LPWSTR msi_get_deferred_action(LPCWSTR action, LPCWSTR actiondata, + LPCWSTR usersid, LPCWSTR prodcode) { LPWSTR deferred; DWORD len; - static const WCHAR begin[] = {'[',0}; - static const WCHAR end[] = {']',0}; + static const WCHAR format[] = {'[','%','s',';','%','s',';','%','s',']','%','s',0}; if (!actiondata) return strdupW(action); - len = lstrlenW(action) + lstrlenW(actiondata) + 3; + len = lstrlenW(action) + lstrlenW(actiondata) + + lstrlenW(usersid) + lstrlenW(prodcode) + 5; deferred = msi_alloc(len * sizeof(WCHAR)); - lstrcpyW(deferred, begin); - lstrcatW(deferred, actiondata); - lstrcatW(deferred, end); - lstrcatW(deferred, action); - + sprintfW(deferred, format, actiondata, usersid, prodcode, action); return deferred; } +static void set_deferred_action_props(MSIPACKAGE *package, LPWSTR deferred_data) +{ + LPWSTR end, beg = deferred_data; + + end = strchrW(beg, ';'); + *end = '\0'; + MSI_SetPropertyW(package, szActionData, beg); + beg = end + 1; + + end = strchrW(beg, ';'); + *end = '\0'; + MSI_SetPropertyW(package, UserSID, beg); + beg = end + 1; + + end = strchrW(beg, ']'); + *end = '\0'; + MSI_SetPropertyW(package, ProdCode, beg); +} + UINT ACTION_CustomAction(MSIPACKAGE *package,LPCWSTR action, BOOL execute) { UINT rc = ERROR_SUCCESS; @@ -205,7 +231,9 @@ UINT ACTION_CustomAction(MSIPACKAGE *package,LPCWSTR action, BOOL execute) if (!execute) { LPWSTR actiondata = msi_dup_property(package, action); - LPWSTR deferred = msi_get_deferred_action(action, actiondata); + LPWSTR usersid = msi_dup_property(package, UserSID); + LPWSTR prodcode = msi_dup_property(package, ProdCode); + LPWSTR deferred = msi_get_deferred_action(action, actiondata, usersid, prodcode); if (type & msidbCustomActionTypeCommit) { @@ -219,23 +247,25 @@ UINT ACTION_CustomAction(MSIPACKAGE *package,LPCWSTR action, BOOL execute) } rc = ERROR_SUCCESS; + msi_free(actiondata); + msi_free(usersid); + msi_free(prodcode); msi_free(deferred); goto end; } else { - /*Set ActionData*/ - - static const WCHAR szActionData[] = { - 'C','u','s','t','o','m','A','c','t','i','o','n','D','a','t','a',0}; static const WCHAR szBlank[] = {0}; + LPWSTR actiondata = msi_dup_property( package, action ); + if (deferred_data) - MSI_SetPropertyW(package,szActionData,deferred_data); + set_deferred_action_props(package, deferred_data); else if (actiondata) MSI_SetPropertyW(package,szActionData,actiondata); else MSI_SetPropertyW(package,szActionData,szBlank); + msi_free(actiondata); } }

1 0

Dmitry Timoshkov : msi: Simplify the code.
by Alexandre Julliard 15 Jun '07

15 Jun '07

Module: wine Branch: master Commit: 6076485fde9baf2e3bc109267e91761b14de9a90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6076485fde9baf2e3bc109267… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri Jun 15 17:43:40 2007 +0900 msi: Simplify the code. --- dlls/msi/action.c | 24 +++++++----------------- 1 files changed, 7 insertions(+), 17 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 00ed572..d09ddd0 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -4587,30 +4587,20 @@ static LONG env_set_flags( LPCWSTR *name, LPWSTR *value, DWORD *flags ) static const WCHAR prefix[] = {'[','~',']',0}; *flags = 0; - while (*cptr && (*cptr == '=' || *cptr == '+' || - *cptr == '-' || *cptr == '!' || *cptr == '*')) + while (*cptr) { - switch (*cptr) - { - case '=': + if (*cptr == '=') *flags |= ENV_ACT_SETALWAYS; - break; - case '+': + else if (*cptr == '+') *flags |= ENV_ACT_SETABSENT; - break; - case '-': + else if (*cptr == '-') *flags |= ENV_ACT_REMOVE; - break; - case '!': + else if (*cptr == '!') *flags |= ENV_ACT_REMOVEMATCH; - break; - case '*': + else if (*cptr == '*') *flags |= ENV_MOD_MACHINE; + else break; - default: - ERR("Unknown Environment flag: %c\n", *cptr); - return ERROR_FUNCTION_FAILED; - } cptr++; (*name)++;

1 0

Ulrich Czekalla : opengl: Use get_glxdrawable to grab the drawable.
by Alexandre Julliard 15 Jun '07

15 Jun '07

Module: wine Branch: master Commit: 191a29c1e71a26f9661c1f5c9a6d1c173efab1bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=191a29c1e71a26f9661c1f5c9… Author: Ulrich Czekalla <ulrich.czekalla(a)utoronto.ca> Date: Thu Jun 14 11:02:50 2007 -0400 opengl: Use get_glxdrawable to grab the drawable. --- dlls/winex11.drv/opengl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 0e2f9ee..98405c1 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1505,7 +1505,7 @@ BOOL X11DRV_wglMakeCurrent(X11DRV_PDEVICE *physDev, HGLRC hglrc) { NtCurrentTeb()->glContext = NULL; } else { Wine_GLContext *ctx = (Wine_GLContext *) hglrc; - Drawable drawable = physDev->drawable; + Drawable drawable = get_glxdrawable(physDev); if (ctx->ctx == NULL) { /* The describe lines below are for debugging purposes only */ if (TRACE_ON(wgl)) {

1 0

Lei Zhang : user32: Remove a unused variable from ES_PASSWORD test.
by Alexandre Julliard 15 Jun '07

15 Jun '07

Module: wine Branch: master Commit: dd88237d3ec21ec44bdd500bad02b079c9894943 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd88237d3ec21ec44bdd500ba… Author: Lei Zhang <thestig(a)google.com> Date: Thu Jun 14 11:25:17 2007 -0700 user32: Remove a unused variable from ES_PASSWORD test. --- dlls/user32/tests/edit.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 2bdf0ed..a4f7be7 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -1006,13 +1006,10 @@ static void test_text_position(void) static void test_espassword(void) { HWND hwEdit; - MSG msMessage; LONG r; char buffer[1024]; const char* password = "secret"; - msMessage.message = WM_KEYDOWN; - hwEdit = create_editcontrol(ES_PASSWORD, 0); r = get_edit_style(hwEdit); ok(r == ES_PASSWORD, "Wrong style expected 0x%x got: 0x%x\n", ES_PASSWORD, r);

1 0

Jacek Caban : mshtml: Use IOleInPlaceSiteEx if available.
by Alexandre Julliard 15 Jun '07

15 Jun '07

Module: wine Branch: master Commit: cf0c911305cba1cddd9725f16305364fd9baa3c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf0c911305cba1cddd9725f16… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 14 21:10:07 2007 +0200 mshtml: Use IOleInPlaceSiteEx if available. --- dlls/mshtml/olewnd.c | 14 ++++++++++++-- dlls/mshtml/view.c | 13 ++++++++++++- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/olewnd.c b/dlls/mshtml/olewnd.c index d91e792..8fe6091 100644 --- a/dlls/mshtml/olewnd.c +++ b/dlls/mshtml/olewnd.c @@ -202,8 +202,18 @@ static HRESULT WINAPI OleInPlaceObjectWindowless_InPlaceDeactivate(IOleInPlaceOb } This->in_place_active = FALSE; - if(This->ipsite) - IOleInPlaceSite_OnInPlaceDeactivate(This->ipsite); + if(This->ipsite) { + IOleInPlaceSiteEx *ipsiteex; + HRESULT hres; + + hres = IOleInPlaceSite_QueryInterface(This->ipsite, &IID_IOleInPlaceSiteEx, (void**)&ipsiteex); + if(SUCCEEDED(hres)) { + IOleInPlaceSiteEx_OnInPlaceDeactivateEx(ipsiteex, TRUE); + IOleInPlaceSiteEx_Release(ipsiteex); + }else { + IOleInPlaceSite_OnInPlaceDeactivate(This->ipsite); + } + } return S_OK; } diff --git a/dlls/mshtml/view.c b/dlls/mshtml/view.c index 4c7cea9..cbd8c89 100644 --- a/dlls/mshtml/view.c +++ b/dlls/mshtml/view.c @@ -227,6 +227,7 @@ static HRESULT activate_window(HTMLDocument *This) IOleInPlaceUIWindow *pIPWnd; IOleInPlaceFrame *pIPFrame; IOleCommandTarget *cmdtrg; + IOleInPlaceSiteEx *ipsiteex; RECT posrect, cliprect; OLEINPLACEFRAMEINFO frameinfo; HWND parent_hwnd; @@ -289,7 +290,17 @@ static HRESULT activate_window(HTMLDocument *This) } This->in_place_active = TRUE; - hres = IOleInPlaceSite_OnInPlaceActivate(This->ipsite); + hres = IOleInPlaceSite_QueryInterface(This->ipsite, &IID_IOleInPlaceSiteEx, (void**)&ipsiteex); + if(SUCCEEDED(hres)) { + BOOL redraw = FALSE; + + hres = IOleInPlaceSiteEx_OnInPlaceActivateEx(ipsiteex, &redraw, 0); + IOleInPlaceSiteEx_Release(ipsiteex); + if(redraw) + FIXME("unsupported redraw\n"); + }else{ + hres = IOleInPlaceSite_OnInPlaceActivate(This->ipsite); + } if(FAILED(hres)) { WARN("OnInPlaceActivate failed: %08x\n", hres); This->in_place_active = FALSE;

1 0