- wine-devel - winehq.org

Re: [PATCH 5/5] d3dcompiler: Implement basic expressions parsing.
by Stefan Dösinger 17 Jul '12

17 Jul '12

Am Montag, 16. Juli 2012, 20:39:23 schrieb Matteo Bruni: > + HLSL_IR_BINOP_MUL, > ... > + HLSL_IR_BINOP_DOT, HLSL has 3 somewhat related multiplication operations: "*", "mul" and "dot". Dot is fairly straightforward, but "*" and "mul" have subtle differences. I recommend to write tests to find out the exact details, but as far as I remember "float4 * float4" gives you a float4 with a component-wise multiplication, whereas mul(float, float) returns a scalar like the dot product. "float4x4 * float4" is an error, but mul(float4x4, float4) performs a matrix-vector multiplication and returns a float4. > +static struct hlsl_type *expr_common_type(struct hlsl_type *t1, struct > hlsl_type *t2, > + struct source_location *loc) This type inference system might be a bit too limited, you have to take the operation into account. e.g. a dot(float3, float4) returns a scalar and crs(float4, float4) returns a float3.

2 1

Re: riched20: Avoid uninitialized field in STGMEDIUM structure (LLVM/Clang).
by Alexandre Julliard 17 Jul '12

17 Jul '12

Nicolas Le Cam <niko.lecam(a)gmail.com> writes: > @@ -1098,6 +1098,8 @@ static BOOL ME_RTFInsertOleObject(RTF_Info *info, HENHMETAFILE hemf, HBITMAP hbm > BOOL ret = FALSE; > DWORD conn; > > + memset(&stgm, 0, sizeof(stgm)); > + Please fix the bugs (if any) instead of silencing the warnings by memsetting everything to 0. -- Alexandre Julliard julliard(a)winehq.org

1 0

re: msvcp90: handle npos as a len in basic_string<>::replace
by Dan Kegel 16 Jul '12

16 Jul '12

Daniel Lehman wrote: @@ -1949,7 +1949,7 @@ basic_string_char* __thiscall basic_string_char_replace_cstr_len(basic_string_ch - if(off+len > this->size) + if(off+len < off || off+len > this->size) len = this->size-off; Wouldn't this be more elegant: if(num > this->size-pos) num = this->size-pos; ? Also, you may have missed the similar case in basic_string_char_compare_substr_cstr_len (which uses 'pos' and 'num' rather than 'off' and 'len'). See http://bugs.winehq.org/show_bug.cgi?id=31085#c5

2 1

Build failure of "[PATCH 5/5] kernel32/tests: Add a IOCTL_DVD_READ_STRUCTURE (DvdManufacturerDescriptor) test (try 4)" ?
by GOUJON Alexandre 16 Jul '12

16 Jul '12

Hi, My patch (http://source.winehq.org/patches/data/88072) is marked as "Build failure". I tried with the latest (today) HEAD and I successfully applied it. Compilation also works for me at least on my x86 and x86_64 computers. Moreover, the Wine Test Bot tested it without any issue, see https://testbot.winehq.org/JobDetails.pl?Key=19936. I know your machine is a bit "mystic". Can you show me your output to help me diagnosing your build failure ? Thanks

2 2

Re: msi/tests: Mark some test results as broken.
by Marvin 16 Jul '12

16 Jul '12

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://testbot.winehq.org/JobDetails.pl?Key=20071 Your paranoid android. === WNT4WSSP6 (32 bit install) === install.c:6053: Test failed: Per-user icon file isn't where it's expected (C:\WINNT\Profiles\Default User\Application Data\Microsoft\Installer\{7DF88A49-996F-4EC8-A022-BF956F9B2CBB}\testicon)

1 0

Re: kernel32: Also report empty drives as available in GetLogicalDrives
by Alexandre Julliard 16 Jul '12

16 Jul '12

Alexandre Goujon <ale.goujon(a)gmail.com> writes: > --- > dlls/kernel32/volume.c | 13 ++++++++++--- > 1 file changed, 10 insertions(+), 3 deletions(-) > > diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c > index 8377e41..67e2eb1 100644 > --- a/dlls/kernel32/volume.c > +++ b/dlls/kernel32/volume.c > @@ -1441,19 +1441,26 @@ DWORD WINAPI GetLogicalDrives(void) > DWORD ret = 0; > int i; > > - if (!(buffer = HeapAlloc( GetProcessHeap(), 0, strlen(config_dir) + sizeof("/dosdevices/a:") ))) > + if (!(buffer = HeapAlloc( GetProcessHeap(), 0, strlen(config_dir) + sizeof("/dosdevices/a::") ))) > { > SetLastError( ERROR_NOT_ENOUGH_MEMORY ); > return 0; > } > strcpy( buffer, config_dir ); > - strcat( buffer, "/dosdevices/a:" ); > - dev = buffer + strlen(buffer) - 2; > + strcat( buffer, "/dosdevices/a::" ); > + dev = buffer + strlen(buffer) - 3; > > for (i = 0; i < 26; i++) > { > *dev = 'a' + i; > + dev[2] = 0; > if (!stat( buffer, &st )) ret |= (1 << i); > + /* Windows also report empty drives as available */ > + else > + { > + dev[2] = ':'; > + if (!stat( buffer, &st )) ret |= (1 << i); > + } You can't do that, the device symlinks don't reflect the availability of the drive. It would have to go through the mountmgr. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 3/9] hhctrl.ocx: Centralize merging HH_WINTYPE data (resend).
by Alexandre Julliard 16 Jul '12

16 Jul '12

"Erich E. Hoover" <ehoover(a)mymail.mines.edu> writes: > @@ -28,6 +28,13 @@ > > WINE_DEFAULT_DEBUG_CHANNEL(htmlhelp); > > +#define HHWIN_PARAM_MASK (HHWIN_PARAM_PROPERTIES|HHWIN_PARAM_STYLES|HHWIN_PARAM_EXSTYLES|HHWIN_PARAM_RECT\ > + |HHWIN_PARAM_NAV_WIDTH|HHWIN_PARAM_SHOWSTATE|HHWIN_PARAM_INFOTYPES\ > + |HHWIN_PARAM_TB_FLAGS|HHWIN_PARAM_EXPANSION|HHWIN_PARAM_TABPOS\ > + |HHWIN_PARAM_TABORDER|HHWIN_PARAM_HISTORY_COUNT|HHWIN_PARAM_CUR_TAB) > +#define MERGE_PARAM(s,d,o,p) ((s->fsValidMembers & p) && (!(d->fsValidMembers & p) || o)) > +#define MERGE_PROP(s,d,o,p) (s->p != 0 && (d->p == 0 || o)) These macros are fairly ugly, you should be able to do without that. > @@ -1752,16 +1752,16 @@ void ReleaseHelpViewer(HHInfo *info) > list_remove(&info->entry); > > /* Free allocated strings */ > - heap_free(info->pszType); > - heap_free(info->pszCaption); > - heap_free(info->pszToc); > - heap_free(info->pszIndex); > - heap_free(info->pszFile); > - heap_free(info->pszHome); > - heap_free(info->pszJump1); > - heap_free(info->pszJump2); > - heap_free(info->pszUrlJump1); > - heap_free(info->pszUrlJump2); > + heap_free((LPVOID)info->WinType.pszType); > + heap_free((LPVOID)info->WinType.pszCaption); > + heap_free((LPVOID)info->WinType.pszToc); > + heap_free((LPVOID)info->WinType.pszIndex); > + heap_free((LPVOID)info->WinType.pszFile); > + heap_free((LPVOID)info->WinType.pszHome); > + heap_free((LPVOID)info->WinType.pszJump1); > + heap_free((LPVOID)info->WinType.pszJump2); > + heap_free((LPVOID)info->WinType.pszUrlJump1); > + heap_free((LPVOID)info->WinType.pszUrlJump2); Don't do that. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 6/6] jscript: Don't set constructor property to each object instance, it belongs to their prototypes
by Marvin 16 Jul '12

16 Jul '12

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://testbot.winehq.org/JobDetails.pl?Key=20070 Your paranoid android. === WNT4WSSP6 (32 bit) === No test summary line found === W2KPROSP4 (32 bit) === No test summary line found === WXPPROSP3 (32 bit) === No test summary line found === W2K3R2SESP2 (32 bit) === No test summary line found === WVISTAADM (32 bit) === No test summary line found === W7PRO (32 bit) === No test summary line found === W7PROX64 (32 bit) === No test summary line found === TEST64_W7SP1 (32 bit) === No test summary line found === W7PROX64 (64 bit) === No test summary line found === TEST64_W7SP1 (64 bit) === No test summary line found

1 0

Re: [PATCH 5/6] jscript: Expose RegExpError constructor in global object
by Marvin 16 Jul '12

16 Jul '12

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://testbot.winehq.org/JobDetails.pl?Key=20069 Your paranoid android. === WNT4WSSP6 (32 bit) === No test summary line found === W2KPROSP4 (32 bit) === No test summary line found === WXPPROSP3 (32 bit) === No test summary line found === W2K3R2SESP2 (32 bit) === No test summary line found === WVISTAADM (32 bit) === No test summary line found === W7PRO (32 bit) === No test summary line found === W7PROX64 (32 bit) === No test summary line found === TEST64_W7SP1 (32 bit) === No test summary line found === W7PROX64 (64 bit) === No test summary line found === TEST64_W7SP1 (64 bit) === No test summary line found

1 0

Re: [PATCH 4/6] jscript: Properly set Error object's constructor property
by Marvin 16 Jul '12

16 Jul '12

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://testbot.winehq.org/JobDetails.pl?Key=20068 Your paranoid android. === WNT4WSSP6 (32 bit) === No test summary line found === W2KPROSP4 (32 bit) === No test summary line found === WXPPROSP3 (32 bit) === No test summary line found === W2K3R2SESP2 (32 bit) === No test summary line found === WVISTAADM (32 bit) === No test summary line found === W7PRO (32 bit) === No test summary line found === W7PROX64 (32 bit) === No test summary line found === TEST64_W7SP1 (32 bit) === No test summary line found === W7PROX64 (64 bit) === No test summary line found === TEST64_W7SP1 (64 bit) === No test summary line found

1 0

Re: [PATCH 3/6] jscript: Properly set Function constructor's constructor property
by Marvin 16 Jul '12

16 Jul '12

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://testbot.winehq.org/JobDetails.pl?Key=20067 Your paranoid android. === WNT4WSSP6 (32 bit) === No test summary line found === W2KPROSP4 (32 bit) === No test summary line found === WXPPROSP3 (32 bit) === No test summary line found === W2K3R2SESP2 (32 bit) === No test summary line found === WVISTAADM (32 bit) === No test summary line found === W7PRO (32 bit) === No test summary line found === W7PROX64 (32 bit) === No test summary line found === TEST64_W7SP1 (32 bit) === No test summary line found === W7PROX64 (64 bit) === No test summary line found === TEST64_W7SP1 (64 bit) === No test summary line found

1 0

Re: [PATCH 2/6] jscript: Properly handle constructor property for most builtin constructors
by Marvin 16 Jul '12

16 Jul '12

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://testbot.winehq.org/JobDetails.pl?Key=20066 Your paranoid android. === WNT4WSSP6 (32 bit) === No test summary line found === W2KPROSP4 (32 bit) === No test summary line found === WXPPROSP3 (32 bit) === No test summary line found === W2K3R2SESP2 (32 bit) === No test summary line found === WVISTAADM (32 bit) === No test summary line found === W7PRO (32 bit) === No test summary line found === W7PROX64 (32 bit) === No test summary line found === TEST64_W7SP1 (32 bit) === No test summary line found === W7PROX64 (64 bit) === No test summary line found === TEST64_W7SP1 (64 bit) === No test summary line found

1 0

Re: [PATCH 1/6] jscript: Properly set Number.prototyp.constructor
by Marvin 16 Jul '12

16 Jul '12

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://testbot.winehq.org/JobDetails.pl?Key=20065 Your paranoid android. === WNT4WSSP6 (32 bit) === No test summary line found === W2KPROSP4 (32 bit) === No test summary line found === WXPPROSP3 (32 bit) === No test summary line found === W2K3R2SESP2 (32 bit) === No test summary line found === WVISTAADM (32 bit) === No test summary line found === W7PRO (32 bit) === No test summary line found === W7PROX64 (32 bit) === No test summary line found === TEST64_W7SP1 (32 bit) === No test summary line found === W7PROX64 (64 bit) === No test summary line found === TEST64_W7SP1 (64 bit) === No test summary line found

1 0

mshtml: Always set the URL policy in the error cases?
by Francois Gouget 16 Jul '12

16 Jul '12

gcc 4.7 is complaining that policy may be used uninitialized in InternetHostSecurityManager_QueryCustomPolicy() and indeed there are many error cases in confirm_safety_load() and confirm_safety() where the policy is not set. The patch belowe seems to plug all these holes but I don't know if it really makes sense. diff --git a/dlls/mshtml/secmgr.c b/dlls/mshtml/secmgr.c index ff349ac..3f64a42 100644 --- a/dlls/mshtml/secmgr.c +++ b/dlls/mshtml/secmgr.c @@ -104,10 +104,9 @@ static HRESULT confirm_safety_load(HTMLDocumentNode *This, struct CONFIRMSAFETY CATID init_catid = CATID_SafeForInitializing; hres = ICatInformation_IsClassOfCategories(This->catmgr, &cs->clsid, 1, &init_catid, 0, NULL); + *ret = hres == S_OK ? URLPOLICY_ALLOW : URLPOLICY_DISALLOW; if(FAILED(hres)) return hres; - - *ret = hres == S_OK ? URLPOLICY_ALLOW : URLPOLICY_DISALLOW; } return S_OK; @@ -157,13 +156,17 @@ static HRESULT confirm_safety(HTMLDocumentNode *This, const WCHAR *url, struct C if(!This->catmgr) { hres = CoCreateInstance(&CLSID_StdComponentCategoriesMgr, NULL, CLSCTX_INPROC_SERVER, &IID_ICatInformation, (void**)&This->catmgr); - if(FAILED(hres)) + if(FAILED(hres)) { + *ret = URLPOLICY_DISALLOW; return hres; + } } hres = ICatInformation_IsClassOfCategories(This->catmgr, &cs->clsid, 1, &scripting_catid, 0, NULL); - if(FAILED(hres)) + if(FAILED(hres)) { + *ret = URLPOLICY_DISALLOW; return hres; + } if(hres != S_OK) { *ret = URLPOLICY_DISALLOW; -- 1.7.10

2 3

Re: [1/9] gdiplus: Make sure that GdipBitmapLockBits stores valid lockmode.
by Vincent Povirk 16 Jul '12

16 Jul '12

I think this is a correct change, even though it looks wrong. If you use some invalid flag and/or add a comment, that may help explain what you're doing.

1 0

Re: [1/2] gdiplus: Make sure that 1bpp bitmap images get loaded in native format.
by Vincent Povirk 16 Jul '12

16 Jul '12

Uh, this is going to cause regressions if you don't give the image a palette.

2 2

Re: [4/4] gdiplus: GdipMeasureString operates internally in pixels but in/out rectangles are in device units. Resend.
by Vincent Povirk 16 Jul '12

16 Jul '12

Values returned from Measure[String|CharacterRanges] have to match what DrawString will draw. If they don't currently match, you need to explain why that is. If they do, you need to bring DrawString into line as well.

1 0

re: Query MediaType of SD-Cards using IOCTL_GET_DISK_DRIVE_GEOMETRY
by Dan Kegel 15 Jul '12

15 Jul '12

> Is it worth for working on patches for these issues, or is this > completely impossible with the current architecture? Do you know yet why no symlink is made in dosdevices for /media/XXXX-YYYY? I haven't heard any rumblings about the current architecture being hopelessly broken.

2 1

Re: dsound: Add detection of output format and allow a maximum of 8 channels
by Andrew Eikum 14 Jul '12

14 Jul '12

Thanks, Donny. Nice work overall. Some comments below. On Fri, Jul 13, 2012 at 05:57:48PM +1000, Donny Yang wrote: > This patch makes dsound automatically get the output format when a > output device is initialised and also allows up to 8 output channels > to be used for ALSA and PulseAudio. Using ALSA with over 2 channels > outputs the channels in the wrong speakers with my testing but I don't > know why so I can't fix that. You probably already discovered that ALSA's multi-channel support is primitive at best. You have to test each channel and hand-craft an asoundrc to match your hardware. See some more information here: <http://drona.csa.iisc.ernet.in/~uday/alsamch.shtml> > @@ -1492,6 +1493,24 @@ HRESULT DirectSoundDevice_Initialize(DirectSoundDevice ** ppDevice, LPCGUID lpcG > } else > WARN("DSOUND_PrimaryCreate failed: %08x\n", hr); > > + hr = IAudioClient_GetMixFormat(device->client, &pwfx); > + if(FAILED(hr)){ > + WARN("IAudioClient_GetMixFormat failed: %08x; Falling back to default output format\n", hr); > + }else{ > + DWORD oldPriolevel = device->priolevel; > + device->priolevel = DSSCL_WRITEPRIMARY; > + hr = primarybuffer_SetFormat(device, pwfx); > + device->priolevel = oldPriolevel; This looks like a hack. I think it fits better in DirectSoundDevice_Create, where the default values are copied in. Is there a reason it couldn't be done there? > -void put_mono2stereo(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) > +void put_mono(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) > { > - dsb->put_aux(dsb, pos, 0, value); > - dsb->put_aux(dsb, pos, 1, value); > + /* XXX: Is this how Windows does this? */ > + DWORD c; > + for (c = 0; c < dsb->device->pwfx->nChannels; ++c) > + dsb->put_aux(dsb, pos, c, value); > } > I think this is fine. I wonder if we should skip the LOWFREQ channel, though we'd have to be careful not to affect performance too much, as this runs in a really tight loop. > void mixieee32(float *src, float *dst, unsigned samples) > diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c > index 072b25a..538534d 100644 > --- a/dlls/dsound/dsound_main.c > +++ b/dlls/dsound/dsound_main.c > @@ -642,7 +642,7 @@ DirectSoundCaptureEnumerateW( > */ > > typedef HRESULT (*FnCreateInstance)(REFIID riid, LPVOID *ppobj); > - > + > typedef struct { > IClassFactory IClassFactory_iface; > REFCLSID rclsid; > @@ -702,7 +702,7 @@ static HRESULT WINAPI DSCF_CreateInstance( > *ppobj = NULL; > return This->pfnCreateInstance(riid, ppobj); > } > - > + > static HRESULT WINAPI DSCF_LockServer(LPCLASSFACTORY iface, BOOL dolock) > { > IClassFactoryImpl *This = impl_from_IClassFactory(iface); The only changes to this file are whitespace changes. I'd exclude these changes when you resend. > diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h > index 1cf6daa..68f6242 100644 > --- a/dlls/dsound/dsound_private.h > +++ b/dlls/dsound/dsound_private.h > @@ -202,7 +202,7 @@ struct IDirectSoundBufferImpl > }; > > float get_mono(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel) DECLSPEC_HIDDEN; > -void put_mono2stereo(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN; > +void put_mono(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN; > > HRESULT IDirectSoundBufferImpl_Create( > DirectSoundDevice *device, > @@ -288,7 +288,7 @@ HRESULT primarybuffer_SetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX wfex) > LONG capped_refcount_dec(LONG *ref) DECLSPEC_HIDDEN; > > /* duplex.c */ > - > + > HRESULT DSOUND_FullDuplexCreate(REFIID riid, LPDIRECTSOUNDFULLDUPLEX* ppDSFD) DECLSPEC_HIDDEN; > > /* mixer.c */ > @@ -305,7 +305,7 @@ DWORD CALLBACK DSOUND_mixthread(void *ptr) DECLSPEC_HIDDEN; > void DSOUND_Calc3DBuffer(IDirectSoundBufferImpl *dsb) DECLSPEC_HIDDEN; > > /* capture.c */ > - > + > HRESULT DSOUND_CaptureCreate(REFIID riid, LPDIRECTSOUNDCAPTURE *ppDSC) DECLSPEC_HIDDEN; > HRESULT DSOUND_CaptureCreate8(REFIID riid, LPDIRECTSOUNDCAPTURE8 *ppDSC8) DECLSPEC_HIDDEN; > Likewise, more unneeded whitespace changes. > diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c > index 93e2b8d..fa6b05a 100644 > --- a/dlls/winealsa.drv/mmdevdrv.c > +++ b/dlls/winealsa.drv/mmdevdrv.c > @@ -1544,7 +1544,7 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, > goto exit; > } > if(max > 8) > - max = 2; > + max = 8; > if(fmt->nChannels > max){ > hr = S_FALSE; > closest->nChannels = max; > @@ -1649,8 +1649,8 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, > goto exit; > } > > - if(max_channels > 2) > - fmt->Format.nChannels = 2; > + if(max_channels > 8) > + fmt->Format.nChannels = 8; > else > fmt->Format.nChannels = max_channels; > This needs to be a separate patch. Also, winealsa's multi-channel handling needs a closer examination. My current thinking is GetMixFormat should just return some sane, supported default (2ch, 48kHz, 16bps, or less as supported). It seems impossible to detect what the ALSA device actually supports, so we probably shouldn't even try like we do now. > diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c > index b374b53..e86ed08 100644 > --- a/dlls/winepulse.drv/mmdevdrv.c > +++ b/dlls/winepulse.drv/mmdevdrv.c > @@ -1050,13 +1050,13 @@ static HRESULT pulse_spec_from_waveformat(ACImpl *This, const WAVEFORMATEX *fmt) > This->ss.format = PA_SAMPLE_INVALID; > switch(fmt->wFormatTag) { > case WAVE_FORMAT_IEEE_FLOAT: > - if (!fmt->nChannels || fmt->nChannels > 2 || fmt->wBitsPerSample != 32) > + if (!fmt->nChannels || fmt->nChannels > 8 || fmt->wBitsPerSample != 32) > break; > This->ss.format = PA_SAMPLE_FLOAT32LE; > pa_channel_map_init_auto(&This->map, fmt->nChannels, PA_CHANNEL_MAP_ALSA); > break; > case WAVE_FORMAT_PCM: > - if (!fmt->nChannels || fmt->nChannels > 2) > + if (!fmt->nChannels || fmt->nChannels > 8) > break; > if (fmt->wBitsPerSample == 8) > This->ss.format = PA_SAMPLE_U8; Wine doesn't have a PulseAudio driver yet, so this chunk won't apply. Andrew

2 2

GetDriveType and empty CD/DVD-ROM drives
by GOUJON Alexandre 14 Jul '12

14 Jul '12

Hi, I'm currently working on bug #17037. The root cause is that GetDriveType("D:\") (if D is mapped to /dev/cdrom) returns DRIVE_NO_ROOT_DIR while on Windows it returns DRIVE_CDROM when there is no disc in the D drive. GetDriveType tries to open D:\ which is converted into \\??\\D:\\ then ~/.wine/dosdevices/d:/ The fact is that there is a dosdevices/d:: file (symlinked to /dev/cdrom) but no dosdevices/d: except if a CD or DVD is in and mounted somewhere. The conversion \\??\\D:\\ -> ~/.wine/dosdevices/d:/ is done in wine_nt_to_unix_file_name (ntdll/directory.c, line 2897). I'm asking here because I wonder if modifying wine_nt_to_unix_file_name is the right thing to do and sane: it's called at several locations and I don't want to cause trouble and regressions, well, if possible. Thanks for any advice

1 0

Suppressing My Computer in File Open dialog box?
by Dan Kegel 14 Jul '12

14 Jul '12

I'm creating a page of tips at http://wiki.winehq.org/DisplayingUnixFilenames for vendors shipping Windows apps on Linux with Wine who want their apps to use Windows paths throughout internally, but display Linux paths in the GUI This is something I've been meaning to do ever since I helped port Picasa. Picasa was an easy case, since it didn't use any standard widgets. So now I'm wondering how to coax standard widgets into not leaking Windows paths or naming conventions visually. Does anyone know how to keep the Save File dialog box from listing My Computer in the LookIn pulldown? (I know how to keep it from showing /, but I'd like to do the opposite, and *only* show / and maybe the user's home directory, if possible.)

2 2

Re: dsound: Add support for adjusting volume of more than 2 channels
by Andrew Eikum 13 Jul '12

13 Jul '12

On Fri, Jul 13, 2012 at 05:59:03PM +1000, Donny Yang wrote: > - if (channels != 1 && channels != 2) > - { > - FIXME("There is no support for %u channels\n", channels); > + if (dsb->device->pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE) > + channelMask = ((WAVEFORMATEXTENSIBLE*)dsb->device->pwfx)->dwChannelMask; > + else if (channels == 1) > + channelMask = SPEAKER_FRONT_CENTER; > + else if (channels == 2) > + channelMask = SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT; > + else { > + FIXME("There is no support for %u channels without an extensible wave format\n", channels); > return; > } Before you resend, please consider testing how Windows behaves in this condition. Does it actually refuse to apply any volume at all? Andrew

1 0

Re: [PATCH 9/9] mshtml: Added test of calling IDispatchEx properties
by Marvin 13 Jul '12

13 Jul '12

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://testbot.winehq.org/JobDetails.pl?Key=19995 Your paranoid android. === W2KPROSP4 (32 bit) === No test summary line found === WXPPROSP3 (32 bit) === No test summary line found === W2K3R2SESP2 (32 bit) === No test summary line found === WVISTAADM (32 bit) === No test summary line found === W7PRO (32 bit) === No test summary line found === W7PROX64 (32 bit) === No test summary line found === TEST64_W7SP1 (32 bit) === No test summary line found === W7PROX64 (64 bit) === No test summary line found === TEST64_W7SP1 (64 bit) === No test summary line found

1 0

Re: Comdlg32: Select initial text in edit control (try 2)
by Dmitry Timoshkov 13 Jul '12

13 Jul '12

Suresh Murty <murtys.wine(a)gmail.com> wrote: > Sends a EM_SETSEL message after the initial text has been set. This is wrong place for both a test and a fix. The text should be selected on focus by a dialog control itself. -- Dmitry.

1 0

Re: Comdlg32: Select initial text in edit control (try 2)
by Marvin 13 Jul '12

13 Jul '12

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://testbot.winehq.org/JobDetails.pl?Key=19988 Your paranoid android. === W7PROX64 (32 bit filedlg) === filedlg: unhandled exception c0000005 at 75B94C19

1 0

Re: joy.cpl: Correct joystick testing thread behavior
by Alexandre Julliard 12 Jul '12

12 Jul '12

Lucas Zawacki <lfzawacki(a)gmail.com> writes: > @@ -419,14 +421,19 @@ static INT_PTR CALLBACK test_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM > SendDlgItemMessageW(hwnd, IDC_TESTSELECTCOMBO, CB_SETCURSEL, 0, 0); > test_handle_joychange(hwnd, data); > > - thread = CreateThread(NULL, 0, input_thread, (void*) data, 0, &tid); > + ResumeThread(thread); > } > } > break; > > + case PSN_KILLACTIVE: > + SuspendThread(thread); > + break; You never want to use SuspendThread, it can't possibly work reliably. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [2/2] scrrun: Added IDispatch support for IFileSystem3
by Alistair Leslie-Hughes 12 Jul '12

12 Jul '12

On 12/07/2012 5:02 PM, Nikolay Sivov wrote: > For http://bugs.winehq.org/show_bug.cgi?id=9638 and similar cases > I have already submitted a patch for this http://source.winehq.org/patches/data/87925 Best Regards Alistair Leslie-Hughes

2 2

Re: [PATCH 4/5] winex11: Release memory on xrandr cleanup.
by Alexandre Julliard 12 Jul '12

12 Jul '12

Henri Verbeet <hverbeet(a)codeweavers.com> writes: > diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c > index 83137a4..a8dccd4 100644 > --- a/dlls/winex11.drv/xrandr.c > +++ b/dlls/winex11.drv/xrandr.c > @@ -289,6 +289,12 @@ done: > wine_tsx11_unlock(); > } > > +void X11DRV_XRandR_Cleanup(void) > +{ > + HeapFree( GetProcessHeap(), 0, real_xrandr_rates_count ); > + HeapFree( GetProcessHeap(), 0, real_xrandr_rates ); > +} It's not worth adding complexity to free memory, in practice the graphics driver is never going to be unloaded except at process exit. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: msi: fix incorrect decoding of msi stream-names
by Hans Leidekker 12 Jul '12

12 Jul '12

On Wed, 2012-07-11 at 15:03 +0000, Oleg Jakobsen wrote: > @@ -203,6 +203,7 @@ BOOL decode_streamname(LPCWSTR in, LPWSTR out) > *out++ = mime2utf(ch&0x3f); > count++; > ch = mime2utf((ch>>6)&0x3f); > + continue; > } > } > *out++ = ch; Why is it incorrect? It seems to me that the upper bits should be written as the next character but now you are discarding them.

2 1

Re: [2/2] windowscodecs: Add a test for palette associated with black&white TIFF image.
by Marvin 12 Jul '12

12 Jul '12

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://testbot.winehq.org/JobDetails.pl?Key=19971 Your paranoid android. === WXPPROSP3 (32 bit tiffformat) === tiffformat.c:115: Test failed: CreateDecoderFromStream error 0x88982f8e tiffformat: unhandled exception c0000005 at 00413EB2 === WVISTAADM (32 bit tiffformat) === tiffformat.c:115: Test failed: CreateDecoderFromStream error 0x88982f8e tiffformat: unhandled exception c0000005 at 00413EB2

1 0

Re: msi: fix incorrect decoding of msi stream-names
by Nikolay Sivov 12 Jul '12

12 Jul '12

On 7/11/2012 18:03, Oleg Jakobsen wrote: > Looked at how you decode msi-stream names, and spotted a minor error > whith the decoding. > > regards > Oleg > > Why do you think it's an error? Looks like in this case it decodes one input WCHAR to two output WCHARs in a single pass.

1 0

Re: [3/5] windowscodecs: Create a predefined black&white palette if 1 bpp TIFF image doesn't have one.
by Vincent Povirk 11 Jul '12

11 Jul '12

Are you sure about this? My understanding is that the result of CopyPalette is unspecified when your pixel format is not an indexed color format (in this case, a grayscale format). So, while it's not really a problem to do that (unless a program relies on the exact behavior of this decoder, which seems unlikely), for correctness you shouldn't ever be relying on this change.

2 5

Re: msvcrt: Add bsearch_s implementation by reusing code and tests from ntdll (resend)
by Alexandre Julliard 11 Jul '12

11 Jul '12

André Hentschel <nerv(a)dawncrow.de> writes: > @@ -39,10 +44,19 @@ static void init(void) > pmemcpy_s = (void*)GetProcAddress(hmod, "memcpy_s"); > pI10_OUTPUT = (void*)GetProcAddress(hmod, "$I10_OUTPUT"); > pstrerror_s = (void *)GetProcAddress(hmod, "strerror_s"); > + pbsearch_s = (void *)GetProcAddress(hmod, "bsearch_s"); > p_get_doserrno = (void *)GetProcAddress(hmod, "_get_doserrno"); > p_get_errno = (void *)GetProcAddress(hmod, "_get_errno"); > p_set_doserrno = (void *)GetProcAddress(hmod, "_set_doserrno"); > p_set_errno = (void *)GetProcAddress(hmod, "_set_errno"); > + p_set_invalid_parameter_handler = (void *)GetProcAddress(hmod, "_set_invalid_parameter_handler"); set_invalid_parameter_handler is not exported in native so this won't test anything. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [5/5] gdiplus: Add some tests for GdipBitmapLockBits/GdipBitmapUnlockBits.
by Vincent Povirk 11 Jul '12

11 Jul '12

Shouldn't your second LockBits in this loop always use PixelFormat24bppRGB and ImageLockModeRead? As it is, if the LockBits/UnlockBits is writing but not reading, you won't be able to tell. Also, you might want to try flags == 0 in some pixel format other than 24bppRGB. As I understand it, all modes without ImageLockModeUserInputBuf are treated as read+write regardless of flags when the bitmap is locked in its native format, as an optimization. You may simply be running into that optimization. On Wed, Jul 11, 2012 at 2:49 AM, Dmitry Timoshkov <dmitry(a)baikal.ru> wrote: > With additional tests for flags set to ImageLockModeUserInputBuf only. > --- > dlls/gdiplus/tests/image.c | 184 +++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 184 insertions(+) > > diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c > index 29182aa..6ce100d 100644 > --- a/dlls/gdiplus/tests/image.c > +++ b/dlls/gdiplus/tests/image.c > @@ -3342,6 +3342,189 @@ todo_wine > GdipDisposeImage(image); > } > > +static void test_bitmapbits(void) > +{ > + > + static const BYTE pixels_24[24] = {0xff,0xff,0xff, 0,0,0, 0xff,0xff,0xff, 0,0,0, > + 0xff,0xff,0xff, 0,0,0, 0xff,0xff,0xff, 0,0,0}; > + static const BYTE pixels_24_00[24] = {0,0,0, 0,0,0, 0,0,0, 0,0,0, > + 0,0,0, 0,0,0, 0,0,0, 0,0,0}; > + static const BYTE pixels_24_77[32] = {0xff,0xff,0xff, 0,0,0, 0xff,0xff,0xff, 0,0,0,0x77,0x77,0x77,0x77, > + 0xff,0xff,0xff, 0,0,0, 0xff,0xff,0xff, 0,0,0,0x77,0x77,0x77,0x77}; > + static const BYTE pixels_24_88[32] = {0xff,0xff,0xff, 0,0,0, 0xff,0xff,0xff, 0,0,0,0x88,0x88,0x88,0x88, > + 0xff,0xff,0xff, 0,0,0, 0xff,0xff,0xff, 0,0,0,0x88,0x88,0x88,0x88}; > +#if 0 /* FIXME: these tests crash gdiplus in Wine */ > + static const BYTE pixels_8[8] = {0x01,0,0x01,0,0x01,0,0x01,0}; > + static const BYTE pixels_8_00[8] = {0,0,0,0,0,0,0,0}; > + static const BYTE pixels_8_77[32] = {0x01,0,0x01,0,0x77,0x77,0x77,0x77, > + 0x77,0x77,0x77,0x77,0x77,0x77,0x77,0x77, > + 0x01,0,0x01,0,0x77,0x77,0x77,0x77, > + 0x77,0x77,0x77,0x77,0x77,0x77,0x77,0x77}; > + static const BYTE pixels_8_88[32] = {0x01,0,0x01,0,0x88,0x88,0x88,0x88, > + 0x88,0x88,0x88,0x88,0x88,0x88,0x88,0x88, > + 0x01,0,0x01,0,0x88,0x88,0x88,0x88, > + 0x88,0x88,0x88,0x88,0x88,0x88,0x88,0x88}; > + static const BYTE pixels_a7[32] = {0xa7,0x77,0x77,0x77,0x77,0x77,0x77,0x77, > + 0x77,0x77,0x77,0x77,0x77,0x77,0x77,0x77, > + 0xa7,0x77,0x77,0x77,0x77,0x77,0x77,0x77, > + 0x77,0x77,0x77,0x77,0x77,0x77,0x77,0x77}; > + static const BYTE pixels_1[8] = {0xa0,0,0,0,0xa0,0,0,0}; > +#endif > + static const BYTE pixels_77[32] = {0x77,0x77,0x77,0x77,0x77,0x77,0x77,0x77, > + 0x77,0x77,0x77,0x77,0x77,0x77,0x77,0x77, > + 0x77,0x77,0x77,0x77,0x77,0x77,0x77,0x77, > + 0x77,0x77,0x77,0x77,0x77,0x77,0x77,0x77}; > + static const BYTE pixels_88[32] = {0x88,0x88,0x88,0x88,0x88,0x88,0x88,0x88, > + 0x88,0x88,0x88,0x88,0x88,0x88,0x88,0x88, > + 0x88,0x88,0x88,0x88,0x88,0x88,0x88,0x88, > + 0x88,0x88,0x88,0x88,0x88,0x88,0x88,0x88}; > + static const struct test_data > + { > + PixelFormat format; > + ImageLockMode mode; > + UINT width, height, stride, size; > + const BYTE *pixels; > + const BYTE *pixels_unlocked; > + } td[] = > + { > + { PixelFormat24bppRGB, 0xfff0, 4, 2, 12, 24, pixels_24, pixels_24_00 }, > + { PixelFormat24bppRGB, 0, 4, 2, 12, 24, pixels_24, pixels_24_00 }, > + > + { PixelFormat24bppRGB, ImageLockModeRead, 4, 2, 12, 24, pixels_24, pixels_24_00 }, > + { PixelFormat24bppRGB, ImageLockModeWrite, 4, 2, 12, 24, pixels_24, pixels_24_00 }, > + { PixelFormat24bppRGB, ImageLockModeRead|ImageLockModeWrite, 4, 2, 12, 24, pixels_24, pixels_24_00 }, > + { PixelFormat24bppRGB, ImageLockModeRead|ImageLockModeUserInputBuf, 4, 2, 16, 32, pixels_24_77, pixels_24_88 }, > + { PixelFormat24bppRGB, ImageLockModeWrite|ImageLockModeUserInputBuf, 4, 2, 16, 32, pixels_77, pixels_88 }, > + { PixelFormat24bppRGB, ImageLockModeUserInputBuf, 4, 2, 16, 32, pixels_77, pixels_88 }, > +#if 0 /* FIXME: these tests crash gdiplus in Wine */ > + { PixelFormat8bppIndexed, ImageLockModeRead, 4, 2, 4, 8, pixels_8, pixels_8 }, > + { PixelFormat8bppIndexed, ImageLockModeWrite, 4, 2, 4, 8, pixels_8, pixels_8 }, > + { PixelFormat8bppIndexed, ImageLockModeRead|ImageLockModeWrite, 4, 2, 4, 8, pixels_8, pixels_8_00 }, > + { PixelFormat8bppIndexed, ImageLockModeRead|ImageLockModeUserInputBuf, 4, 2, 16, 32, pixels_8_77, pixels_8_88 }, > + { PixelFormat8bppIndexed, ImageLockModeWrite|ImageLockModeUserInputBuf, 4, 2, 16, 32, pixels_77, pixels_88 }, > + { PixelFormat8bppIndexed, ImageLockModeUserInputBuf, 4, 2, 16, 32, pixels_77, pixels_88 }, > + > + { PixelFormat1bppIndexed, ImageLockModeRead, 4, 2, 4, 8, pixels_1, pixels_1 }, > + { PixelFormat1bppIndexed, ImageLockModeWrite, 4, 2, 4, 8, pixels_1, pixels_1 }, > + { PixelFormat1bppIndexed, ImageLockModeRead|ImageLockModeWrite, 4, 2, 4, 8, pixels_1, pixels_1 }, > + { PixelFormat1bppIndexed, ImageLockModeRead|ImageLockModeUserInputBuf, 4, 2, 16, 32, pixels_a7, pixels_a7 }, > +#endif > + }; > + BYTE buf[32]; > + GpStatus status; > + GpBitmap *bitmap; > + UINT i; > + BitmapData data; > + struct > + { > + ColorPalette pal; > + ARGB entries[1]; > + } palette; > + > + for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) > + { > + BYTE pixels[sizeof(pixels_24)]; > + memcpy(pixels, pixels_24, sizeof(pixels_24)); > + status = GdipCreateBitmapFromScan0(4, 2, 12, PixelFormat24bppRGB, pixels, &bitmap); > + expect(Ok, status); > + > + /* associate known palette with pixel data */ > + palette.pal.Flags = PaletteFlagsGrayScale; > + palette.pal.Count = 2; > + palette.pal.Entries[0] = 0; > + palette.pal.Entries[1] = 0xffffffff; > + status = GdipSetImagePalette((GpImage *)bitmap, &palette.pal); > + expect(Ok, status); > + > + memset(&data, 0xfe, sizeof(data)); > + if (td[i].mode & ImageLockModeUserInputBuf) > + { > + memset(buf, 0x77, sizeof(buf)); > + data.Scan0 = buf; > + data.Stride = 16; > + } > + status = GdipBitmapLockBits(bitmap, NULL, td[i].mode, td[i].format, &data); > + ok(status == Ok || broken(status == InvalidParameter) /* XP */, "%u: GdipBitmapLockBits error %d\n", i, status); > + if (status != Ok) > + { > + GdipDisposeImage((GpImage *)bitmap); > + continue; > + } > + ok(td[i].width == data.Width, "%u: expected %d, got %d\n", i, td[i].width, data.Width); > + ok(td[i].height == data.Height, "%u: expected %d, got %d\n", i, td[i].height, data.Height); > + ok(td[i].stride == data.Stride, "%u: expected %d, got %d\n", i, td[i].stride, data.Stride); > + ok(td[i].format == data.PixelFormat, "%u: expected %d, got %d\n", i, td[i].format, data.PixelFormat); > + ok(td[i].size == data.Height * data.Stride, "%u: expected %d, got %d\n", i, td[i].size, data.Height * data.Stride); > + if (td[i].mode & ImageLockModeUserInputBuf) > + ok(data.Scan0 == buf, "%u: got wrong buffer\n", i); > + if (td[i].size == data.Height * data.Stride) > + { > + int match = memcmp(data.Scan0, td[i].pixels, td[i].size) == 0; > + if ((td[i].mode & (ImageLockModeRead|ImageLockModeWrite|ImageLockModeUserInputBuf)) == ImageLockModeWrite && td[i].format != PixelFormat24bppRGB) > + ok(!match, "%u: data shouldn't match\n", i); > + else > + { > + /* copying to user buffer is very buggy even in win7 */ > + ok(match || broken(!match && (td[i].mode & ImageLockModeUserInputBuf)), > + "%u: data should match\n", i); > + if (!match) > + { > + UINT j; > + BYTE *bits = data.Scan0; > + printf("%u: data mismatch for format %#x:", i, td[i].format); > + for (j = 0; j < td[i].size; j++) > + printf(" %02x", bits[j]); > + printf("\n"); > + } > + } > + > + memset(data.Scan0, 0, td[i].size); > + } > + > + status = GdipBitmapUnlockBits(bitmap, &data); > + ok(status == Ok, "%u: GdipBitmapUnlockBits error %d\n", i, status); > + > + memset(&data, 0xfe, sizeof(data)); > + if (td[i].mode & ImageLockModeUserInputBuf) > + { > + memset(buf, 0x88, sizeof(buf)); > + data.Scan0 = buf; > + data.Stride = 16; > + } > + status = GdipBitmapLockBits(bitmap, NULL, td[i].mode, td[i].format, &data); > + ok(status == Ok, "%u: GdipBitmapLockBits error %d\n", i, status); > + ok(td[i].width == data.Width, "%u: expected %d, got %d\n", i, td[i].width, data.Width); > + ok(td[i].height == data.Height, "%u: expected %d, got %d\n", i, td[i].height, data.Height); > + ok(td[i].stride == data.Stride, "%u: expected %d, got %d\n", i, td[i].stride, data.Stride); > + ok(td[i].format == data.PixelFormat, "%u: expected %d, got %d\n", i, td[i].format, data.PixelFormat); > + ok(td[i].size == data.Height * data.Stride, "%u: expected %d, got %d\n", i, td[i].size, data.Height * data.Stride); > + if (td[i].mode & ImageLockModeUserInputBuf) > + ok(data.Scan0 == buf, "%u: got wrong buffer\n", i); > + /* copying indexed data without associated palette from BitmapData leads > + to funny effects, that's a design flaw with lock/unlock pixel data */ > + if (td[i].size == data.Height * data.Stride && !(td[i].format & PixelFormatIndexed)) > + { > + int match = memcmp(data.Scan0, td[i].pixels_unlocked, td[i].size) == 0; > + ok(match, "%u: data should match\n", i); > + if (!match) > + { > + UINT j; > + BYTE *bits = data.Scan0; > + printf("%u: data mismatch for format %#x:", i, td[i].format); > + for (j = 0; j < td[i].size; j++) > + printf(" %02x", bits[j]); > + printf("\n"); > + } > + } > + > + status = GdipBitmapUnlockBits(bitmap, &data); > + ok(status == Ok, "%u: GdipBitmapUnlockBits error %d\n", i, status); > + > + status = GdipDisposeImage((GpImage *)bitmap); > + expect(Ok, status); > + } > +} > + > START_TEST(image) > { > struct GdiplusStartupInput gdiplusStartupInput; > @@ -3354,6 +3537,7 @@ START_TEST(image) > > GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); > > + test_bitmapbits(); > test_tiff_palette(); > test_GdipGetAllPropertyItems(); > test_tiff_properties(); > -- > 1.7.11.1 > > >

2 1

Re: [PATCH 4/5] winex11: Simplify X11DRV_XRandR_Init() error handling a bit.
by Alexandre Julliard 11 Jul '12

11 Jul '12

Henri Verbeet <hverbeet(a)codeweavers.com> writes: > @@ -276,18 +274,15 @@ void X11DRV_XRandR_Init(void) > > /* see if Xrandr is available */ > wine_tsx11_lock(); > - ok = pXRRQueryExtension(gdi_display, &xrandr_event, &xrandr_error); > - if (ok) > - { > - X11DRV_expect_error(gdi_display, XRandRErrorHandler, NULL); > - ok = pXRRQueryVersion(gdi_display, &xrandr_major, &xrandr_minor); > - if (X11DRV_check_error()) ok = FALSE; > - } > - if (ok) > - { > - TRACE("Found XRandR - major: %d, minor: %d\n", xrandr_major, xrandr_minor); > - xrandr_init_modes(); > - } > + if (!pXRRQueryExtension( gdi_display, &xrandr_event, &xrandr_error )) goto done; > + X11DRV_expect_error( gdi_display, XRandRErrorHandler, NULL ); > + if (!pXRRQueryVersion( gdi_display, &xrandr_major, &xrandr_minor )) goto done; > + if (X11DRV_check_error()) goto done; You have to call X11DRV_check_error after X11DRV_expect_error in all cases. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 1/2] vbscript: Added UCase implementation
by Marvin 11 Jul '12

11 Jul '12

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://testbot.winehq.org/JobDetails.pl?Key=19930 Your paranoid android. === WNT4WSSP6 (32 bit) === No test summary line found === W2KPROSP4 (32 bit) === No test summary line found === WXPPROSP3 (32 bit) === No test summary line found === W2K3R2SESP2 (32 bit) === No test summary line found === WVISTAADM (32 bit) === No test summary line found === W7PRO (32 bit) === No test summary line found === W7PROX64 (32 bit) === No test summary line found === TEST64_W7SP1 (32 bit) === No test summary line found === W7PROX64 (64 bit) === No test summary line found === TEST64_W7SP1 (64 bit) === No test summary line found

1 0

Re: [PATCH 2/2 try2] advapi32: Pass service name as argv[0] to ServiceMain
by Marvin 11 Jul '12

11 Jul '12

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://testbot.winehq.org/JobDetails.pl?Key=19931 Your paranoid android. === WINEBUILD (build) === Patch failed to apply

1 0

Re: kernel32: implement IsValidLocaleName (as a wrapper around IsValidLocale) (2/2) (try 2)
by Alexandre Julliard 10 Jul '12

10 Jul '12

Austin English <austinenglish(a)gmail.com> writes: > @@ -2202,6 +2202,19 @@ BOOL WINAPI IsValidLocale( LCID lcid, DWORD flags ) > (LPCWSTR)LOCALE_ILANGUAGE, LANGIDFROMLCID(lcid)) != 0; > } > > +/****************************************************************************** > + * IsValidLocaleName (KERNEL32.@) > + * > + * See IsValidLocale(). > + */ > +BOOL WINAPI IsValidLocaleName( LPCWSTR locale ) > +{ > + LCID lcid; > + > + TRACE( "(%s)\n", debugstr_w(locale) ); > + lcid = LocaleNameToLCID( locale, 0 ); > + return IsValidLocale( lcid, 0 ); > +} That's probably not going to do the right thing for invalid names. Some tests would be a good idea. -- Alexandre Julliard julliard(a)winehq.org

1 0

re: Re-enable editing on the forum?
by Dan Kegel 10 Jul '12

10 Jul '12

No objection here. Seems like an obvious thing to do. I'll do it later today if nobody objects.

3 2

Re: [1/2] gdiplus: GdipBitmapLockBits should treat flags == 0 as ImageLockModeRead.
by Vincent Povirk 10 Jul '12

10 Jul '12

I think you might want (!(flags & (ImageLockModeRead|ImageLockModeWrite))), in case someone passes ImageLockModeUserInputBuf On Tue, Jul 10, 2012 at 7:45 AM, Dmitry Timoshkov <dmitry(a)baikal.ru> wrote: > --- > dlls/gdiplus/image.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c > index db79eca..45520fd 100644 > --- a/dlls/gdiplus/image.c > +++ b/dlls/gdiplus/image.c > @@ -942,6 +942,8 @@ GpStatus WINGDIPAPI GdipBitmapLockBits(GpBitmap* bitmap, GDIPCONST GpRect* rect, > return WrongState; > } > > + if (!flags) flags = ImageLockModeRead; > + > if (bitmap->bits && bitmap->format == format && !(flags & ImageLockModeUserInputBuf)) > { > /* no conversion is necessary; just use the bits directly */ > -- > 1.7.11.1 > > >

2 1

Re: kernel32: implement IsValidLocaleName (as a wrapper around IsValidLocale)
by Dmitry Timoshkov 10 Jul '12

10 Jul '12

Austin English <austinenglish(a)gmail.com> wrote: > +BOOL WINAPI IsValidLocaleName( LPCWSTR locale ) > +{ > + LCID lcid; > + BOOL ret; > + > + TRACE( "locale: %s\n", debugstr_w(locale) ); > + lcid = LocaleNameToLCID( locale, 0 ); > + ret = IsValidLocale( lcid, 0 ); > + return ret; > +} Avoiding (useless) intermediate variables along with the word 'locale' in the trace would be better IMO. -- Dmitry.

2 1

Re: some patches to read files faster (especially for baldur's gate and infinity engine games)
by Austin English 10 Jul '12

10 Jul '12

On Mon, Jul 9, 2012 at 2:06 PM, Emmanuel Anne <emmanuel.anne(a)gmail.com> wrote: > Hello, I installed baldur's gate lately and noticed it was still slow in > wine, especially if I install a few mods. > See the description of the bug here : > http://bugs.winehq.org/show_bug.cgi?id=17956 > > So after reading the page about case insensitive filesystems there > http://wiki.winehq.org/CaseInsensitiveFilenames > I decided that one possible solution was to have everything in lower case. > So I made a 1st patch (see attachement). > After this, installing a weidu mod in baldur's gate becomes faster, but > loading a savegame is still very slow compared to windows. > > After some more investigation using strace, it's because the program uses > NtQueryDirectoryFile to check if a file is present in the override directory > instead of trying to open it directly, which produces a getdents call in > linux, which is extremely unefficient. So I just added a short cut for this > function : if the filename argument has no wildcard, then just use stat to > return wether the file exists or not. This is in the 2nd patch. > After this, loading savegames was extremely fast, comparable to windows > speed, finally, and there are no more slowdowns in game, it runs smoothly > all the time ! > > Well I am sure you'll find I didn't make them the right way, but I hope the > ideas will be useful to you and that you'll merge them in one form or > another into wine. > Oh yes, after applying them, all the new files created by wine will be in > lower case, but you'll eventually have to convert all the files to lower > case in the wine directories (it's required at least in the baldur's gate 2 > directory). > Also having a wineprefix with mixed lower and upper case characters would > create problems. > But except that, it works excessively well ! :) > So maybe you'll want this enabled only if the user explecitely chooses to > enable it. > For me I know I'll keep it ! > I attach the simple perl script I used to convert everything to lower case. It would be great to document this patch at http://wiki.winehq.org/InterestingPatches. -- -Austin

1 0

Re-enable editing on the forum? - Excuse me!
by newsletter [at] Schiermeier-Software 10 Jul '12

10 Jul '12

Hello list, sorry for my multiple posting in the subject "Re-enable editing on the forum?" I had a mail account problem. Thanks for your appreciation! -- Gruss von Joerg Schiermeier

1 0

Re: "winetricks dotnet40" fails verifier because System.EnterpriseServices.Wrapper.dll missing?
by Dan Kegel 09 Jul '12

09 Jul '12

On Mon, Jul 9, 2012 at 1:42 PM, Hans Leidekker <hans(a)codeweavers.com> wrote: >> That file does seem to be on disc, but somewhere else: >> c:/windows/Microsoft.NET/Framework/v4.0.30319/System.EnterpriseServices.Wra… >> >> Not sure how serious it is that that's misplaced. Have other folks seen this? > > This should be fixed by 45473a65a0a1fe2e61809d80f6d09bb96f923126. Indeed it is. Thanks! - Dan

1 0

Re-enable editing on the forum?
by Schiermeier Software 09 Jul '12

09 Jul '12

Guten Abend Rosanne, > but someone (Jeremy?) needs to correct the other page. maybe you want to send a patch to: WineHQ - patch <wine-patches(a)winehq.org> subject: [website] <your subject> This works easier. -- Gruss von Joerg Schiermeier

2 1

Re: [PATCH 3/4] d3dx9/tests: Add effect parameter value GetMatrixPointerArray() test.
by Matteo Bruni 09 Jul '12

09 Jul '12

2012/7/8 Rico Schüller <kgbricola(a)web.de>: > --- > dlls/d3dx9_36/tests/effect.c | 90 > ++++++++++++++++++++++++++++++++++++++++++ > 1 files changed, 90 insertions(+), 0 deletions(-) > Hi Rico, maybe it's just me misunderstanding this, but: + FLOAT fvalue[EFFECT_PARAMETER_VALUE_ARRAY_SIZE]; + D3DXMATRIX *matrix_pointer_array[sizeof(fvalue)/sizeof(D3DXMATRIX)]; + UINT l, k, m, element; + + for (element = 0; element <= res_desc->Elements + 1; ++element) + { + memset(fvalue, 0xab, sizeof(fvalue)); + for (l = 0; l < element; ++l) + { + matrix_pointer_array[l] = (D3DXMATRIX *)&fvalue[l * sizeof(**matrix_pointer_array) / sizeof(*matrix_pointer_array)]; + } I don't quite understand what you're trying to achieve with "sizeof(**matrix_pointer_array) / sizeof(*matrix_pointer_array)". As far as I can see, that depends on the size of the pointer (32/64 bits) and I'm not sure that the offset should change in that case. Maybe you meant to use sizeof(float) as divisor?

2 1

Re-enable editing on the forum?
by Joerg Schiermeier 09 Jul '12

09 Jul '12

Guten Abend Rosanne, > but someone (Jeremy?) needs to correct the other page. maybe you want to send a patch to: WineHQ - patch <wine-patches(a)winehq.org> subject: [website] <your subject> This works easier. -- Gruss von Joerg Schiermeier

1 0

Re-enable editing on the forum?
by newsletter [at] Schiermeier-Software 09 Jul '12

09 Jul '12

Guten Abend Rosanne, > but someone (Jeremy?) needs to correct the other page. maybe you want to send a patch to: WineHQ - patch <wine-patches(a)winehq.org> subject: [website] <your subject> This works easier. -- Gruss von Joerg Schiermeier

1 0

Re: [PATCH 3/4] ieframe: Added init_test helper
by Marvin 09 Jul '12

09 Jul '12

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://testbot.winehq.org/JobDetails.pl?Key=19864 Your paranoid android. === WNT4WSSP6 (32 bit webbrowser) === webbrowser.c:3325: Test failed: Creating WebBrowser object failed: 80040154 webbrowser.c:3325: Test failed: Creating WebBrowser object failed: 80040154 webbrowser.c:3325: Test failed: Creating WebBrowser object failed: 80040154 webbrowser.c:3476: Test failed: Creating WebBrowser object failed: 80040154 webbrowser.c:3325: Test failed: Creating WebBrowser object failed: 80040154 webbrowser.c:3441: Test failed: Creating WebBrowser object failed: 80040154 webbrowser.c:3419: Test failed: Could not get WebBrowserV1 instance: 80040154 webbrowser: unhandled exception c0000005 at 0040AF8E === W2KPROSP4 (32 bit webbrowser) === webbrowser.c:2627: Test failed: expected GetOverridesKeyPath webbrowser.c:2632: Test failed: expected Invoke_SETSECURELOCKICON webbrowser.c:2633: Test failed: expected Invoke_FILEDOWNLOAD webbrowser.c:3052: Test failed: doc_disp == NULL webbrowser: unhandled exception c0000005 at 00402FCA

1 0

Re: [PATCH 4/4] vbscript: Added support for exit for stateemnt in 'for in' loops
by Marvin 09 Jul '12

09 Jul '12

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://testbot.winehq.org/JobDetails.pl?Key=19865 Your paranoid android. === WINEBUILD (build) === Patch failed to apply

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-devel