October 2009 - Wine-Commits

Henri Verbeet : wined3d: Free the shader buffer in shader_glsl_free() ( Valgrind).
by Alexandre Julliard Oct. 21, 2009

Oct. 21, 2009

Module: wine Branch: master Commit: fa548414f90c2aed896043e522d62d2bcb129a68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa548414f90c2aed896043e52… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 21 10:34:00 2009 +0200 wined3d: Free the shader buffer in shader_glsl_free() (Valgrind). --- dlls/wined3d/glsl_shader.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 6bf4144..37e325d 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4589,6 +4589,7 @@ static void shader_glsl_free(IWineD3DDevice *iface) { constant_heap_free(&priv->pconst_heap); constant_heap_free(&priv->vconst_heap); HeapFree(GetProcessHeap(), 0, priv->stack); + shader_buffer_free(&priv->shader_buffer); HeapFree(GetProcessHeap(), 0, This->shader_priv); This->shader_priv = NULL;

1 0

Paul Vriens : ddraw/tests: Fix a test failure on Win9x/WinMe.
by Alexandre Julliard Oct. 21, 2009

Oct. 21, 2009

Module: wine Branch: master Commit: e1bf800ba56998bea90493e5ea37275913e4001e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1bf800ba56998bea90493e5e… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Oct 21 10:21:55 2009 +0200 ddraw/tests: Fix a test failure on Win9x/WinMe. --- dlls/ddraw/tests/d3d.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 9104147..ee49dc8 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -960,8 +960,7 @@ static BOOL D3D1_createObjects(void) ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE; ddsd.dwWidth = 256; ddsd.dwHeight = 256; - hr = IDirectDraw_CreateSurface(DirectDraw1, &ddsd, &Surface1, NULL); - ok(SUCCEEDED(hr), "IDirectDraw_CreateSurface returned %#x.\n", hr); + IDirectDraw_CreateSurface(DirectDraw1, &ddsd, &Surface1, NULL); if (!Surface1) { skip("DDSCAPS_3DDEVICE surface not available\n"); return FALSE;

1 0

Henri Verbeet : wined3d: Rename WineD3DAdapter to wined3d_adapter.
by Alexandre Julliard Oct. 21, 2009

Oct. 21, 2009

Module: wine Branch: master Commit: f2aaca2f6788857c48e1902e254d6653a9a278c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2aaca2f6788857c48e1902e2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 21 10:33:58 2009 +0200 wined3d: Rename WineD3DAdapter to wined3d_adapter. --- dlls/wined3d/directx.c | 51 ++++++++++++++++++++------------------- dlls/wined3d/wined3d_private.h | 6 ++-- 2 files changed, 29 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f2aaca2f6788857c48e19…

1 0

Henri Verbeet : wined3d: Free the adapter' s format info in IWineD3DImpl_Release() (Valgrind).
by Alexandre Julliard Oct. 21, 2009

Oct. 21, 2009

Module: wine Branch: master Commit: 42eb516d965bd58677d4debe21c3249d229f4f53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42eb516d965bd58677d4debe2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 21 10:33:59 2009 +0200 wined3d: Free the adapter's format info in IWineD3DImpl_Release() (Valgrind). --- dlls/wined3d/directx.c | 8 +++++++- dlls/wined3d/utils.c | 2 ++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index bd26408..bc9691f 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -334,6 +334,12 @@ long WineD3DAdapterChangeGLRam(IWineD3DDeviceImpl *D3DDevice, long glram) return adapter->UsedTextureRam; } +static void wined3d_adapter_cleanup(struct wined3d_adapter *adapter) +{ + HeapFree(GetProcessHeap(), 0, adapter->gl_info.gl_formats); + HeapFree(GetProcessHeap(), 0, adapter->cfgs); +} + /********************************************************** * IUnknown parts follows **********************************************************/ @@ -372,7 +378,7 @@ static ULONG WINAPI IWineD3DImpl_Release(IWineD3D *iface) { for (i = 0; i < This->adapter_count; ++i) { - HeapFree(GetProcessHeap(), 0, This->adapters[i].cfgs); + wined3d_adapter_cleanup(&This->adapters[i]); } HeapFree(GetProcessHeap(), 0, This); } diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 573be8f..3f736c7 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1112,6 +1112,7 @@ BOOL initPixelFormatsNoGL(struct wined3d_gl_info *gl_info) if (!init_format_compression_info(gl_info)) { HeapFree(GetProcessHeap(), 0, gl_info->gl_formats); + gl_info->gl_formats = NULL; return FALSE; } @@ -1135,6 +1136,7 @@ BOOL initPixelFormats(struct wined3d_gl_info *gl_info) fail: HeapFree(GetProcessHeap(), 0, gl_info->gl_formats); + gl_info->gl_formats = NULL; return FALSE; }

1 0

Henri Verbeet : dxgi: Free the adapters array in dxgi_factory_Release() ( Valgrind).
by Alexandre Julliard Oct. 21, 2009

Oct. 21, 2009

Module: wine Branch: master Commit: a3f22d07d1a43e2b52b6a1bdeb9fde6f8c5605af URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3f22d07d1a43e2b52b6a1bde… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 21 10:33:57 2009 +0200 dxgi: Free the adapters array in dxgi_factory_Release() (Valgrind). --- dlls/dxgi/factory.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index 667b2f7..33c1576 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -71,6 +71,7 @@ static ULONG STDMETHODCALLTYPE dxgi_factory_Release(IWineDXGIFactory *iface) { IDXGIAdapter_Release(This->adapters[i]); } + HeapFree(GetProcessHeap(), 0, This->adapters); EnterCriticalSection(&dxgi_cs); IWineD3D_Release(This->wined3d);

1 0

Paul Vriens : shell32/tests: Fix a test failure on some Vista boxes.
by Alexandre Julliard Oct. 21, 2009

Oct. 21, 2009

Module: wine Branch: master Commit: 6d4a4fc4cdbeaf8b3e9039089cd17b2a049881a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d4a4fc4cdbeaf8b3e9039089… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Oct 21 11:25:09 2009 +0200 shell32/tests: Fix a test failure on some Vista boxes. --- dlls/shell32/tests/appbar.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/tests/appbar.c b/dlls/shell32/tests/appbar.c index 73dc0b2..5e5dfaf 100644 --- a/dlls/shell32/tests/appbar.c +++ b/dlls/shell32/tests/appbar.c @@ -205,6 +205,7 @@ static void test_setpos(void) RECT rc; int screen_width, screen_height; BOOL ret; + int org_bottom1; screen_width = GetSystemMetrics(SM_CXSCREEN); screen_height = GetSystemMetrics(SM_CYSCREEN); @@ -336,6 +337,9 @@ static void test_setpos(void) /* removing windows[0] will cause windows[1] to move down into its space */ expected_bottom = max(windows[0].allocated_rect.bottom, windows[1].allocated_rect.bottom); + org_bottom1 = windows[1].allocated_rect.bottom; + ok(windows[0].allocated_rect.bottom > windows[1].allocated_rect.bottom, + "Expected windows[0] to be lower than windows[1]\n"); abd.hWnd = windows[0].hwnd; windows[0].to_be_deleted = TRUE; @@ -346,7 +350,12 @@ static void test_setpos(void) do_events_until(got_expected_bottom); - ok(windows[1].allocated_rect.bottom == expected_bottom, "windows[1]'s bottom is %i, expected %i\n", windows[1].allocated_rect.bottom, expected_bottom); + if (windows[1].allocated_rect.bottom == org_bottom1) + win_skip("Some broken Vista boxes don't move the higher appbar down\n"); + else + ok(windows[1].allocated_rect.bottom == expected_bottom, + "windows[1]'s bottom is %i, expected %i\n", + windows[1].allocated_rect.bottom, expected_bottom); test_window_rects(1, 2);

1 0

Juan Lang : crypt32: Encode public keys with NULL parameters if they' re empty (and make tests more restrictive).
by Alexandre Julliard Oct. 21, 2009

Oct. 21, 2009

Module: wine Branch: master Commit: e1903dc6e06da3fd9faa92fc63e784510ed26626 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1903dc6e06da3fd9faa92fc6… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Oct 20 13:33:15 2009 -0700 crypt32: Encode public keys with NULL parameters if they're empty (and make tests more restrictive). --- dlls/crypt32/encode.c | 2 +- dlls/crypt32/tests/encode.c | 13 ++++--------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index 93c4a29..3cd2b1e 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -415,7 +415,7 @@ static BOOL WINAPI CRYPT_AsnEncodePubKeyInfo(DWORD dwCertEncodingType, { const CERT_PUBLIC_KEY_INFO *info = pvStructInfo; struct AsnEncodeSequenceItem items[] = { - { &info->Algorithm, CRYPT_AsnEncodeAlgorithmId, 0 }, + { &info->Algorithm, CRYPT_AsnEncodeAlgorithmIdWithNullParams, 0 }, { &info->PublicKey, CRYPT_AsnEncodeBits, 0 }, }; diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 9babafd..1e93dfc 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -2613,8 +2613,8 @@ static void test_decodeExtensions(DWORD dwEncoding) /* MS encodes public key info with a NULL if the algorithm identifier's * parameters are empty. However, when encoding an algorithm in a CERT_INFO, - * it encodes them by omitting the algorithm parameters. This latter approach - * seems more correct, so accept either form. + * it encodes them by omitting the algorithm parameters. It accepts either + * form for decoding. */ struct encodedPublicKey { @@ -2692,16 +2692,11 @@ static void test_encodePublicKeyInfo(DWORD dwEncoding) "CryptEncodeObjectEx failed: %08x\n", GetLastError()); if (buf) { - ok(bufSize == pubKeys[i].encoded[1] + 2 || - bufSize == pubKeys[i].encodedNoNull[1] + 2, - "Expected %d or %d bytes, got %d\n", pubKeys[i].encoded[1] + 2, - pubKeys[i].encodedNoNull[1] + 2, bufSize); + ok(bufSize == pubKeys[i].encoded[1] + 2, + "Expected %d bytes, got %d\n", pubKeys[i].encoded[1] + 2, bufSize); if (bufSize == pubKeys[i].encoded[1] + 2) ok(!memcmp(buf, pubKeys[i].encoded, pubKeys[i].encoded[1] + 2), "Unexpected value\n"); - else if (bufSize == pubKeys[i].encodedNoNull[1] + 2) - ok(!memcmp(buf, pubKeys[i].encodedNoNull, - pubKeys[i].encodedNoNull[1] + 2), "Unexpected value\n"); LocalFree(buf); } }

1 0

Juan Lang : crypt32: Add a helper function to encode a cert's public key.
by Alexandre Julliard Oct. 21, 2009

Oct. 21, 2009

Module: wine Branch: master Commit: c97e442a28f1c5c56ff6c1041b925e93e110bff5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c97e442a28f1c5c56ff6c1041… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Oct 20 13:20:59 2009 -0700 crypt32: Add a helper function to encode a cert's public key. --- dlls/crypt32/encode.c | 21 ++++++++++++++++++++- 1 files changed, 20 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index 01f853c..627c354 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -464,6 +464,25 @@ static BOOL WINAPI CRYPT_AsnEncodeCert(DWORD dwCertEncodingType, return ret; } +static BOOL WINAPI CRYPT_AsnEncodePubKeyInfoNoNull(DWORD dwCertEncodingType, + LPCSTR lpszStructType, const void *pvStructInfo, DWORD dwFlags, + PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) +{ + BOOL ret; + const CERT_PUBLIC_KEY_INFO *info = pvStructInfo; + struct AsnEncodeSequenceItem items[] = { + { &info->Algorithm, CRYPT_AsnEncodeAlgorithmId, 0 }, + { &info->PublicKey, CRYPT_AsnEncodeBits, 0 }, + }; + + TRACE("Encoding public key with OID %s\n", + debugstr_a(info->Algorithm.pszObjId)); + ret = CRYPT_AsnEncodeSequence(dwCertEncodingType, items, + sizeof(items) / sizeof(items[0]), dwFlags, pEncodePara, pbEncoded, + pcbEncoded); + return ret; +} + /* Like in Windows, this blithely ignores the validity of the passed-in * CERT_INFO, and just encodes it as-is. The resulting encoded data may not * decode properly, see CRYPT_AsnDecodeCertInfo. @@ -484,7 +503,7 @@ static BOOL WINAPI CRYPT_AsnEncodeCertInfo(DWORD dwCertEncodingType, { &info->Issuer, CRYPT_CopyEncodedBlob, 0 }, { &info->NotBefore, CRYPT_AsnEncodeValidity, 0 }, { &info->Subject, CRYPT_CopyEncodedBlob, 0 }, - { &info->SubjectPublicKeyInfo, CRYPT_AsnEncodePubKeyInfo, 0 }, + { &info->SubjectPublicKeyInfo, CRYPT_AsnEncodePubKeyInfoNoNull, 0 }, { 0 } }; struct AsnConstructedItem constructed[3] = { { 0 } };

1 0

Eric Pouech : winmm: Simplify mciLoadCommandResource by dropping 16bit module support.
by Alexandre Julliard Oct. 21, 2009

Oct. 21, 2009

Module: wine Branch: master Commit: ebcbdb9cdc8fbf60993a749a619ca04c80f396e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebcbdb9cdc8fbf60993a749a6… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Oct 20 21:54:52 2009 +0200 winmm: Simplify mciLoadCommandResource by dropping 16bit module support. --- dlls/winmm/mci.c | 55 ++++++++++++++++++++++------------------------- dlls/winmm/mci16.c | 19 ++++++++++++++++ dlls/winmm/mmsystem.c | 56 ------------------------------------------------- dlls/winmm/winemm.h | 2 - 4 files changed, 45 insertions(+), 87 deletions(-) diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index 5390815..f0634a6 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -84,6 +84,7 @@ static const WCHAR wszSystemIni[] = {'s','y','s','t','e','m','.','i','n','i',0}; static WINE_MCIDRIVER *MciDrivers; static UINT WINAPI MCI_DefYieldProc(MCIDEVICEID wDevID, DWORD data); +static UINT MCI_SetCommandTable(HGLOBAL hMem, UINT uDevType); /* dup a string and uppercase it */ static inline LPWSTR str_dup_upper( LPCWSTR str ) @@ -581,6 +582,7 @@ static DWORD MCI_GetDevTypeFromFileName(LPCWSTR fileName, LPWSTR buf, UINT len) typedef struct tagWINE_MCICMDTABLE { UINT uDevType; + HGLOBAL hMem; const BYTE* lpTable; UINT nVerbs; /* number of verbs in command table */ LPCWSTR* aVerbs; /* array of verbs to speed up the verb look up process */ @@ -694,7 +696,7 @@ static UINT MCI_GetCommandTable(UINT uDevType) if (hRsrc) hMem = LoadResource(hWinMM32Instance, hRsrc); if (hMem) { - uTbl = MCI_SetCommandTable(LockResource(hMem), uDevType); + uTbl = MCI_SetCommandTable(hMem, uDevType); } else { WARN("No command table found in resource %p[%s]\n", hWinMM32Instance, debugstr_w(str)); @@ -707,7 +709,7 @@ static UINT MCI_GetCommandTable(UINT uDevType) /************************************************************************** * MCI_SetCommandTable [internal] */ -UINT MCI_SetCommandTable(void *table, UINT uDevType) +static UINT MCI_SetCommandTable(HGLOBAL hMem, UINT uDevType) { int uTbl; static BOOL bInitDone = FALSE; @@ -721,7 +723,7 @@ UINT MCI_SetCommandTable(void *table, UINT uDevType) bInitDone = TRUE; MCI_GetCommandTable(0); } - TRACE("(%p, %u)\n", table, uDevType); + TRACE("(%p, %u)\n", hMem, uDevType); for (uTbl = 0; uTbl < MAX_MCICMDTABLE; uTbl++) { if (!S_MciCmdTable[uTbl].lpTable) { const BYTE* lmem; @@ -730,7 +732,8 @@ UINT MCI_SetCommandTable(void *table, UINT uDevType) WORD count; S_MciCmdTable[uTbl].uDevType = uDevType; - S_MciCmdTable[uTbl].lpTable = table; + S_MciCmdTable[uTbl].lpTable = LockResource(hMem); + S_MciCmdTable[uTbl].hMem = hMem; if (TRACE_ON(mci)) { MCI_DumpCommandTable(uTbl); @@ -771,21 +774,6 @@ UINT MCI_SetCommandTable(void *table, UINT uDevType) } /************************************************************************** - * MCI_DeleteCommandTable [internal] - */ -BOOL MCI_DeleteCommandTable(UINT uTbl, BOOL delete) -{ - if (uTbl >= MAX_MCICMDTABLE || !S_MciCmdTable[uTbl].lpTable) - return FALSE; - - if (delete) HeapFree(GetProcessHeap(), 0, (void*)S_MciCmdTable[uTbl].lpTable); - S_MciCmdTable[uTbl].lpTable = NULL; - HeapFree(GetProcessHeap(), 0, S_MciCmdTable[uTbl].aVerbs); - S_MciCmdTable[uTbl].aVerbs = 0; - return TRUE; -} - -/************************************************************************** * MCI_UnLoadMciDriver [internal] */ static BOOL MCI_UnLoadMciDriver(LPWINE_MCIDRIVER wmd) @@ -1539,9 +1527,9 @@ BOOL WINAPI mciExecute(LPCSTR lpstrCommand) */ UINT WINAPI mciLoadCommandResource(HINSTANCE hInst, LPCWSTR resNameW, UINT type) { - HRSRC hRsrc = 0; - HGLOBAL hMem; - UINT16 ret = MCI_NO_COMMAND_TABLE; + UINT ret = MCI_NO_COMMAND_TABLE; + HRSRC hRsrc = 0; + HGLOBAL hMem; TRACE("(%p, %s, %d)!\n", hInst, debugstr_w(resNameW), type); @@ -1563,13 +1551,13 @@ UINT WINAPI mciLoadCommandResource(HINSTANCE hInst, LPCWSTR resNameW, UINT type) } #endif } - if (!(hRsrc = FindResourceW(hInst, resNameW, (LPWSTR)RT_RCDATA))) { - WARN("No command table found in resource\n"); - } else if ((hMem = LoadResource(hInst, hRsrc))) { - ret = MCI_SetCommandTable(LockResource(hMem), type); - } else { - WARN("Couldn't load resource.\n"); + if ((hRsrc = FindResourceW(hInst, resNameW, (LPWSTR)RT_RCDATA)) && + (hMem = LoadResource(hInst, hRsrc))) { + ret = MCI_SetCommandTable(hMem, type); + FreeResource(hMem); } + else WARN("No command table found in module for %s\n", debugstr_w(resNameW)); + TRACE("=> %04x\n", ret); return ret; } @@ -1581,7 +1569,16 @@ BOOL WINAPI mciFreeCommandResource(UINT uTable) { TRACE("(%08x)!\n", uTable); - return MCI_DeleteCommandTable(uTable, FALSE); + if (uTable >= MAX_MCICMDTABLE || !S_MciCmdTable[uTable].lpTable) + return FALSE; + + FreeResource(S_MciCmdTable[uTable].hMem); + S_MciCmdTable[uTable].hMem = NULL; + S_MciCmdTable[uTable].lpTable = NULL; + HeapFree(GetProcessHeap(), 0, S_MciCmdTable[uTable].aVerbs); + S_MciCmdTable[uTable].aVerbs = 0; + S_MciCmdTable[uTable].nVerbs = 0; + return TRUE; } /************************************************************************** diff --git a/dlls/winmm/mci16.c b/dlls/winmm/mci16.c index 6155bdb..e1586b7 100644 --- a/dlls/winmm/mci16.c +++ b/dlls/winmm/mci16.c @@ -323,3 +323,22 @@ DWORD WINAPI mciSendString16(LPCSTR lpstrCommand, LPSTR lpstrRet, { return mciSendStringA(lpstrCommand, lpstrRet, uRetLen, HWND_32(hwndCallback)); } + +/************************************************************************** + * mciLoadCommandResource [MMSYSTEM.705] + */ +UINT16 WINAPI mciLoadCommandResource16(HINSTANCE16 hInst, LPCSTR resname, UINT16 type) +{ + TRACE("(%04x, %s, %x)!\n", hInst, resname, type); + return MCI_NO_COMMAND_TABLE; +} + +/************************************************************************** + * mciFreeCommandResource [MMSYSTEM.713] + */ +BOOL16 WINAPI mciFreeCommandResource16(UINT16 uTable) +{ + TRACE("(%04x)!\n", uTable); + + return FALSE; +} diff --git a/dlls/winmm/mmsystem.c b/dlls/winmm/mmsystem.c index 0b4a694..d560773 100644 --- a/dlls/winmm/mmsystem.c +++ b/dlls/winmm/mmsystem.c @@ -2509,62 +2509,6 @@ MMRESULT16 WINAPI timeEndPeriod16(UINT16 wPeriod) return timeEndPeriod(wPeriod); } -/************************************************************************** - * mciLoadCommandResource [MMSYSTEM.705] - */ -UINT16 WINAPI mciLoadCommandResource16(HINSTANCE16 hInst, LPCSTR resname, UINT16 type) -{ - HRSRC16 res; - HGLOBAL16 handle; - const BYTE* ptr16; - BYTE* ptr32; - unsigned pos = 0, size = 1024, len; - const char* str; - DWORD flg; - WORD eid; - UINT16 ret = MCIERR_OUT_OF_MEMORY; - - if (!(res = FindResource16( hInst, resname, (LPSTR)RT_RCDATA))) return MCI_NO_COMMAND_TABLE; - if (!(handle = LoadResource16( hInst, res ))) return MCI_NO_COMMAND_TABLE; - ptr16 = LockResource16(handle); - /* converting the 16 bit resource table into a 32W one */ - if ((ptr32 = HeapAlloc(GetProcessHeap(), 0, size))) - { - do { - str = (LPCSTR)ptr16; - ptr16 += strlen(str) + 1; - flg = *(const DWORD*)ptr16; - eid = *(const WORD*)(ptr16 + sizeof(DWORD)); - ptr16 += sizeof(DWORD) + sizeof(WORD); - len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0) * sizeof(WCHAR); - if (pos + len + sizeof(DWORD) + sizeof(WORD) > size) - { - while (pos + len * sizeof(WCHAR) + sizeof(DWORD) + sizeof(WORD) > size) size += 1024; - ptr32 = HeapReAlloc(GetProcessHeap(), 0, ptr32, size); - if (!ptr32) goto the_end; - } - MultiByteToWideChar(CP_ACP, 0, str, -1, (LPWSTR)(ptr32 + pos), len / sizeof(WCHAR)); - *(DWORD*)(ptr32 + pos + len) = flg; - *(WORD*)(ptr32 + pos + len + sizeof(DWORD)) = eid; - pos += len + sizeof(DWORD) + sizeof(WORD); - } while (eid != MCI_END_COMMAND_LIST); - } -the_end: - FreeResource16( handle ); - if (ptr32) ret = MCI_SetCommandTable(ptr32, type); - return ret; -} - -/************************************************************************** - * mciFreeCommandResource [MMSYSTEM.713] - */ -BOOL16 WINAPI mciFreeCommandResource16(UINT16 uTable) -{ - TRACE("(%04x)!\n", uTable); - - return MCI_DeleteCommandTable(uTable, TRUE); -} - /* ################################################### * # JOYSTICK # * ################################################### diff --git a/dlls/winmm/winemm.h b/dlls/winmm/winemm.h index 97403e5..6af5f01 100644 --- a/dlls/winmm/winemm.h +++ b/dlls/winmm/winemm.h @@ -197,8 +197,6 @@ void MMDRV_InstallMap(unsigned int, MMDRV_MAPFUNC, MMDRV_UNMAPFUNC, const char* MCI_MessageToString(UINT wMsg); DWORD MCI_SendCommand(UINT wDevID, UINT16 wMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2); -UINT MCI_SetCommandTable(void *table, UINT uDevType); -BOOL MCI_DeleteCommandTable(UINT uTbl, BOOL delete); LPWSTR MCI_strdupAtoW(LPCSTR str); LPSTR MCI_strdupWtoA(LPCWSTR str);

1 0

Eric Pouech : mmsystem: Create a real function for mciExecute.
by Alexandre Julliard Oct. 21, 2009

Oct. 21, 2009

Module: wine Branch: master Commit: 05e625fe3f3e6a6747725d03fcda95c5470726d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05e625fe3f3e6a6747725d03f… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Oct 20 21:55:06 2009 +0200 mmsystem: Create a real function for mciExecute. --- dlls/winmm/mci.c | 1 - dlls/winmm/mci16.c | 8 ++++++++ dlls/winmm/mmsystem.spec | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index f0634a6..8afe14f 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -1500,7 +1500,6 @@ DWORD WINAPI mciSendStringA(LPCSTR lpstrCommand, LPSTR lpstrRet, /************************************************************************** * mciExecute [WINMM.@] - * mciExecute [MMSYSTEM.712] */ BOOL WINAPI mciExecute(LPCSTR lpstrCommand) { diff --git a/dlls/winmm/mci16.c b/dlls/winmm/mci16.c index 33776a0..75d7202 100644 --- a/dlls/winmm/mci16.c +++ b/dlls/winmm/mci16.c @@ -750,3 +750,11 @@ BOOL16 WINAPI mciFreeCommandResource16(UINT16 uTable) return FALSE; } + +/************************************************************************** + * mciExecute [MMSYSTEM.712] + */ +BOOL16 WINAPI mciExecute16(LPCSTR lpstrCommand) +{ + return mciExecute(lpstrCommand); +} diff --git a/dlls/winmm/mmsystem.spec b/dlls/winmm/mmsystem.spec index c6b3324..516f027 100644 --- a/dlls/winmm/mmsystem.spec +++ b/dlls/winmm/mmsystem.spec @@ -113,7 +113,7 @@ 708 pascal mciGetDriverData(word) mciGetDriverData16 710 pascal mciDriverYield(word) mciDriverYield16 711 pascal mciDriverNotify(word word word) mciDriverNotify16 -712 pascal mciExecute(ptr) mciExecute +712 pascal mciExecute(ptr) mciExecute16 713 pascal mciFreeCommandResource(word) mciFreeCommandResource16 714 pascal mciSetYieldProc(word ptr long) mciSetYieldProc16 715 pascal mciGetDeviceIDFromElementID(long ptr) mciGetDeviceIDFromElementID16

1 0