April 2006 - Wine-commits - list.winehq.org

Detlef Riekenberg : winspool: A read can fail.
by Alexandre Julliard 08 Apr '06

08 Apr '06

Module: wine Branch: refs/heads/master Commit: 50b32da7af25a3c86c030c63c5edf234b95c27b6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=50b32da7af25a3c86c030c6… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sat Apr 8 19:17:06 2006 +0200 winspool: A read can fail. --- dlls/winspool/info.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winspool/info.c b/dlls/winspool/info.c index c6636ca..e98e78e 100644 --- a/dlls/winspool/info.c +++ b/dlls/winspool/info.c @@ -5288,7 +5288,7 @@ BOOL WINAPI EnumMonitorsW(LPWSTR pName, { DWORD needed = 0; DWORD numentries = 0; - BOOL res = FALSE;; + BOOL res = FALSE; TRACE("(%s, %ld, %p, %ld, %p, %p)\n", debugstr_w(pName), Level, pMonitors, cbBuf, pcbNeeded, pcReturned); @@ -5881,7 +5881,7 @@ static BOOL schedule_pipe(LPCWSTR cmd, L exit(0); } - while((no_read = read(file_fd, buf, sizeof(buf)))) + while((no_read = read(file_fd, buf, sizeof(buf))) > 0) write(fds[1], buf, no_read); ret = TRUE; @@ -5922,7 +5922,7 @@ static BOOL schedule_unixfile(LPCWSTR ou if(out_fd == -1 || in_fd == -1) goto end; - while((no_read = read(in_fd, buf, sizeof(buf)))) + while((no_read = read(in_fd, buf, sizeof(buf))) > 0) write(out_fd, buf, no_read); ret = TRUE;

1 0

Stefan Dösinger : ddraw: Add MAKEFOURCC to ddraw.h.
by Alexandre Julliard 08 Apr '06

08 Apr '06

Module: wine Branch: refs/heads/master Commit: 2043b06aa4ed46cf0b16e0f6fa87083144b64cce URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2043b06aa4ed46cf0b16e0f… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sat Apr 8 19:15:03 2006 +0200 ddraw: Add MAKEFOURCC to ddraw.h. --- include/ddraw.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/include/ddraw.h b/include/ddraw.h index 370fb8f..b06a720 100644 --- a/include/ddraw.h +++ b/include/ddraw.h @@ -761,6 +761,10 @@ typedef struct _DDPIXELFORMAT { /* 20: next structure */ } DDPIXELFORMAT,*LPDDPIXELFORMAT; +#define MAKEFOURCC(ch0, ch1, ch2, ch3) \ + ((DWORD)(BYTE)(ch0) | ((DWORD)(BYTE)(ch1) << 8) | \ + ((DWORD)(BYTE)(ch2) << 16) | ((DWORD)(BYTE)(ch3) << 24 )) + /* DDCAPS.dwFXCaps */ #define DDFXCAPS_BLTALPHA 0x00000001 #define DDFXCAPS_OVERLAYALPHA 0x00000004

1 0

Stefan Dösinger : d3d9: Add typecasts for WINED3DLOCKED_BOX to avoid compiler warnings.
by Alexandre Julliard 08 Apr '06

08 Apr '06

Module: wine Branch: refs/heads/master Commit: cfb6b282d8a8e3b86671a31893c1c008cdc82fa1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cfb6b282d8a8e3b86671a31… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sat Apr 8 19:13:03 2006 +0200 d3d9: Add typecasts for WINED3DLOCKED_BOX to avoid compiler warnings. --- dlls/d3d9/volume.c | 2 +- dlls/d3d9/volumetexture.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/volume.c b/dlls/d3d9/volume.c index 7902427..96fe3f2 100644 --- a/dlls/d3d9/volume.c +++ b/dlls/d3d9/volume.c @@ -172,7 +172,7 @@ HRESULT WINAPI IDirect3DVolume9Impl_GetD HRESULT WINAPI IDirect3DVolume9Impl_LockBox(LPDIRECT3DVOLUME9 iface, D3DLOCKED_BOX* pLockedVolume, CONST D3DBOX* pBox, DWORD Flags) { IDirect3DVolume9Impl *This = (IDirect3DVolume9Impl *)iface; TRACE("(%p) relay %p %p %p %ld\n", This, This->wineD3DVolume, pLockedVolume, pBox, Flags); - return IWineD3DVolume_LockBox(This->wineD3DVolume, pLockedVolume, (WINED3DBOX *) pBox, Flags); + return IWineD3DVolume_LockBox(This->wineD3DVolume, (WINED3DLOCKED_BOX *) pLockedVolume, (WINED3DBOX *) pBox, Flags); } HRESULT WINAPI IDirect3DVolume9Impl_UnlockBox(LPDIRECT3DVOLUME9 iface) { diff --git a/dlls/d3d9/volumetexture.c b/dlls/d3d9/volumetexture.c index e5d54b1..032bdf5 100644 --- a/dlls/d3d9/volumetexture.c +++ b/dlls/d3d9/volumetexture.c @@ -188,7 +188,7 @@ HRESULT WINAPI IDirect3DVolumeTexture9Im HRESULT WINAPI IDirect3DVolumeTexture9Impl_LockBox(LPDIRECT3DVOLUMETEXTURE9 iface, UINT Level, D3DLOCKED_BOX* pLockedVolume, CONST D3DBOX* pBox, DWORD Flags) { IDirect3DVolumeTexture9Impl *This = (IDirect3DVolumeTexture9Impl *)iface; TRACE("(%p) Relay %p %p %p %ld\n", This, This->wineD3DVolumeTexture, pLockedVolume, pBox,Flags); - return IWineD3DVolumeTexture_LockBox(This->wineD3DVolumeTexture, Level, pLockedVolume, (WINED3DBOX *) pBox, Flags); + return IWineD3DVolumeTexture_LockBox(This->wineD3DVolumeTexture, Level, (WINED3DLOCKED_BOX *) pLockedVolume, (WINED3DBOX *) pBox, Flags); } HRESULT WINAPI IDirect3DVolumeTexture9Impl_UnlockBox(LPDIRECT3DVOLUMETEXTURE9 iface, UINT Level) {

1 0

Huw Davies : fonts: Add greek glyphs (with thanks to Maria Hadjipanayi).
by Alexandre Julliard 08 Apr '06

08 Apr '06

Module: wine Branch: refs/heads/master Commit: b3e33bf3351a268aff761114821e14516d817331 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b3e33bf3351a268aff76111… Author: Huw Davies <huw(a)codeweavers.com> Date: Sat Apr 8 15:47:09 2006 +0100 fonts: Add greek glyphs (with thanks to Maria Hadjipanayi). --- fonts/system.sfd | 529 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 524 insertions(+), 5 deletions(-) diff --git a/fonts/system.sfd b/fonts/system.sfd index 2a0af85..474de5c 100644 --- a/fonts/system.sfd +++ b/fonts/system.sfd @@ -42,9 +42,9 @@ UnicodeInterp: none DisplaySize: 16 AntiAlias: 0 FitToEm: 1 -WinInfo: 0 19 18 +WinInfo: 0 20 18 OnlyBitmaps: 1 -BeginChars: 65536 348 +BeginChars: 65536 414 StartChar: space Encoding: 32 32 0 Width: 4 @@ -1861,8 +1861,395 @@ Width: 9 Flags: W TeX: 117 0 0 0 EndChar +StartChar: NameMe-138 +Encoding: 138 138 348 +Width: 4 +Flags: W +TeX: 78 0 0 0 +EndChar +StartChar: NameMe-140 +Encoding: 140 140 349 +Width: 4 +Flags: W +TeX: 78 0 0 0 +EndChar +StartChar: NameMe-142 +Encoding: 142 142 350 +Width: 4 +Flags: W +TeX: 78 0 0 0 +EndChar +StartChar: NameMe-154 +Encoding: 154 154 351 +Width: 4 +Flags: W +TeX: 78 0 0 0 +EndChar +StartChar: NameMe-156 +Encoding: 156 156 352 +Width: 4 +Flags: W +TeX: 78 0 0 0 +EndChar +StartChar: NameMe-158 +Encoding: 158 158 353 +Width: 4 +Flags: W +TeX: 78 0 0 0 +EndChar +StartChar: NameMe-159 +Encoding: 159 159 354 +Width: 4 +Flags: W +TeX: 78 0 0 0 +EndChar +StartChar: afii00208 +Encoding: 8213 8213 355 +Width: 8 +Flags: W +TeX: 97 0 0 0 +EndChar +StartChar: Alpha +Encoding: 913 913 356 +Width: 9 +Flags: W +TeX: 65 0 0 0 +EndChar +StartChar: Beta +Encoding: 914 914 357 +Width: 9 +Flags: W +TeX: 66 0 0 0 +EndChar +StartChar: Gamma +Encoding: 915 915 358 +Width: 8 +Flags: W +TeX: 71 0 0 0 +EndChar +StartChar: uni0394 +Encoding: 916 916 359 +Width: 9 +Flags: W +TeX: 117 0 0 0 +EndChar +StartChar: Epsilon +Encoding: 917 917 360 +Width: 8 +Flags: W +TeX: 69 0 0 0 +EndChar +StartChar: Zeta +Encoding: 918 918 361 +Width: 10 +Flags: W +TeX: 90 0 0 0 +EndChar +StartChar: Eta +Encoding: 919 919 362 +Width: 9 +Flags: W +TeX: 69 0 0 0 +EndChar +StartChar: Theta +Encoding: 920 920 363 +Width: 9 +Flags: W +TeX: 84 0 0 0 +EndChar +StartChar: Iota +Encoding: 921 921 364 +Width: 3 +Flags: W +TeX: 73 0 0 0 +EndChar +StartChar: Kappa +Encoding: 922 922 365 +Width: 8 +Flags: W +TeX: 75 0 0 0 +EndChar +StartChar: Lambda +Encoding: 923 923 366 +Width: 9 +Flags: W +TeX: 76 0 0 0 +EndChar +StartChar: Mu +Encoding: 924 924 367 +Width: 10 +Flags: W +TeX: 77 0 0 0 +EndChar +StartChar: Nu +Encoding: 925 925 368 +Width: 9 +Flags: W +TeX: 78 0 0 0 +EndChar +StartChar: Xi +Encoding: 926 926 369 +Width: 8 +Flags: W +TeX: 88 0 0 0 +EndChar +StartChar: Omicron +Encoding: 927 927 370 +Width: 9 +Flags: W +TeX: 79 0 0 0 +EndChar +StartChar: Pi +Encoding: 928 928 371 +Width: 9 +Flags: W +TeX: 80 0 0 0 +EndChar +StartChar: Rho +Encoding: 929 929 372 +Width: 9 +Flags: W +TeX: 82 0 0 0 +EndChar +StartChar: uni03A2 +Encoding: 930 930 373 +Width: 16 +TeX: 117 0 0 0 +EndChar +StartChar: Sigma +Encoding: 931 931 374 +Width: 8 +Flags: W +TeX: 83 0 0 0 +EndChar +StartChar: Tau +Encoding: 932 932 375 +Width: 9 +Flags: W +TeX: 84 0 0 0 +EndChar +StartChar: Upsilon +Encoding: 933 933 376 +Width: 9 +Flags: W +TeX: 85 0 0 0 +EndChar +StartChar: Phi +Encoding: 934 934 377 +Width: 9 +Flags: W +TeX: 80 0 0 0 +EndChar +StartChar: Chi +Encoding: 935 935 378 +Width: 8 +Flags: W +TeX: 67 0 0 0 +EndChar +StartChar: Psi +Encoding: 936 936 379 +Width: 9 +Flags: W +TeX: 80 0 0 0 +EndChar +StartChar: uni03A9 +Encoding: 937 937 380 +Width: 10 +Flags: W +TeX: 117 0 0 0 +EndChar +StartChar: Iotadieresis +Encoding: 938 938 381 +Width: 16 +TeX: 73 0 0 0 +EndChar +StartChar: Upsilondieresis +Encoding: 939 939 382 +Width: 16 +TeX: 85 0 0 0 +EndChar +StartChar: alphatonos +Encoding: 940 940 383 +Width: 16 +TeX: 97 0 0 0 +EndChar +StartChar: epsilontonos +Encoding: 941 941 384 +Width: 16 +TeX: 101 0 0 0 +EndChar +StartChar: etatonos +Encoding: 942 942 385 +Width: 16 +TeX: 101 0 0 0 +EndChar +StartChar: iotatonos +Encoding: 943 943 386 +Width: 16 +TeX: 105 0 0 0 +EndChar +StartChar: upsilondieresistonos +Encoding: 944 944 387 +Width: 16 +TeX: 117 0 0 0 +EndChar +StartChar: alpha +Encoding: 945 945 388 +Width: 8 +Flags: W +TeX: 97 0 0 0 +EndChar +StartChar: beta +Encoding: 946 946 389 +Width: 7 +Flags: W +TeX: 98 0 0 0 +EndChar +StartChar: gamma +Encoding: 947 947 390 +Width: 7 +Flags: W +TeX: 103 0 0 0 +EndChar +StartChar: delta +Encoding: 948 948 391 +Width: 7 +Flags: W +TeX: 100 0 0 0 +EndChar +StartChar: epsilon +Encoding: 949 949 392 +Width: 7 +Flags: W +TeX: 101 0 0 0 +EndChar +StartChar: zeta +Encoding: 950 950 393 +Width: 6 +Flags: W +TeX: 122 0 0 0 +EndChar +StartChar: eta +Encoding: 951 951 394 +Width: 7 +Flags: W +TeX: 101 0 0 0 +EndChar +StartChar: theta +Encoding: 952 952 395 +Width: 7 +Flags: W +TeX: 116 0 0 0 +EndChar +StartChar: iota +Encoding: 953 953 396 +Width: 4 +Flags: W +TeX: 105 0 0 0 +EndChar +StartChar: kappa +Encoding: 954 954 397 +Width: 7 +Flags: W +TeX: 107 0 0 0 +EndChar +StartChar: lambda +Encoding: 955 955 398 +Width: 7 +Flags: W +TeX: 108 0 0 0 +EndChar +StartChar: uni03BC +Encoding: 956 956 399 +Width: 7 +Flags: W +TeX: 117 0 0 0 +EndChar +StartChar: nu +Encoding: 957 957 400 +Width: 7 +Flags: W +TeX: 110 0 0 0 +EndChar +StartChar: xi +Encoding: 958 958 401 +Width: 7 +Flags: W +TeX: 120 0 0 0 +EndChar +StartChar: omicron +Encoding: 959 959 402 +Width: 7 +Flags: W +TeX: 111 0 0 0 +EndChar +StartChar: pi +Encoding: 960 960 403 +Width: 7 +Flags: W +TeX: 112 0 0 0 +EndChar +StartChar: rho +Encoding: 961 961 404 +Width: 7 +Flags: W +TeX: 114 0 0 0 +EndChar +StartChar: sigma1 +Encoding: 962 962 405 +Width: 7 +Flags: W +TeX: 115 0 0 0 +EndChar +StartChar: sigma +Encoding: 963 963 406 +Width: 8 +Flags: W +TeX: 115 0 0 0 +EndChar +StartChar: tau +Encoding: 964 964 407 +Width: 7 +Flags: W +TeX: 116 0 0 0 +EndChar +StartChar: upsilon +Encoding: 965 965 408 +Width: 7 +Flags: W +TeX: 117 0 0 0 +EndChar +StartChar: phi +Encoding: 966 966 409 +Width: 9 +Flags: W +TeX: 112 0 0 0 +EndChar +StartChar: chi +Encoding: 967 967 410 +Width: 7 +Flags: W +TeX: 99 0 0 0 +EndChar +StartChar: psi +Encoding: 968 968 411 +Width: 9 +Flags: W +TeX: 112 0 0 0 +EndChar +StartChar: omega +Encoding: 969 969 412 +Width: 9 +Flags: W +TeX: 111 0 0 0 +EndChar +StartChar: iotadieresis +Encoding: 970 970 413 +Width: 16 +TeX: 105 0 0 0 +EndChar EndChars -BitmapFont: 16 348 13 3 1 +BitmapFont: 16 414 13 3 1 BDFChar: 0 32 4 14 14 0 0 z BDFChar: 1 33 4 1 2 0 9 @@ -2059,8 +2446,8 @@ BDFChar: 96 129 4 1 2 0 8 ^qdb$^qdb$^]4?7 BDFChar: 97 131 4 1 2 0 8 ^qdb$^qdb$^]4?7 -BDFChar: 98 136 4 0 2 0 8 -?smAM?smAM?iU0, +BDFChar: 98 136 4 1 2 0 8 +^qdb$^qdb$^]4?7 BDFChar: 99 144 4 1 2 0 8 ^qdb$^qdb$^]4?7 BDFChar: 100 152 4 1 2 0 8 @@ -2559,5 +2946,137 @@ BDFChar: 346 1105 8 1 6 0 9 bfg'3bfojtb]j*f BDFChar: 347 8361 9 0 8 0 9 @fU9ECB/,Ms+"kbCB/haG5rfe +BDFChar: 348 138 4 1 2 0 8 +^qdb$^qdb$^]4?7 +BDFChar: 349 140 4 1 2 0 8 +^qdb$^qdb$^]4?7 +BDFChar: 350 142 4 1 2 0 8 +^qdb$^qdb$^]4?7 +BDFChar: 351 154 4 0 2 0 8 +?smAM?smAM?iU0, +BDFChar: 352 156 4 0 2 0 8 +?smAM?smAM?iU0, +BDFChar: 353 158 4 1 2 0 8 +^qdb$^qdb$^]4?7 +BDFChar: 354 159 4 0 2 0 8 +?smAM?smAM?iU0, +BDFChar: 355 8213 8 0 7 11 11 +rr<$! +BDFChar: 356 913 9 1 8 0 9 +(`5(a)tAnGY(_nuHS +BDFChar: 357 914 9 0 8 0 9 +IfNo-@=Vd:IfNo-@=Vd:@=Wh- +BDFChar: 358 915 8 1 7 0 9 +rkQ=b^qdb$^q]pM +BDFChar: 359 916 9 1 8 0 9 +(`5(a)tAnGYm_uB]: +BDFChar: 360 917 8 1 7 0 9 +rkQ=br4p+`_#=<6 +BDFChar: 361 918 10 1 9 0 9 +s*t-#!rrN*$ih+E0E>J\^]=Cb +BDFChar: 362 919 9 1 8 0 9 +_o'C0s22al_nuHS +BDFChar: 363 920 9 1 8 0 9 +4D)LKs22alAip%n +BDFChar: 364 921 3 1 2 0 9 +^qdb$^qdb$^q]pM +BDFChar: 365 922 8 1 7 0 9 +`m!*)i:,CC`l7uY +BDFChar: 366 923 9 1 8 0 9 +(`5(a)tAnGYm_nuHS +BDFChar: 367 924 10 1 9 0 9 +_19(a)Pj+-0?pON!gh14=3aahK` +BDFChar: 368 925 9 0 8 0 9 +@=W?JEI`=bD1HJRB7OKB(a)t8!< +BDFChar: 369 926 8 1 7 0 9 +rr)ltI!bnorr)lt +BDFChar: 370 927 9 0 8 0 9 +*WRtr@=Vd:@=Vd:@=Vd:1B8Hr +BDFChar: 371 928 9 1 8 0 9 +s22al_o'C0_nuHS +BDFChar: 372 929 9 0 8 0 9 +IfNo-@=Vd:@=Wh-?iXR7?iXR7 +BDFChar: 373 930 16 0 0 0 0 +z +BDFChar: 374 931 8 1 7 0 9 +rkMnq(`4r7_#=<6 +BDFChar: 375 932 9 1 8 0 9 +rtlRi(`4),(`35Q +BDFChar: 376 933 9 1 8 0 9 +_o'B(4;\nP(`35Q +BDFChar: 377 934 9 1 8 0 9 +(k15ogY:K;IM`%b +BDFChar: 378 935 8 1 7 0 9 +`l;h23&k_j`l7uY +BDFChar: 379 936 9 1 8 0 9 +gY:K;gO9tV(`35Q +BDFChar: 380 937 10 1 9 0 9 +4of'm_19(a)P_19@P(a)fSCe2?<K% +BDFChar: 381 938 16 0 0 0 0 +z +BDFChar: 382 939 16 0 0 0 0 +z +BDFChar: 383 940 16 0 0 0 0 +z +BDFChar: 384 941 16 0 0 0 0 +z +BDFChar: 385 942 16 0 0 0 0 +z +BDFChar: 386 943 16 0 0 0 0 +z +BDFChar: 387 944 16 0 0 0 0 +z +BDFChar: 388 945 8 1 7 0 6 +HHaUWbfkA5 +BDFChar: 389 946 7 1 6 -3 9 +Gg+CUprpt+bkSuh^]4?7 +BDFChar: 390 947 7 1 6 -3 6 +bfn:UG^(nr0JEJ, +BDFChar: 391 948 7 1 6 0 9 +Gg'PLGg+CUb]j*f +BDFChar: 392 949 7 1 6 0 6 +Gg*sB^s%$' +BDFChar: 393 950 6 1 5 -3 9 +pb6*k^qdb$^i1,-Du]k< +BDFChar: 394 951 7 1 6 -3 6 +prpt+bfn9>$k*+9 +BDFChar: 395 952 7 1 6 0 9 +Gg+CUr63C/b]j*f +BDFChar: 396 953 4 1 2 0 6 +^qdb$^qd_c +BDFChar: 397 954 7 1 6 0 6 +bh2FCnCYqb +BDFChar: 398 955 7 1 6 0 9 +@,N^m3-]\lbfg%e +BDFChar: 399 956 7 1 6 -3 6 +bfn;Tbfp"#^q]pM +BDFChar: 400 957 7 1 6 0 6 +bfn;Tb]kfA +BDFChar: 401 958 7 1 6 -3 9 +r%MNo^i7*)^j$7rGQ7^D +BDFChar: 402 959 7 0 6 0 6 +4D&2;AnF.* +BDFChar: 403 960 7 1 6 0 6 +r63C/bfn92 +BDFChar: 404 961 7 1 6 -3 6 +Gg+CUbfojt^q]pM +BDFChar: 405 962 7 1 6 0 6 +Gg*sJ%*Wqr +BDFChar: 406 963 8 1 7 0 6 +Ia$$[bfk;3 +BDFChar: 407 964 7 1 6 0 6 +r%KfY0JG0\ +BDFChar: 408 965 7 1 6 0 6 +bfn;Tbfk;3 +BDFChar: 409 966 9 1 8 -3 6 +IbWW3gY7/o(`35Q +BDFChar: 410 967 7 1 6 0 6 +bfk;cGg+A3 +BDFChar: 411 968 9 1 8 -3 6 +gY:K;gY7/o(`35Q +BDFChar: 412 969 9 1 8 0 6 +B#EBXgY6<? +BDFChar: 413 970 16 0 0 0 0 +z EndBitmapFont EndSplineFont

1 0

Hans Leidekker : wldap32: Don't handle NULL attrs twice.
by Alexandre Julliard 08 Apr '06

08 Apr '06

Module: wine Branch: refs/heads/master Commit: 12ad28acfe98057c2d155558548d61ac65ed4d54 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=12ad28acfe98057c2d15555… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sat Apr 8 16:11:34 2006 +0200 wldap32: Don't handle NULL attrs twice. --- dlls/wldap32/add.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/wldap32/add.c b/dlls/wldap32/add.c index 87cae0f..f9ea06d 100644 --- a/dlls/wldap32/add.c +++ b/dlls/wldap32/add.c @@ -342,7 +342,6 @@ ULONG ldap_add_ext_sW( WLDAP32_LDAP *ld, serverctrls, clientctrls ); if (!ld) return WLDAP32_LDAP_PARAM_ERROR; - if (!attrs) return LDAP_PROTOCOL_ERROR; if (dn) { dnU = strWtoU( dn );

1 0

Hans Leidekker : wldap32: Don't return uninitialised values.
by Alexandre Julliard 08 Apr '06

08 Apr '06

Module: wine Branch: refs/heads/master Commit: 34282fb5189babbe981b7033501b5ce943f3811b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=34282fb5189babbe981b703… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sat Apr 8 16:11:54 2006 +0200 wldap32: Don't return uninitialised values. --- dlls/wldap32/init.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wldap32/init.c b/dlls/wldap32/init.c index da2c9d8..31b832d 100644 --- a/dlls/wldap32/init.c +++ b/dlls/wldap32/init.c @@ -533,7 +533,7 @@ WLDAP32_LDAP *ldap_sslinitA( PCHAR hostn WLDAP32_LDAP *ldap_sslinitW( PWCHAR hostname, ULONG portnumber, int secure ) { #ifdef HAVE_LDAP - WLDAP32_LDAP *ld; + WLDAP32_LDAP *ld = NULL; char *hostnameU = NULL, *url = NULL; TRACE( "(%s, %ld, 0x%08x)\n", debugstr_w(hostname), portnumber, secure );

1 0

Hans Leidekker : wldap32: Fix overrun by one of static array.
by Alexandre Julliard 08 Apr '06

08 Apr '06

Module: wine Branch: refs/heads/master Commit: 42af5f39507bec42a61f7f644888c13b15d66df1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=42af5f39507bec42a61f7f6… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sat Apr 8 16:11:48 2006 +0200 wldap32: Fix overrun by one of static array. --- dlls/wldap32/error.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wldap32/error.c b/dlls/wldap32/error.c index 265a99b..7ec348d 100644 --- a/dlls/wldap32/error.c +++ b/dlls/wldap32/error.c @@ -284,7 +284,7 @@ ULONG LdapMapErrorToWin32( ULONG err ) { TRACE( "(0x%08lx)\n", err ); - if (err > sizeof(WLDAP32_errormap)/sizeof(WLDAP32_errormap[0])) + if (err >= sizeof(WLDAP32_errormap)/sizeof(WLDAP32_errormap[0])) return ERROR_DS_GENERIC_ERROR; return WLDAP32_errormap[err]; }

1 0

Rein Klazes : user: Add an missing element to the hbmmenus array.
by Alexandre Julliard 08 Apr '06

08 Apr '06

Module: wine Branch: refs/heads/master Commit: b72c36fef8decc85783cd641de1cc2ad6532c4b3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b72c36fef8decc85783cd64… Author: Rein Klazes <wijn(a)wanadoo.nl> Date: Sat Apr 8 12:48:20 2006 +0200 user: Add an missing element to the hbmmenus array. --- dlls/user/menu.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user/menu.c b/dlls/user/menu.c index a1a1c04..897b5d8 100644 --- a/dlls/user/menu.c +++ b/dlls/user/menu.c @@ -217,7 +217,7 @@ static void do_debug_print_menuitem(cons const char *postfix) { static const char * const hbmmenus[] = { "HBMMENU_CALLBACK", "", "HBMMENU_SYSTEM", - "HBMMENU_MBAR_RESTORE", "HBMMENU_MBAR_MINIMIZE", "HBMMENU_MBAR_CLOSE", + "HBMMENU_MBAR_RESTORE", "HBMMENU_MBAR_MINIMIZE", "UNKNOWN BITMAP", "HBMMENU_MBAR_CLOSE", "HBMMENU_MBAR_CLOSE_D", "HBMMENU_MBAR_MINIMIZE_D", "HBMMENU_POPUP_CLOSE", "HBMMENU_POPUP_RESTORE", "HBMMENU_POPUP_MAXIMIZE", "HBMMENU_POPUP_MINIMIZE"}; TRACE("%s ", prefix);

1 0

Robert Reif : dsound: Remove NULL This pointer checks.
by Alexandre Julliard 08 Apr '06

08 Apr '06

Module: wine Branch: refs/heads/master Commit: 208b0c2e72741cf314396bac947431ea131ff7b1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=208b0c2e72741cf314396ba… Author: Robert Reif <reif(a)earthlink.net> Date: Sat Apr 8 09:16:29 2006 -0400 dsound: Remove NULL This pointer checks. --- dlls/dsound/capture.c | 45 --------------------------------------------- 1 files changed, 0 insertions(+), 45 deletions(-) diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index 969a079..7ab1422 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -458,11 +458,6 @@ HRESULT WINAPI IDirectSoundCaptureImpl_C TRACE( "(%p,%p,%p,%p)\n",iface,lpcDSCBufferDesc,lplpDSCaptureBuffer,pUnk); - if (This == NULL) { - WARN("invalid parameter: This == NULL\n"); - return DSERR_INVALIDPARAM; - } - if (lpcDSCBufferDesc == NULL) { WARN("invalid parameter: lpcDSCBufferDesc == NULL)\n"); return DSERR_INVALIDPARAM; @@ -813,11 +808,6 @@ IDirectSoundCaptureBufferImpl_GetCaps( IDirectSoundCaptureBufferImpl *This = (IDirectSoundCaptureBufferImpl *)iface; TRACE( "(%p,%p)\n", This, lpDSCBCaps ); - if (This == NULL) { - WARN("invalid parameter: This == NULL\n"); - return DSERR_INVALIDPARAM; - } - if (lpDSCBCaps == NULL) { WARN("invalid parameter: lpDSCBCaps == NULL\n"); return DSERR_INVALIDPARAM; @@ -853,11 +843,6 @@ IDirectSoundCaptureBufferImpl_GetCurrent HRESULT hres = DS_OK; TRACE( "(%p,%p,%p)\n", This, lpdwCapturePosition, lpdwReadPosition ); - if (This == NULL) { - WARN("invalid parameter: This == NULL\n"); - return DSERR_INVALIDPARAM; - } - if (This->device == NULL) { WARN("invalid parameter: This->device == NULL\n"); return DSERR_INVALIDPARAM; @@ -913,11 +898,6 @@ IDirectSoundCaptureBufferImpl_GetFormat( TRACE( "(%p,%p,0x%08lx,%p)\n", This, lpwfxFormat, dwSizeAllocated, lpdwSizeWritten ); - if (This == NULL) { - WARN("invalid parameter: This == NULL\n"); - return DSERR_INVALIDPARAM; - } - if (This->device == NULL) { WARN("invalid parameter: This->device == NULL\n"); return DSERR_INVALIDPARAM; @@ -951,11 +931,6 @@ IDirectSoundCaptureBufferImpl_GetStatus( IDirectSoundCaptureBufferImpl *This = (IDirectSoundCaptureBufferImpl *)iface; TRACE( "(%p, %p), thread is %04lx\n", This, lpdwStatus, GetCurrentThreadId() ); - if (This == NULL) { - WARN("invalid parameter: This == NULL\n"); - return DSERR_INVALIDPARAM; - } - if (This->device == NULL) { WARN("invalid parameter: This->device == NULL\n"); return DSERR_INVALIDPARAM; @@ -1016,11 +991,6 @@ IDirectSoundCaptureBufferImpl_Lock( dwReadBytes, lplpvAudioPtr1, lpdwAudioBytes1, lplpvAudioPtr2, lpdwAudioBytes2, dwFlags, GetTickCount() ); - if (This == NULL) { - WARN("invalid parameter: This == NULL\n"); - return DSERR_INVALIDPARAM; - } - if (This->device == NULL) { WARN("invalid parameter: This->device == NULL\n"); return DSERR_INVALIDPARAM; @@ -1080,11 +1050,6 @@ IDirectSoundCaptureBufferImpl_Start( IDirectSoundCaptureBufferImpl *This = (IDirectSoundCaptureBufferImpl *)iface; TRACE( "(%p,0x%08lx)\n", This, dwFlags ); - if (This == NULL) { - WARN("invalid parameter: This == NULL\n"); - return DSERR_INVALIDPARAM; - } - if (This->device == NULL) { WARN("invalid parameter: This->device == NULL\n"); return DSERR_INVALIDPARAM; @@ -1237,11 +1202,6 @@ IDirectSoundCaptureBufferImpl_Stop( LPDI IDirectSoundCaptureBufferImpl *This = (IDirectSoundCaptureBufferImpl *)iface; TRACE( "(%p)\n", This ); - if (This == NULL) { - WARN("invalid parameter: This == NULL\n"); - return DSERR_INVALIDPARAM; - } - if (This->device == NULL) { WARN("invalid parameter: This->device == NULL\n"); return DSERR_INVALIDPARAM; @@ -1288,11 +1248,6 @@ IDirectSoundCaptureBufferImpl_Unlock( TRACE( "(%p,%p,%08lu,%p,%08lu)\n", This, lpvAudioPtr1, dwAudioBytes1, lpvAudioPtr2, dwAudioBytes2 ); - if (This == NULL) { - WARN("invalid parameter: This == NULL\n"); - return DSERR_INVALIDPARAM; - } - if (lpvAudioPtr1 == NULL) { WARN("invalid parameter: lpvAudioPtr1 == NULL\n"); return DSERR_INVALIDPARAM;

1 0

Marcus Meissner : winedump: Use fchmod() instead of doing system(chmod).
by Alexandre Julliard 08 Apr '06

08 Apr '06

Module: wine Branch: refs/heads/master Commit: 8ab9a65bacd9a88ca4a2e60c21b7c32bd278bf50 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8ab9a65bacd9a88ca4a2e60… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Apr 8 10:29:08 2006 +0200 winedump: Use fchmod() instead of doing system(chmod). --- tools/winedump/output.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/tools/winedump/output.c b/tools/winedump/output.c index ea11de4..8adfa51 100644 --- a/tools/winedump/output.c +++ b/tools/winedump/output.c @@ -458,7 +458,6 @@ void output_makefile (void) */ void output_install_script (void) { - char cmd[128]; FILE *install_file = open_file (OUTPUT_DLL_NAME, "_install", "w"); if (VERBOSE) @@ -494,9 +493,8 @@ void output_install_script (void) OUTPUT_DLL_NAME, OUTPUT_DLL_NAME, OUTPUT_DLL_NAME, OUTPUT_DLL_NAME, OUTPUT_DLL_NAME, OUTPUT_DLL_NAME, OUTPUT_DLL_NAME, OUTPUT_DLL_NAME); + fchmod (fileno(install_file), 0755); fclose (install_file); - snprintf (cmd, sizeof (cmd), "chmod a+x %s_install", OUTPUT_DLL_NAME); - system (cmd); }

1 0