July 2006 - Wine-Commits - list.winehq.org

Vitaliy Margolen : dinput: Simplify code a bit.
by Alexandre Julliard July 24, 2006

July 24, 2006

Module: wine Branch: refs/heads/master Commit: 3241974ebd723dc0bfc9d1410f052afd617e7ba3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3241974ebd723dc0bfc9d14… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Sat Jul 22 13:11:33 2006 -0600 dinput: Simplify code a bit. --- dlls/dinput/device_private.h | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index 9cde397..8ccd0ab 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -64,8 +64,7 @@ #define GEN_EVENT(offset,data,xtime,seq) (int) (data), (int) (offset), \ (int) (This->queue_head), (int) (This->queue_len)); \ \ - nq = This->queue_head+1; \ - while (nq >= This->queue_len) nq -= This->queue_len; \ + nq = (This->queue_head+1) % This->queue_len; \ if ((offset >= 0) && (nq != This->queue_tail)) { \ This->data_queue[This->queue_head].dwOfs = offset; \ This->data_queue[This->queue_head].dwData = data; \

1 0

Vitaliy Margolen : dinput: Fix small typo.
by Alexandre Julliard July 24, 2006

July 24, 2006

Module: wine Branch: refs/heads/master Commit: b88c1677d14ffd9f31ac4d10e655c8ead3ec608d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b88c1677d14ffd9f31ac4d1… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Sun Jul 23 09:59:16 2006 -0600 dinput: Fix small typo. --- dlls/dinput/dinput_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 9f93a52..369984d 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -345,7 +345,7 @@ static HRESULT WINAPI IDirectInputAImpl_ return ret_value; } -static HRESULT WINAPI IDirectInputWImpl_CreateDevice(LPDIRECTINPUT7A iface, +static HRESULT WINAPI IDirectInputWImpl_CreateDevice(LPDIRECTINPUT7W iface, REFGUID rguid, LPDIRECTINPUTDEVICEW* pdev, LPUNKNOWN punk) { IDirectInputImpl *This = (IDirectInputImpl *)iface; HRESULT ret_value = DIERR_DEVICENOTREG;

1 0

Mike McCormack : msi: MoveMsiEnumPatches to registry.c
by Alexandre Julliard July 24, 2006

July 24, 2006

Module: wine Branch: refs/heads/master Commit: dc4d5b0f0eb58ef852407147ab2070200db03edc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=dc4d5b0f0eb58ef85240714… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Jul 24 15:24:53 2006 +0900 msi: MoveMsiEnumPatches to registry.c --- dlls/msi/msi.c | 22 ---------------------- dlls/msi/registry.c | 22 ++++++++++++++++++++++ 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index f81c9d6..1b12cdf 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -2089,28 +2089,6 @@ UINT WINAPI MsiReinstallFeatureA( LPCSTR } /*********************************************************************** - * MsiEnumPatchesA [MSI.@] - */ -UINT WINAPI MsiEnumPatchesA( LPCSTR szProduct, DWORD iPatchIndex, - LPSTR lpPatchBuf, LPSTR lpTransformsBuf, DWORD* pcchTransformsBuf) -{ - FIXME("%s %ld %p %p %p\n", debugstr_a(szProduct), - iPatchIndex, lpPatchBuf, lpTransformsBuf, pcchTransformsBuf); - return ERROR_NO_MORE_ITEMS; -} - -/*********************************************************************** - * MsiEnumPatchesW [MSI.@] - */ -UINT WINAPI MsiEnumPatchesW( LPCWSTR szProduct, DWORD iPatchIndex, - LPWSTR lpPatchBuf, LPWSTR lpTransformsBuf, DWORD* pcchTransformsBuf) -{ - FIXME("%s %ld %p %p %p\n", debugstr_w(szProduct), - iPatchIndex, lpPatchBuf, lpTransformsBuf, pcchTransformsBuf); - return ERROR_NO_MORE_ITEMS; -} - -/*********************************************************************** * MsiGetFileHashW [MSI.@] */ UINT WINAPI MsiGetFileHashW( LPCWSTR szFilePath, DWORD dwOptions, diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index 7c6eca1..fe51ae7 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -1070,3 +1070,25 @@ UINT WINAPI MsiEnumRelatedProductsA(LPCS msi_free( szwUpgradeCode); return r; } + +/*********************************************************************** + * MsiEnumPatchesA [MSI.@] + */ +UINT WINAPI MsiEnumPatchesA( LPCSTR szProduct, DWORD iPatchIndex, + LPSTR lpPatchBuf, LPSTR lpTransformsBuf, DWORD* pcchTransformsBuf) +{ + FIXME("%s %ld %p %p %p\n", debugstr_a(szProduct), + iPatchIndex, lpPatchBuf, lpTransformsBuf, pcchTransformsBuf); + return ERROR_NO_MORE_ITEMS; +} + +/*********************************************************************** + * MsiEnumPatchesW [MSI.@] + */ +UINT WINAPI MsiEnumPatchesW( LPCWSTR szProduct, DWORD iPatchIndex, + LPWSTR lpPatchBuf, LPWSTR lpTransformsBuf, DWORD* pcchTransformsBuf) +{ + FIXME("%s %ld %p %p %p\n", debugstr_w(szProduct), + iPatchIndex, lpPatchBuf, lpTransformsBuf, pcchTransformsBuf); + return ERROR_NO_MORE_ITEMS; +}

1 0

Stefan Dösinger : wined3d: Whitelist pixelformats instead of blacklisting.
by Alexandre Julliard July 24, 2006

July 24, 2006

Module: wine Branch: refs/heads/master Commit: 127613bc6fc8d1b818af9354b2834a19b19155e3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=127613bc6fc8d1b818af935… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jul 22 01:58:19 2006 +0200 wined3d: Whitelist pixelformats instead of blacklisting. --- dlls/wined3d/directx.c | 191 ++++++++++++++++++++++++++++++++++-------------- dlls/wined3d/utils.c | 4 + 2 files changed, 138 insertions(+), 57 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 35542af..62d681b 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1414,6 +1414,46 @@ static HRESULT WINAPI IWineD3DImpl_Check return WINED3DERR_INVALIDCALL; } + if(Usage & WINED3DUSAGE_DEPTHSTENCIL) { + switch (CheckFormat) { + case WINED3DFMT_D16_LOCKABLE: + case WINED3DFMT_D32: + case WINED3DFMT_D15S1: + case WINED3DFMT_D24S8: + case WINED3DFMT_D24X8: + case WINED3DFMT_D24X4S4: + case WINED3DFMT_D16: + case WINED3DFMT_L16: + case WINED3DFMT_D32F_LOCKABLE: + case WINED3DFMT_D24FS8: + TRACE_(d3d_caps)("[OK]\n"); + return D3D_OK; + default: + TRACE_(d3d_caps)("[FAILED]\n"); + return WINED3DERR_NOTAVAILABLE; + } + } else if(Usage & WINED3DUSAGE_RENDERTARGET) { + switch (CheckFormat) { + case WINED3DFMT_R8G8B8: + case WINED3DFMT_A8R8G8B8: + case WINED3DFMT_X8R8G8B8: + case WINED3DFMT_R5G6B5: + case WINED3DFMT_X1R5G5B5: + case WINED3DFMT_A1R5G5B5: + case WINED3DFMT_A4R4G4B4: + case WINED3DFMT_R3G3B2: + case WINED3DFMT_X4R4G4B4: + case WINED3DFMT_A8B8G8R8: + case WINED3DFMT_X8B8G8R8: + case WINED3DFMT_P8: + TRACE_(d3d_caps)("[OK]\n"); + return WINED3D_OK; + default: + TRACE_(d3d_caps)("[FAILED]\n"); + return WINED3DERR_NOTAVAILABLE; + } + } + if (GL_SUPPORT(EXT_TEXTURE_COMPRESSION_S3TC)) { switch (CheckFormat) { case D3DFMT_DXT1: @@ -1429,65 +1469,106 @@ static HRESULT WINAPI IWineD3DImpl_Check } switch (CheckFormat) { - /***** - * check supported using GL_SUPPORT - */ - case D3DFMT_DXT1: - case D3DFMT_DXT2: - case D3DFMT_DXT3: - case D3DFMT_DXT4: - case D3DFMT_DXT5: - - /***** - * supported - */ - /*case D3DFMT_R5G6B5: */ - /*case D3DFMT_X1R5G5B5:*/ - /*case D3DFMT_A1R5G5B5: */ - /*case D3DFMT_A4R4G4B4:*/ - /***** - * unsupported - */ + /***** + * supported: RGB(A) formats + */ + case WINED3DFMT_R8G8B8: + case WINED3DFMT_A8R8G8B8: + case WINED3DFMT_X8R8G8B8: + case WINED3DFMT_R5G6B5: + case WINED3DFMT_X1R5G5B5: + case WINED3DFMT_A1R5G5B5: + case WINED3DFMT_A4R4G4B4: + case WINED3DFMT_R3G3B2: + case WINED3DFMT_A8: + case WINED3DFMT_A8R3G3B2: + case WINED3DFMT_X4R4G4B4: + case WINED3DFMT_A8B8G8R8: + case WINED3DFMT_X8B8G8R8: + case WINED3DFMT_A2R10G10B10: + case WINED3DFMT_A2B10G10R10: + TRACE_(d3d_caps)("[OK]\n"); + return WINED3D_OK; + + /***** + * supported: Palettized + */ + case WINED3DFMT_P8: + TRACE_(d3d_caps)("[OK]\n"); + return WINED3D_OK; + + /***** + * Supported: (Alpha)-Luminance + */ + case WINED3DFMT_L8: + case WINED3DFMT_A8L8: + case WINED3DFMT_A4L4: + TRACE_(d3d_caps)("[OK]\n"); + return WINED3D_OK; + + /***** + * Not supported for now: Bump mapping formats + * Enable some because games often fail when they are not available + * and are still playable even without bump mapping + */ + case WINED3DFMT_V8U8: + case WINED3DFMT_V16U16: + WARN_(d3d_caps)("[Not supported, but pretended to do]\n"); + return WINED3D_OK; + + case WINED3DFMT_L6V5U5: + case WINED3DFMT_X8L8V8U8: + case WINED3DFMT_Q8W8V8U8: + case WINED3DFMT_W11V11U10: + case WINED3DFMT_A2W10V10U10: + TRACE_(d3d_caps)("[FAILED]\n"); + return D3DERR_NOTAVAILABLE; + + /***** + * DXTN Formats: Handled above + * WINED3DFMT_DXT1 + * WINED3DFMT_DXT2 + * WINED3DFMT_DXT3 + * WINED3DFMT_DXT4 + * WINED3DFMT_DXT5 + */ + + /***** + * Odd formats - not supported + */ + case WINED3DFMT_VERTEXDATA: + case WINED3DFMT_INDEX16: + case WINED3DFMT_INDEX32: + case WINED3DFMT_Q16W16V16U16: + TRACE_(d3d_caps)("[FAILED]\n"); /* Enable when implemented */ + return D3DERR_NOTAVAILABLE; + + /***** + * Float formats: Not supported right now + */ + case WINED3DFMT_R16F: + case WINED3DFMT_G16R16F: + case WINED3DFMT_A16B16G16R16F: + case WINED3DFMT_R32F: + case WINED3DFMT_G32R32F: + case WINED3DFMT_A32B32G32R32F: + case WINED3DFMT_CxV8U8: + TRACE_(d3d_caps)("[FAILED]\n"); /* Enable when implemented */ + return D3DERR_NOTAVAILABLE; + + /* Not supported */ + case WINED3DFMT_G16R16: + case WINED3DFMT_A16B16G16R16: + TRACE_(d3d_caps)("[FAILED]\n"); /* Enable when implemented */ + return D3DERR_NOTAVAILABLE; - /* color buffer */ - /*case D3DFMT_X8R8G8B8:*/ - case D3DFMT_A8R3G3B2: - - /* Paletted */ - case D3DFMT_P8: - case D3DFMT_A8P8: - - /* Luminance */ - case D3DFMT_L8: - case D3DFMT_A8L8: - case D3DFMT_A4L4: - - /* Bump */ -#if 0 - case D3DFMT_V8U8: - case D3DFMT_V16U16: -#endif - case D3DFMT_L6V5U5: - case D3DFMT_X8L8V8U8: - case D3DFMT_Q8W8V8U8: - case D3DFMT_W11V11U10: - - /**** - * currently hard to support - */ - case D3DFMT_UYVY: - case D3DFMT_YUY2: - - /* Since we do not support these formats right now, don't pretend to. */ - TRACE_(d3d_caps)("[FAILED]\n"); - return WINED3DERR_NOTAVAILABLE; - default: - break; + default: + break; } - TRACE_(d3d_caps)("[OK]\n"); - return WINED3D_OK; + TRACE_(d3d_caps)("[FAILED]\n"); + return D3DERR_NOTAVAILABLE; } static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormatConversion(IWineD3D *iface, UINT Adapter, WINED3DDEVTYPE DeviceType, diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 8275953..6f11e13 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -71,11 +71,11 @@ static const PixelFormatDesc formats[] = {WINED3DFMT_A8 ,0x000000ff ,0x0 ,0x0 ,0x0 ,1 ,FALSE ,GL_ALPHA8 ,GL_ALPHA ,GL_ALPHA }, {WINED3DFMT_A8R3G3B2 ,0x0000ff00 ,0x000000e0 ,0x0000001c ,0x00000003 ,2 ,FALSE ,0 ,0 ,0 }, {WINED3DFMT_X4R4G4B4 ,0x0 ,0x00000f00 ,0x000000f0 ,0x0000000f ,2 ,FALSE ,GL_RGB4 ,GL_BGRA ,GL_UNSIGNED_SHORT_4_4_4_4_REV }, - {WINED3DFMT_A2B10G10R10 ,0xb0000000 ,0x000003ff ,0x000ffc00 ,0x3ff00000 ,4 ,FALSE ,0 ,0 ,0 }, + {WINED3DFMT_A2B10G10R10 ,0xb0000000 ,0x000003ff ,0x000ffc00 ,0x3ff00000 ,4 ,FALSE ,GL_RGB ,GL_RGBA ,GL_UNSIGNED_INT_2_10_10_10_REV }, {WINED3DFMT_A8B8G8R8 ,0xff000000 ,0x000000ff ,0x0000ff00 ,0x00ff0000 ,4 ,FALSE ,GL_RGBA8 ,GL_RGBA ,GL_UNSIGNED_INT_8_8_8_8_REV }, {WINED3DFMT_X8B8G8R8 ,0x0 ,0x000000ff ,0x0000ff00 ,0x00ff0000 ,4 ,FALSE ,GL_RGB8 ,GL_RGBA ,GL_UNSIGNED_INT_8_8_8_8_REV }, {WINED3DFMT_G16R16 ,0x0 ,0x0000ffff ,0xffff0000 ,0x0 ,4 ,FALSE ,0 ,0 ,0 }, - {WINED3DFMT_A2R10G10B10 ,0xb0000000 ,0x3ff00000 ,0x000ffc00 ,0x000003ff ,4 ,FALSE ,0 ,0 ,0 }, + {WINED3DFMT_A2R10G10B10 ,0xb0000000 ,0x3ff00000 ,0x000ffc00 ,0x000003ff ,4 ,FALSE ,GL_RGBA ,GL_BGRA ,GL_UNSIGNED_INT_2_10_10_10_REV }, {WINED3DFMT_A16B16G16R16,0x0 ,0x0000ffff ,0xffff0000 ,0x0 ,8 ,FALSE ,GL_RGBA16_EXT ,GL_RGBA ,GL_UNSIGNED_SHORT }, /* Luminance */ {WINED3DFMT_L8 ,0x0 ,0x0 ,0x0 ,0x0 ,1 ,FALSE ,GL_LUMINANCE8 ,GL_LUMINANCE ,GL_UNSIGNED_BYTE },

1 0

Stefan Dösinger : wined3d: Reactivate the X bits fixup .
by Alexandre Julliard July 24, 2006

July 24, 2006

Module: wine Branch: refs/heads/master Commit: a64febd3d1fbe7ff7889f50f34fb75b5a1e3a56b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a64febd3d1fbe7ff7889f50… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jul 22 01:02:09 2006 +0200 wined3d: Reactivate the X bits fixup. --- dlls/wined3d/surface.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index fa4f615..0e90f13 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -861,7 +861,6 @@ static void flush_to_framebuffer_drawpix case WINED3DFMT_X4R4G4B4: { -#if 0 /* Do we still need that? Those pixel formats have no alpha channel in gl any more */ int size; unsigned short *data; data = (unsigned short *)This->resource.allocatedMemory; @@ -871,7 +870,6 @@ #if 0 /* Do we still need that? Th data++; size--; } -#endif type = This->glDescription.glType; fmt = This->glDescription.glFormat; mem = This->resource.allocatedMemory; @@ -880,7 +878,6 @@ #endif case WINED3DFMT_X1R5G5B5: { -#if 0 /* Do we still need that? Those pixel formats have no alpha channel in gl any more */ int size; unsigned short *data; data = (unsigned short *)This->resource.allocatedMemory; @@ -890,7 +887,6 @@ #if 0 /* Do we still need that? Th data++; size--; } -#endif type = This->glDescription.glType; fmt = This->glDescription.glFormat; mem = This->resource.allocatedMemory; @@ -899,7 +895,6 @@ #endif case WINED3DFMT_X8R8G8B8: { -#if 0 /* Do we still need that? Those pixel formats have no alpha channel in gl any more */ /* make sure the X byte is set to alpha on, since it could be any random value this fixes the intro move in Pirates! */ int size; @@ -911,8 +906,8 @@ #if 0 /* Do we still need that? Th data++; size--; } -#endif } + /* Fall trough */ case WINED3DFMT_A8R8G8B8: {

1 0

Mike McCormack : shdocvw: Register MruListLong.
by Alexandre Julliard July 24, 2006

July 24, 2006

Module: wine Branch: refs/heads/master Commit: 591309875ade3c5cc77b98c84c24201316c00773 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=591309875ade3c5cc77b98c… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Jul 24 12:02:20 2006 +0900 shdocvw: Register MruListLong. --- dlls/shdocvw/regsvr.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/regsvr.c b/dlls/shdocvw/regsvr.c index a3d54e6..83da050 100644 --- a/dlls/shdocvw/regsvr.c +++ b/dlls/shdocvw/regsvr.c @@ -505,6 +505,8 @@ static LONG recursive_delete_keyW(HKEY b static const GUID CLSID_MicrosoftBrowserArchitecture = {0xa5e46e3a, 0x8849, 0x11d1, {0x9d, 0x8c, 0x00, 0xc0, 0x4f, 0xc9, 0x9d, 0x61}}; +static const GUID CLSID_MruLongList = +{0x53bd6b4e, 0x3780, 0x4693, {0xaf, 0xc3, 0x71, 0x61, 0xc2, 0xf3, 0xee, 0x9c}}; /*********************************************************************** * coclass list @@ -591,6 +593,15 @@ static struct regsvr_coclass const cocla NULL, NULL }, + { + &CLSID_MruLongList, + "MruLongList", + NULL, + "shdocvw.dll", + "Apartment", + NULL, + NULL + }, { NULL } /* list terminator */ };

1 0

Mike McCormack : hlink: Implement HlinkNavigateToStringReference.
by Alexandre Julliard July 24, 2006

July 24, 2006

Module: wine Branch: refs/heads/master Commit: 62124399365e9c298132eee75c3eb062437925d9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=62124399365e9c298132eee… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Jul 24 11:56:15 2006 +0900 hlink: Implement HlinkNavigateToStringReference. --- dlls/hlink/hlink_main.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/hlink/hlink_main.c b/dlls/hlink/hlink_main.c index fa8fb84..dfa4464 100644 --- a/dlls/hlink/hlink_main.c +++ b/dlls/hlink/hlink_main.c @@ -239,10 +239,19 @@ HRESULT WINAPI HlinkNavigateToStringRefe IHlinkFrame *pihlframe, DWORD grfHLNF, LPBC pibc, IBindStatusCallback *pibsc, IHlinkBrowseContext *pihlbc) { + HRESULT r; + IHlink *hlink = NULL; + FIXME("%s %s %p %08lx %p %08lx %p %p %p\n", debugstr_w(pwzTarget), debugstr_w(pwzLocation), pihlsite, dwSiteData, pihlframe, grfHLNF, pibc, pibsc, pihlbc); - return E_NOTIMPL; + + r = HlinkCreateFromString( pwzTarget, pwzLocation, NULL, pihlsite, + dwSiteData, NULL, &IID_IHlink, (LPVOID*) &hlink ); + if (SUCCEEDED(r)) + r = HlinkNavigate(hlink, pihlframe, grfHLNF, pibc, pibsc, pihlbc); + + return r; } static HRESULT WINAPI HLinkCF_fnQueryInterface ( LPCLASSFACTORY iface,

1 0

Mike McCormack : hlink: Only release an object that we successfully created .
by Alexandre Julliard July 24, 2006

July 24, 2006

Module: wine Branch: refs/heads/master Commit: e4025c50c7b2aa7ef51318b6aac1b9bb0392ebf6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e4025c50c7b2aa7ef51318b… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Jul 24 11:55:53 2006 +0900 hlink: Only release an object that we successfully created. --- dlls/hlink/link.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/hlink/link.c b/dlls/hlink/link.c index e82672c..baf3b75 100644 --- a/dlls/hlink/link.c +++ b/dlls/hlink/link.c @@ -444,7 +444,7 @@ static HRESULT WINAPI IHlink_fnNavigate( if (mon) { IBindCtx *bcxt; - IHlinkTarget *target; + IHlinkTarget *target = NULL; HRESULT r = S_OK; CreateBindCtx(0, &bcxt); @@ -458,12 +458,12 @@ static HRESULT WINAPI IHlink_fnNavigate( { IHlinkTarget_SetBrowseContext(target, phbc); IHlinkTarget_Navigate(target, grfHLNF, This->Location); + IHlinkTarget_Release(target); } RevokeBindStatusCallback(bcxt, pbsc); IBindCtx_Release(bcxt); - IHlinkTarget_Release(target); IMoniker_Release(mon); }

1 0

Hwang YunSong(황윤성 : winhelp: Updated Korean resource.
by Alexandre Julliard July 24, 2006

July 24, 2006

Module: wine Branch: refs/heads/master Commit: 6ff25905b00b40ba4684662ad38db02894f1865a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6ff25905b00b40ba4684662… Author: Hwang YunSong(황윤성 <hys545(a)dreamwiz.com> Date: Mon Jul 24 08:52:08 2006 +0900 winhelp: Updated Korean resource. --- programs/winhelp/Ko.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winhelp/Ko.rc b/programs/winhelp/Ko.rc index 1d1574d..8e27644 100644 --- a/programs/winhelp/Ko.rc +++ b/programs/winhelp/Ko.rc @@ -45,7 +45,7 @@ MAIN_MENU MENU LANGUAGE LANG_KOREAN, SUB MENUITEM SEPARATOR MENUITEM "��(&I)...", MNID_HELP_ABOUT #ifdef WINELIB - MENUITEM "��ο� ��Ͽ�(&A)", MNID_HELP_WINE + MENUITEM "Wine�� Ͽ�(&A)", MNID_HELP_WINE #endif } } @@ -54,7 +54,7 @@ #endif STRINGTABLE DISCARDABLE LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT { -STID_WINE_HELP, "�� " +STID_WINE_HELP, "Wine ��" STID_WHERROR, "��" STID_WARNING, "��" STID_INFO, "��"

1 0

Mike McCormack : query: Add a stub implementation for LocateCatalogs.
by Alexandre Julliard July 24, 2006

July 24, 2006

Module: wine Branch: refs/heads/master Commit: c307df85cc5129d78841f32dd27b343a901b8d76 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c307df85cc5129d78841f32… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Jul 24 11:55:32 2006 +0900 query: Add a stub implementation for LocateCatalogs. --- dlls/query/query.spec | 4 ++-- dlls/query/query_main.c | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/query/query.spec b/dlls/query/query.spec index f8d177f..612ea2d 100644 --- a/dlls/query/query.spec +++ b/dlls/query/query.spec @@ -36,8 +36,8 @@ # @ stdcall -private DllUnregisterServer @ stub LoadIFilter @ stub LoadTextFilter @ stub LocateCatalogs -@ stub LocateCatalogsA -@ stub LocateCatalogsW +@ stdcall LocateCatalogsA(str long ptr ptr ptr ptr) +@ stdcall LocateCatalogsW(wstr long ptr ptr ptr ptr) @ stub SetCatalogState @ stub SetupCache @ stub SetupCacheEx diff --git a/dlls/query/query_main.c b/dlls/query/query_main.c index 6b08352..938c4ca 100644 --- a/dlls/query/query_main.c +++ b/dlls/query/query_main.c @@ -76,3 +76,23 @@ HRESULT WINAPI CIState( WCHAR const *pwc FIXME("%s %s %p\n", debugstr_w(pwcsCat), debugstr_w(pwcsMachine), pCiState); return CI_E_NOT_RUNNING; } + +HRESULT WINAPI LocateCatalogsA(CHAR const *pwszScope, ULONG iBm, + CHAR *pwszMachine, ULONG *pcMachine, + CHAR *pwszCat, ULONG *pcCat) +{ + + FIXME("%s %lu %p %p %p %p\n", debugstr_a(pwszScope), + iBm, pwszMachine, pcMachine, pwszCat, pcCat); + return CI_E_NOT_RUNNING; +} + +HRESULT WINAPI LocateCatalogsW(WCHAR const *pwszScope, ULONG iBm, + WCHAR *pwszMachine, ULONG *pcMachine, + WCHAR *pwszCat, ULONG *pcCat) +{ + + FIXME("%s %lu %p %p %p %p\n", debugstr_w(pwszScope), + iBm, pwszMachine, pcMachine, pwszCat, pcCat); + return CI_E_NOT_RUNNING; +}

1 0