wine-commits January 2013

wine-commits@winehq.org

2 participants
736 discussions

André Hentschel : tools: Upgrade the config.guess/ config.sub scripts.
by Alexandre Julliard 14 Jan '13

14 Jan '13

Module: wine Branch: master Commit: bd72767eed48a2af463c1c41251b5772f73d81ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd72767eed48a2af463c1c412… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jan 13 23:26:35 2013 +0100 tools: Upgrade the config.guess/config.sub scripts. --- tools/config.guess | 74 ++++++++++++++++++++------------- tools/config.sub | 114 +++++++++++++++++++++++++++++++--------------------- 2 files changed, 113 insertions(+), 75 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bd72767eed48a2af463c1…

1 0

Henri Verbeet : ddraw: Explicitly create a wined3d object without 3D capabilities when creating a normal wined3d object fails .
by Alexandre Julliard 14 Jan '13

14 Jan '13

Module: wine Branch: master Commit: 7595a580855fa141f0f3a10399ee8da76a1b1160 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7595a580855fa141f0f3a1039… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jan 13 22:08:09 2013 +0100 ddraw: Explicitly create a wined3d object without 3D capabilities when creating a normal wined3d object fails. --- dlls/ddraw/ddraw.c | 12 +++++++--- dlls/ddraw/main.c | 11 +++++++++- dlls/wined3d/directx.c | 52 ++++++++++++++++++++++++------------------------ include/wine/wined3d.h | 1 + 4 files changed, 45 insertions(+), 31 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index e88f67e..ca6f8d5 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -5267,11 +5267,15 @@ HRESULT ddraw_init(struct ddraw *ddraw, enum wined3d_device_type device_type) ddraw->numIfaces = 1; ddraw->ref7 = 1; - ddraw->wined3d = wined3d_create(7, WINED3D_LEGACY_DEPTH_BIAS); - if (!ddraw->wined3d) + if (!(ddraw->wined3d = wined3d_create(7, WINED3D_LEGACY_DEPTH_BIAS))) { - WARN("Failed to create a wined3d object.\n"); - return E_OUTOFMEMORY; + if (!(ddraw->wined3d = wined3d_create(7, WINED3D_LEGACY_DEPTH_BIAS | WINED3D_NO3D))) + { + WARN("Failed to create a wined3d object.\n"); + return E_FAIL; + } + + WARN("Created a wined3d object without 3D support.\n"); } hr = wined3d_device_create(ddraw->wined3d, WINED3DADAPTER_DEFAULT, device_type, diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 51f9dda..e79b471 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -383,7 +383,16 @@ HRESULT WINAPI DirectDrawEnumerateExA(LPDDENUMCALLBACKEXA callback, void *contex FIXME("flags 0x%08x not handled\n", flags); TRACE("Enumerating ddraw interfaces\n"); - wined3d = wined3d_create(7, WINED3D_LEGACY_DEPTH_BIAS); + if (!(wined3d = wined3d_create(7, WINED3D_LEGACY_DEPTH_BIAS))) + { + if (!(wined3d = wined3d_create(7, WINED3D_LEGACY_DEPTH_BIAS | WINED3D_NO3D))) + { + WARN("Failed to create a wined3d object.\n"); + return E_FAIL; + } + + WARN("Created a wined3d object without 3D support.\n"); + } __TRY { diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index d541f4d..2190689 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -5406,7 +5406,7 @@ static BOOL InitAdapters(struct wined3d *wined3d) HDC hdc = GetDC( 0 ); const struct opengl_funcs *wgl_driver = __wine_get_wgl_driver( hdc, WINE_WGL_DRIVER_VERSION ); ReleaseDC( 0, hdc ); - if (!wgl_driver || wgl_driver == (void *)-1) goto nogl_adapter; + if (!wgl_driver || wgl_driver == (void *)-1) return FALSE; gl_info->gl_ops.wgl = wgl_driver->wgl; gl_info->gl_ops.gl = wgl_driver->gl; } @@ -5433,7 +5433,7 @@ static BOOL InitAdapters(struct wined3d *wined3d) { DWORD err = GetLastError(); ERR("Failed to set adapter LUID (%#x).\n", err); - goto nogl_adapter; + return FALSE; } TRACE("Allocated LUID %08x:%08x for adapter.\n", adapter->luid.HighPart, adapter->luid.LowPart); @@ -5441,20 +5441,20 @@ static BOOL InitAdapters(struct wined3d *wined3d) if (!WineD3D_CreateFakeGLContext(&fake_gl_ctx)) { ERR("Failed to get a gl context for default adapter\n"); - goto nogl_adapter; + return FALSE; } ret = wined3d_adapter_init_gl_caps(adapter); if(!ret) { ERR("Failed to initialize gl caps for default adapter\n"); WineD3D_ReleaseFakeGLContext(&fake_gl_ctx); - goto nogl_adapter; + return FALSE; } ret = initPixelFormats(&adapter->gl_info, adapter->driver_info.vendor); if(!ret) { ERR("Failed to init gl formats\n"); WineD3D_ReleaseFakeGLContext(&fake_gl_ctx); - goto nogl_adapter; + return FALSE; } hdc = fake_gl_ctx.dc; @@ -5595,7 +5595,7 @@ static BOOL InitAdapters(struct wined3d *wined3d) WineD3D_ReleaseFakeGLContext(&fake_gl_ctx); HeapFree(GetProcessHeap(), 0, adapter->cfgs); - goto nogl_adapter; + return FALSE; } } @@ -5609,26 +5609,23 @@ static BOOL InitAdapters(struct wined3d *wined3d) TRACE("%u adapters successfully initialized.\n", wined3d->adapter_count); return TRUE; +} -nogl_adapter: - /* Initialize an adapter for ddraw-only memory counting */ - memset(wined3d->adapters, 0, sizeof(wined3d->adapters)); - wined3d->adapters[0].ordinal = 0; - wined3d->adapters[0].opengl = FALSE; - wined3d->adapters[0].monitorPoint.x = -1; - wined3d->adapters[0].monitorPoint.y = -1; +static void wined3d_adapter_init_nogl(struct wined3d_adapter *adapter, UINT ordinal) +{ + memset(adapter, 0, sizeof(*adapter)); + adapter->ordinal = ordinal; + adapter->monitorPoint.x = -1; + adapter->monitorPoint.y = -1; - wined3d->adapters[0].driver_info.name = "Display"; - wined3d->adapters[0].driver_info.description = "WineD3D DirectDraw Emulation"; + adapter->driver_info.name = "Display"; + adapter->driver_info.description = "WineD3D DirectDraw Emulation"; if (wined3d_settings.emulated_textureram) - wined3d->adapters[0].TextureRam = wined3d_settings.emulated_textureram; + adapter->TextureRam = wined3d_settings.emulated_textureram; else - wined3d->adapters[0].TextureRam = 8 * 1024 * 1024; /* This is plenty for a DDraw-only card */ - - initPixelFormatsNoGL(&wined3d->adapters[0].gl_info); + adapter->TextureRam = 128 * 1024 * 1024; - wined3d->adapter_count = 1; - return FALSE; + initPixelFormatsNoGL(&adapter->gl_info); } static void STDMETHODCALLTYPE wined3d_null_wined3d_object_destroyed(void *parent) {} @@ -5645,14 +5642,17 @@ HRESULT wined3d_init(struct wined3d *wined3d, UINT version, DWORD flags) wined3d->ref = 1; wined3d->flags = flags; + if (flags & WINED3D_NO3D) + { + wined3d_adapter_init_nogl(&wined3d->adapters[0], 0); + wined3d->adapter_count = 1; + return WINED3D_OK; + } + if (!InitAdapters(wined3d)) { WARN("Failed to initialize adapters.\n"); - if (version > 7) - { - MESSAGE("Direct3D%u is not available without OpenGL.\n", version); - return E_FAIL; - } + return E_FAIL; } return WINED3D_OK; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 77c76ab..7aa9651 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1220,6 +1220,7 @@ enum wined3d_display_rotation #define WINED3DDEVCAPS_NPATCHES 0x01000000 #define WINED3D_LEGACY_DEPTH_BIAS 0x00000001 +#define WINED3D_NO3D 0x00000002 /* dwDDFX */ /* arithmetic stretching along y axis */

1 0

Henri Verbeet : ddraw: Get rid of dump_light().
by Alexandre Julliard 14 Jan '13

14 Jan '13

Module: wine Branch: master Commit: af377acabed7fce13dea9aab9e55381d4d961c5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=af377acabed7fce13dea9aab9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jan 13 22:08:08 2013 +0100 ddraw: Get rid of dump_light(). --- dlls/ddraw/light.c | 30 ------------------------------ 1 files changed, 0 insertions(+), 30 deletions(-) diff --git a/dlls/ddraw/light.c b/dlls/ddraw/light.c index 1d81803..c4062ac 100644 --- a/dlls/ddraw/light.c +++ b/dlls/ddraw/light.c @@ -166,24 +166,6 @@ static HRESULT WINAPI d3d_light_Initialize(IDirect3DLight *iface, IDirect3D *d3d return D3D_OK; } -/***************************************************************************** - * IDirect3DLight::SetLight - * - * Assigns a lighting value to this object - * - * Params: - * Light: Lighting parameter to set - * - * Returns: - * D3D_OK on success - * DDERR_INVALIDPARAMS if Light is NULL - * - *****************************************************************************/ -static void dump_light(const D3DLIGHT2 *light) -{ - TRACE(" - dwSize : %d\n", light->dwSize); -} - static const float zero_value[] = { 0.0, 0.0, 0.0, 0.0 }; @@ -195,12 +177,6 @@ static HRESULT WINAPI d3d_light_SetLight(IDirect3DLight *iface, D3DLIGHT *data) TRACE("iface %p, data %p.\n", iface, data); - if (TRACE_ON(ddraw)) - { - TRACE(" Light definition :\n"); - dump_light((D3DLIGHT2 *)data); - } - if ((!data->dltType) || (data->dltType > D3DLIGHT_PARALLELPOINT)) return DDERR_INVALIDPARAMS; @@ -252,12 +228,6 @@ static HRESULT WINAPI d3d_light_GetLight(IDirect3DLight *iface, D3DLIGHT *lpLigh TRACE("iface %p, light %p.\n", iface, lpLight); - if (TRACE_ON(ddraw)) - { - TRACE(" Returning light definition :\n"); - dump_light(&light->light); - } - wined3d_mutex_lock(); memcpy(lpLight, &light->light, lpLight->dwSize); wined3d_mutex_unlock();

1 0

Henri Verbeet : ddraw: Only check dwFlags if we actually have a D3DLIGHT2 structure in d3d_light_SetLight ().
by Alexandre Julliard 14 Jan '13

14 Jan '13

Module: wine Branch: master Commit: d9051bbe93b470197a22cf1e21d26f5b7fb9ecbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9051bbe93b470197a22cf1e2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jan 13 22:08:07 2013 +0100 ddraw: Only check dwFlags if we actually have a D3DLIGHT2 structure in d3d_light_SetLight(). --- dlls/ddraw/light.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/light.c b/dlls/ddraw/light.c index ebc1410..1d81803 100644 --- a/dlls/ddraw/light.c +++ b/dlls/ddraw/light.c @@ -210,7 +210,7 @@ static HRESULT WINAPI d3d_light_SetLight(IDirect3DLight *iface, D3DLIGHT *data) /* Translate D3DLIGHT2 structure to D3DLIGHT7. */ light7->dltType = data->dltType; light7->dcvDiffuse = data->dcvColor; - if (((D3DLIGHT2 *)data)->dwFlags & D3DLIGHT_NO_SPECULAR) + if (data->dwSize >= sizeof(D3DLIGHT2) && (((D3DLIGHT2 *)data)->dwFlags & D3DLIGHT_NO_SPECULAR)) light7->dcvSpecular = data->dcvColor; else light7->dcvSpecular = *(const D3DCOLORVALUE *)zero_value;

1 0

Henri Verbeet : ddraw: Avoid LPD3DPICKRECORD.
by Alexandre Julliard 14 Jan '13

14 Jan '13

Module: wine Branch: master Commit: d210b875872c7aedd0bc845109a2ea69005465b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d210b875872c7aedd0bc84510… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jan 13 22:08:06 2013 +0100 ddraw: Avoid LPD3DPICKRECORD. --- include/d3d.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/d3d.h b/include/d3d.h index 94367da..2ee638e 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -950,7 +950,7 @@ DECLARE_INTERFACE_(IDirect3DDevice,IUnknown) IDirect3DViewport **viewport, DWORD flags) PURE; STDMETHOD(Pick)(THIS_ IDirect3DExecuteBuffer *buffer, IDirect3DViewport *viewport, DWORD flags, D3DRECT *rect) PURE; - STDMETHOD(GetPickRecords)(THIS_ LPDWORD lpCount, LPD3DPICKRECORD lpD3DPickRec) PURE; + STDMETHOD(GetPickRecords)(THIS_ DWORD *count, D3DPICKRECORD *records) PURE; STDMETHOD(EnumTextureFormats)(THIS_ LPD3DENUMTEXTUREFORMATSCALLBACK lpD3DEnumTextureProc, LPVOID lpArg) PURE; STDMETHOD(CreateMatrix)(THIS_ D3DMATRIXHANDLE *matrix) PURE; STDMETHOD(SetMatrix)(THIS_ D3DMATRIXHANDLE handle, D3DMATRIX *matrix) PURE;

1 0

Henri Verbeet : ddraw: Avoid LPD3DINSTRUCTION.
by Alexandre Julliard 14 Jan '13

14 Jan '13

Module: wine Branch: master Commit: cc60cc6abb6d662745d211bff444f9cc38bc4737 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc60cc6abb6d662745d211bff… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jan 13 22:08:05 2013 +0100 ddraw: Avoid LPD3DINSTRUCTION. --- dlls/ddraw/executebuffer.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index 1b412f7..5e8e475 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -71,8 +71,9 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, if (TRACE_ON(ddraw)) _dump_executedata(&(buffer->data)); - while (1) { - LPD3DINSTRUCTION current = (LPD3DINSTRUCTION) instr; + for (;;) + { + D3DINSTRUCTION *current = (D3DINSTRUCTION *)instr; BYTE size; WORD count;

1 0

Hans Leidekker : ws2_32: Set SO_REUSEPORT in addition to SO_REUSEADDR on MacOS.
by Alexandre Julliard 11 Jan '13

11 Jan '13

Module: wine Branch: master Commit: 197041f1ffe4841b0514701fd22fd4b743a41cd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=197041f1ffe4841b0514701fd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 11 17:22:59 2013 +0100 ws2_32: Set SO_REUSEPORT in addition to SO_REUSEADDR on MacOS. --- dlls/ws2_32/socket.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index eeb5265..c390828 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4452,6 +4452,15 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, if (setsockopt(fd, level, optname, optval, optlen) == 0) { +#ifdef __APPLE__ + if (level == SOL_SOCKET && optname == SO_REUSEADDR && + setsockopt(fd, level, SO_REUSEPORT, optval, optlen) != 0) + { + SetLastError(wsaErrno()); + release_sock_fd( s, fd ); + return SOCKET_ERROR; + } +#endif release_sock_fd( s, fd ); return 0; }

1 0

Hans Leidekker : wbemprox: Implement Win32_Process::GetOwner.
by Alexandre Julliard 11 Jan '13

11 Jan '13

Module: wine Branch: master Commit: 24b66842c4d72676a3552f5888f80ce4bc76d51c URL: http://source.winehq.org/git/wine.git/?a=commit;h=24b66842c4d72676a3552f588… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 11 17:22:14 2013 +0100 wbemprox: Implement Win32_Process::GetOwner. --- dlls/wbemprox/Makefile.in | 1 + dlls/wbemprox/builtin.c | 12 +++- dlls/wbemprox/process.c | 102 ++++++++++++++++++++++++++++++++++++++ dlls/wbemprox/tests/Makefile.in | 2 +- dlls/wbemprox/tests/query.c | 65 ++++++++++++++++++++++++ dlls/wbemprox/wbemprox_private.h | 5 ++ 6 files changed, 183 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=24b66842c4d72676a3552…

1 0

Hans Leidekker : wbemprox: Both signature parameters are optional in IWbemClassObject::GetMethod.
by Alexandre Julliard 11 Jan '13

11 Jan '13

Module: wine Branch: master Commit: f7bf3876af9d0682cdc9347a4da816bd58e22b6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7bf3876af9d0682cdc9347a4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 11 17:21:23 2013 +0100 wbemprox: Both signature parameters are optional in IWbemClassObject::GetMethod. --- dlls/wbemprox/class.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index 994e76b..4e27c5c 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -847,15 +847,23 @@ static HRESULT WINAPI class_object_GetMethod( IWbemClassObject **ppOutSignature ) { struct class_object *co = impl_from_IWbemClassObject( iface ); + IWbemClassObject *in, *out; HRESULT hr; TRACE("%p, %s, %08x, %p, %p\n", iface, debugstr_w(wszName), lFlags, ppInSignature, ppOutSignature); - hr = create_signature( co->name, wszName, PARAM_IN, ppInSignature ); - if (hr != S_OK || !ppOutSignature) return hr; + hr = create_signature( co->name, wszName, PARAM_IN, &in ); + if (hr != S_OK) return hr; - hr = create_signature( co->name, wszName, PARAM_OUT, ppOutSignature ); - if (hr != S_OK) IWbemClassObject_Release( *ppInSignature ); + hr = create_signature( co->name, wszName, PARAM_OUT, &out ); + if (hr == S_OK) + { + if (ppInSignature) *ppInSignature = in; + else IWbemClassObject_Release( in ); + if (ppOutSignature) *ppOutSignature = out; + else IWbemClassObject_Release( out ); + } + else IWbemClassObject_Release( in ); return hr; }

1 0

Damjan Jovanovic : shell32: Fix non-BOOL returns in BOOL functions.
by Alexandre Julliard 11 Jan '13

11 Jan '13

Module: wine Branch: master Commit: 0f64ffd91ff2fab97d9c52335478ff2fb4114947 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f64ffd91ff2fab97d9c52335… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu Jan 10 20:54:34 2013 +0200 shell32: Fix non-BOOL returns in BOOL functions. --- dlls/shell32/brsfolder.c | 2 +- dlls/shell32/changenotify.c | 2 +- dlls/shell32/shellord.c | 14 +++++++------- dlls/shell32/shellpath.c | 4 ++-- dlls/shell32/shlfileop.c | 2 +- dlls/shell32/shlmenu.c | 10 +++++----- dlls/shell32/shpolicy.c | 4 ++-- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c index d48666f..a14c172 100644 --- a/dlls/shell32/brsfolder.c +++ b/dlls/shell32/brsfolder.c @@ -957,7 +957,7 @@ static BOOL BrsFolder_OnSetSelectionA(browse_info *info, LPVOID selection, BOOL return result; } -static BOOL BrsFolder_OnWindowPosChanging(browse_info *info, WINDOWPOS *pos) +static LRESULT BrsFolder_OnWindowPosChanging(browse_info *info, WINDOWPOS *pos) { if ((info->lpBrowseInfo->ulFlags & BIF_NEWDIALOGSTYLE) && !(pos->flags & SWP_NOSIZE)) { diff --git a/dlls/shell32/changenotify.c b/dlls/shell32/changenotify.c index 94efb7a..2fba5b9 100644 --- a/dlls/shell32/changenotify.c +++ b/dlls/shell32/changenotify.c @@ -230,7 +230,7 @@ BOOL WINAPI SHChangeNotifyUpdateEntryList(DWORD unknown1, DWORD unknown2, FIXME("(0x%08x, 0x%08x, 0x%08x, 0x%08x)\n", unknown1, unknown2, unknown3, unknown4); - return -1; + return TRUE; } struct new_delivery_notification diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index fcad032..31891e4 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -1190,7 +1190,7 @@ void WINAPI SHFreeUnusedLibraries (void) BOOL WINAPI DAD_AutoScroll(HWND hwnd, AUTO_SCROLL_DATA *samples, LPPOINT pt) { FIXME("hwnd = %p %p %p\n",hwnd,samples,pt); - return 0; + return FALSE; } /************************************************************************* * DAD_DragEnter [SHELL32.130] @@ -1238,8 +1238,8 @@ BOOL WINAPI DAD_SetDragImage( HIMAGELIST himlTrack, LPPOINT lppt) { - FIXME("%p %p stub\n",himlTrack, lppt); - return 0; + FIXME("%p %p stub\n",himlTrack, lppt); + return FALSE; } /************************************************************************* * DAD_ShowDragImage [SHELL32.137] @@ -1249,8 +1249,8 @@ BOOL WINAPI DAD_SetDragImage( */ BOOL WINAPI DAD_ShowDragImage(BOOL bShow) { - FIXME("0x%08x stub\n",bShow); - return 0; + FIXME("0x%08x stub\n",bShow); + return FALSE; } static const WCHAR szwCabLocation[] = { @@ -1344,7 +1344,7 @@ BOOL WINAPI WriteCabinetState(CABINETSTATE *cs) */ BOOL WINAPI FileIconInit(BOOL bFullInit) { FIXME("(%s)\n", bFullInit ? "true" : "false"); - return 0; + return FALSE; } /************************************************************************* @@ -1551,7 +1551,7 @@ BOOL WINAPI SHWaitForFileToOpen( DWORD dwTimeout) { FIXME("%p 0x%08x 0x%08x stub\n", pidl, dwFlags, dwTimeout); - return 0; + return FALSE; } /************************************************************************ diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 6fdd762..875be38 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -647,7 +647,7 @@ int WINAPI PathCleanupSpec( LPCWSTR lpszPathW, LPWSTR lpszFileW ) static BOOL PathQualifyA(LPCSTR pszPath) { FIXME("%s\n",pszPath); - return 0; + return FALSE; } /************************************************************************* @@ -656,7 +656,7 @@ static BOOL PathQualifyA(LPCSTR pszPath) static BOOL PathQualifyW(LPCWSTR pszPath) { FIXME("%s\n",debugstr_w(pszPath)); - return 0; + return FALSE; } /************************************************************************* diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index 787ba75..4ef7803 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -1134,7 +1134,7 @@ static BOOL copy_file_to_file(FILE_OPERATION *op, const WCHAR *szFrom, const WCH if (!(op->req->fFlags & FOF_NOCONFIRMATION) && PathFileExistsW(szTo)) { if (!SHELL_ConfirmDialogW(op->req->hwnd, ASK_OVERWRITE_FILE, PathFindFileNameW(szTo), op)) - return 0; + return FALSE; } return SHNotifyCopyFileW(szFrom, szTo, FALSE) == 0; diff --git a/dlls/shell32/shlmenu.c b/dlls/shell32/shlmenu.c index 911feca..5dfdd08 100644 --- a/dlls/shell32/shlmenu.c +++ b/dlls/shell32/shlmenu.c @@ -372,7 +372,7 @@ static BOOL FileMenu_AppendItemW( if ((menudata == 0) || (MenuInfo.cbSize != sizeof(MENUINFO))) { ERR("menudata corrupt: %p %u\n", menudata, MenuInfo.cbSize); - return 0; + return FALSE; } menudata->bFixedItems = TRUE; @@ -549,7 +549,7 @@ BOOL WINAPI FileMenu_GetLastSelectedItemPidls( LPCITEMIDLIST *ppidlItem) { FIXME("0x%08x %p %p\n",uReserved, ppidlFolder, ppidlItem); - return 0; + return FALSE; } #define FM_ICON_SIZE 16 @@ -758,7 +758,7 @@ BOOL WINAPI FileMenu_DeleteItemByFirstID( UINT uID) { TRACE("%p 0x%08x\n", hMenu, uID); - return 0; + return FALSE; } /************************************************************************* @@ -767,7 +767,7 @@ BOOL WINAPI FileMenu_DeleteItemByFirstID( BOOL WINAPI FileMenu_DeleteSeparator(HMENU hMenu) { TRACE("%p\n", hMenu); - return 0; + return FALSE; } /************************************************************************* @@ -779,7 +779,7 @@ BOOL WINAPI FileMenu_EnableItemByCmd( BOOL bEnable) { TRACE("%p 0x%08x 0x%08x\n", hMenu, uID,bEnable); - return 0; + return FALSE; } /************************************************************************* diff --git a/dlls/shell32/shpolicy.c b/dlls/shell32/shpolicy.c index 9ca8b46..62e6ab5 100644 --- a/dlls/shell32/shpolicy.c +++ b/dlls/shell32/shpolicy.c @@ -900,14 +900,14 @@ BOOL WINAPI SHInitRestricted(LPCVOID unused, LPCVOID inpRegKey) if (lstrcmpiW(inpRegKey, strRegistryPolicyW) && lstrcmpiW(inpRegKey, strPolicyW)) /* doesn't match, fail */ - return 0; + return FALSE; } else { if (lstrcmpiA(inpRegKey, strRegistryPolicyA) && lstrcmpiA(inpRegKey, strPolicyA)) /* doesn't match, fail */ - return 0; + return FALSE; } }

1 0

← Newer
1
...
44
45
46
47
48
49
50
...
74
Older →

Jump to page:

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-commits January 2013