December 2008 - Wine-Commits

Nikolay Sivov : gdiplus: Stub for GdipGetImagePaletteSize.
by Alexandre Julliard Dec. 2, 2008

Dec. 2, 2008

Module: wine Branch: master Commit: 348c115af1b7078e9fd0f78c47739e0965e73e25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=348c115af1b7078e9fd0f78c4… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Dec 2 00:17:10 2008 +0300 gdiplus: Stub for GdipGetImagePaletteSize. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/image.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index a7d21f8..c77d075 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -292,7 +292,7 @@ @ stdcall GdipGetImageHorizontalResolution(ptr ptr) @ stub GdipGetImageItemData @ stub GdipGetImagePalette -@ stub GdipGetImagePaletteSize +@ stdcall GdipGetImagePaletteSize(ptr ptr) @ stdcall GdipGetImagePixelFormat(ptr ptr) @ stdcall GdipGetImageRawFormat(ptr ptr) @ stub GdipGetImageThumbnail diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 6e0c468..581eb27 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -748,6 +748,16 @@ GpStatus WINGDIPAPI GdipGetImageHorizontalResolution(GpImage *image, REAL *res) return NotImplemented; } +GpStatus WINGDIPAPI GdipGetImagePaletteSize(GpImage *image, INT *size) +{ + FIXME("%p %p\n", image, size); + + if(!image || !size) + return InvalidParameter; + + return NotImplemented; +} + /* FIXME: test this function for non-bitmap types */ GpStatus WINGDIPAPI GdipGetImagePixelFormat(GpImage *image, PixelFormat *format) {

1 0

Hans Leidekker : wininet: Append the extra info part in InternetCreateUrl{A , W}.
by Alexandre Julliard Dec. 2, 2008

Dec. 2, 2008

Module: wine Branch: master Commit: 5a1a26310ec760c04584db065379475bfb6a1859 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a1a26310ec760c04584db065… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Dec 1 16:37:57 2008 +0100 wininet: Append the extra info part in InternetCreateUrl{A, W}. --- dlls/wininet/internet.c | 11 ++++++++++- dlls/wininet/tests/url.c | 24 ++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 5f67334..ed92536 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -3487,6 +3487,9 @@ static BOOL calc_url_length(LPURL_COMPONENTSW lpUrlComponents, if (lpUrlComponents->lpszUrlPath) *lpdwUrlLength += URL_GET_COMP_LENGTH(lpUrlComponents, UrlPath); + if (lpUrlComponents->lpszExtraInfo) + *lpdwUrlLength += URL_GET_COMP_LENGTH(lpUrlComponents, ExtraInfo); + return TRUE; } @@ -3735,7 +3738,6 @@ BOOL WINAPI InternetCreateUrlW(LPURL_COMPONENTSW lpUrlComponents, DWORD dwFlags, } } - if (lpUrlComponents->lpszUrlPath) { dwLen = URL_GET_COMP_LENGTH(lpUrlComponents, UrlPath); @@ -3743,6 +3745,13 @@ BOOL WINAPI InternetCreateUrlW(LPURL_COMPONENTSW lpUrlComponents, DWORD dwFlags, lpszUrl += dwLen; } + if (lpUrlComponents->lpszExtraInfo) + { + dwLen = URL_GET_COMP_LENGTH(lpUrlComponents, ExtraInfo); + memcpy(lpszUrl, lpUrlComponents->lpszExtraInfo, dwLen * sizeof(WCHAR)); + lpszUrl += dwLen; + } + *lpszUrl = '\0'; return TRUE; diff --git a/dlls/wininet/tests/url.c b/dlls/wininet/tests/url.c index e9f2439..f10e53b 100644 --- a/dlls/wininet/tests/url.c +++ b/dlls/wininet/tests/url.c @@ -52,6 +52,7 @@ #define CREATE_URL10 "about://host/blank" #define CREATE_URL11 "about:" #define CREATE_URL12 "http://www.winehq.org:65535" +#define CREATE_URL13 "http://localhost/?test=123" static void copy_compsA( URL_COMPONENTSA *src, @@ -455,9 +456,12 @@ static void InternetCreateUrlA_test(void) http[] = "http", https[] = "https", winehq[] = "www.winehq.org", + localhost[] = "localhost", username[] = "username", password[] = "password", + root[] = "/", site_about[] = "/site/about", + extra_info[] = "?test=123", about[] = "about", blank[] = "blank", host[] = "host"; @@ -771,6 +775,26 @@ static void InternetCreateUrlA_test(void) ok(!strcmp(szUrl, CREATE_URL12), "Expected %s, got %s\n", CREATE_URL12, szUrl); HeapFree(GetProcessHeap(), 0, szUrl); + + memset(&urlComp, 0, sizeof(urlComp)); + urlComp.dwStructSize = sizeof(URL_COMPONENTS); + urlComp.lpszScheme = http; + urlComp.dwSchemeLength = strlen(urlComp.lpszScheme); + urlComp.lpszHostName = localhost; + urlComp.dwHostNameLength = strlen(urlComp.lpszHostName); + urlComp.nPort = 80; + urlComp.lpszUrlPath = root; + urlComp.dwUrlPathLength = strlen(urlComp.lpszUrlPath); + urlComp.lpszExtraInfo = extra_info; + urlComp.dwExtraInfoLength = strlen(urlComp.lpszExtraInfo); + len = 256; + szUrl = HeapAlloc(GetProcessHeap(), 0, len); + InternetCreateUrlA(&urlComp, ICU_ESCAPE, szUrl, &len); + ok(ret, "Expected success\n"); + ok(len == strlen(CREATE_URL13), "Expected len %u, got %u\n", strlen(CREATE_URL13), len); + ok(!strcmp(szUrl, CREATE_URL13), "Expected \"%s\", got \"%s\"\n", CREATE_URL13, szUrl); + + HeapFree(GetProcessHeap(), 0, szUrl); } START_TEST(url)

1 0

Paul Vriens : shell32/tests: Cast-qual warning fixes.
by Alexandre Julliard Dec. 2, 2008

Dec. 2, 2008

Module: wine Branch: master Commit: c58090091a8f7586d50c040ec9799fb3275480e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c58090091a8f7586d50c040ec… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Dec 2 08:25:20 2008 +0100 shell32/tests: Cast-qual warning fixes. --- dlls/shell32/tests/shfldr_special.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/tests/shfldr_special.c b/dlls/shell32/tests/shfldr_special.c index ef2f0fd..eb5b460 100644 --- a/dlls/shell32/tests/shfldr_special.c +++ b/dlls/shell32/tests/shfldr_special.c @@ -33,7 +33,7 @@ /* Tests for My Network Places */ static void test_parse_for_entire_network(void) { - static const WCHAR entire_network_path[] = { + static WCHAR entire_network_path[] = { ':',':','{','2','0','8','D','2','C','6','0','-','3','A','E','A','-', '1','0','6','9','-','A','2','D','7','-','0','8','0','0','2','B','3','0','3','0','9','D', '}','\\','E','n','t','i','r','e','N','e','t','w','o','r','k',0 }; @@ -48,7 +48,7 @@ static void test_parse_for_entire_network(void) hr = SHGetDesktopFolder(&psfDesktop); ok(hr == S_OK, "SHGetDesktopFolder failed with error 0x%x\n", hr); - hr = IShellFolder_ParseDisplayName(psfDesktop, NULL, NULL, (LPWSTR)entire_network_path, &eaten, &pidl, &attr); + hr = IShellFolder_ParseDisplayName(psfDesktop, NULL, NULL, entire_network_path, &eaten, &pidl, &attr); ok(hr == S_OK, "IShellFolder_ParseDisplayName failed with error 0x%x\n", hr); todo_wine ok(eaten == 0xdeadbeef, "eaten should not have been set to %u\n", eaten); @@ -66,7 +66,7 @@ static void test_parse_for_entire_network(void) static void test_parse_for_control_panel(void) { /* path of My Computer\Control Panel */ - static const WCHAR control_panel_path[] = { + static WCHAR control_panel_path[] = { ':',':','{','2','0','D','0','4','F','E','0','-','3','A','E','A','-','1','0','6','9','-','A','2','D','8','-','0','8','0','0','2','B','3','0','3','0','9','D','}','\\', ':',':','{','2','1','E','C','2','0','2','0','-','3','A','E','A','-','1','0','6','9','-','A','2','D','D','-','0','8','0','0','2','B','3','0','3','0','9','D','}', 0 }; IShellFolder *psfDesktop; @@ -79,7 +79,7 @@ static void test_parse_for_control_panel(void) hr = SHGetDesktopFolder(&psfDesktop); ok(hr == S_OK, "SHGetDesktopFolder failed with error 0x%x\n", hr); - hr = IShellFolder_ParseDisplayName(psfDesktop, NULL, NULL, (LPWSTR)control_panel_path, &eaten, &pidl, &attr); + hr = IShellFolder_ParseDisplayName(psfDesktop, NULL, NULL, control_panel_path, &eaten, &pidl, &attr); ok(hr == S_OK, "IShellFolder_ParseDisplayName failed with error 0x%x\n", hr); todo_wine ok(eaten == 0xdeadbeef, "eaten should not have been set to %u\n", eaten);

1 0

Paul Vriens : shell32/tests: Fix some errors on Win9x and Vista and prevent a crash on NT4.
by Alexandre Julliard Dec. 2, 2008

Dec. 2, 2008

Module: wine Branch: master Commit: af1f9ba303705e8ecb9218b766c7ea1dd52d5a8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=af1f9ba303705e8ecb9218b76… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Dec 2 08:50:49 2008 +0100 shell32/tests: Fix some errors on Win9x and Vista and prevent a crash on NT4. --- dlls/shell32/tests/shfldr_special.c | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/shfldr_special.c b/dlls/shell32/tests/shfldr_special.c index eb5b460..e8f266f 100644 --- a/dlls/shell32/tests/shfldr_special.c +++ b/dlls/shell32/tests/shfldr_special.c @@ -33,6 +33,9 @@ /* Tests for My Network Places */ static void test_parse_for_entire_network(void) { + static WCHAR my_network_places_path[] = { + ':',':','{','2','0','8','D','2','C','6','0','-','3','A','E','A','-', + '1','0','6','9','-','A','2','D','7','-','0','8','0','0','2','B','3','0','3','0','9','D','}', 0 }; static WCHAR entire_network_path[] = { ':',':','{','2','0','8','D','2','C','6','0','-','3','A','E','A','-', '1','0','6','9','-','A','2','D','7','-','0','8','0','0','2','B','3','0','3','0','9','D', @@ -48,7 +51,30 @@ static void test_parse_for_entire_network(void) hr = SHGetDesktopFolder(&psfDesktop); ok(hr == S_OK, "SHGetDesktopFolder failed with error 0x%x\n", hr); + hr = IShellFolder_ParseDisplayName(psfDesktop, NULL, NULL, my_network_places_path, &eaten, &pidl, &attr); + ok(hr == S_OK, "IShellFolder_ParseDisplayName failed with error 0x%x\n", hr); + todo_wine + ok(eaten == 0xdeadbeef, "eaten should not have been set to %u\n", eaten); + expected_attr = SFGAO_HASSUBFOLDER|SFGAO_FOLDER|SFGAO_FILESYSANCESTOR|SFGAO_DROPTARGET|SFGAO_HASPROPSHEET|SFGAO_CANRENAME|SFGAO_CANLINK; + todo_wine + ok((attr == expected_attr) || /* Win9x, NT4 */ + (attr == (expected_attr | SFGAO_STREAM)) || /* W2K */ + (attr == (expected_attr | SFGAO_CANDELETE)) || /* XP, W2K3 */ + (attr == (expected_attr | SFGAO_CANDELETE | SFGAO_NONENUMERATED)), /* Vista */ + "Unexpected attributes : %08x\n", attr); + + ILFree(pidl); + + /* Start clean again */ + eaten = 0xdeadbeef; + attr = ~0; + hr = IShellFolder_ParseDisplayName(psfDesktop, NULL, NULL, entire_network_path, &eaten, &pidl, &attr); + if (hr == HRESULT_FROM_WIN32(ERROR_BAD_NET_NAME) || hr == HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER)) + { + win_skip("'EntireNetwork' is not available on Win9x, NT4 and Vista\n"); + return; + } ok(hr == S_OK, "IShellFolder_ParseDisplayName failed with error 0x%x\n", hr); todo_wine ok(eaten == 0xdeadbeef, "eaten should not have been set to %u\n", eaten);

1 0

Paul Vriens : ntdll/tests: Fix a test failure on W2K.
by Alexandre Julliard Dec. 2, 2008

Dec. 2, 2008

Module: wine Branch: master Commit: b27a1bbdc7c6d659782656ab0beaa95be86f812c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b27a1bbdc7c6d659782656ab0… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Dec 1 17:34:48 2008 +0100 ntdll/tests: Fix a test failure on W2K. --- dlls/ntdll/tests/rtl.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index fffe9ac..bcf63b4 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -936,7 +936,9 @@ static void test_RtlDeleteTimer(void) { NTSTATUS ret; ret = pRtlDeleteTimer(NULL, NULL, NULL); - ok(ret == STATUS_INVALID_PARAMETER_1, "expected STATUS_INVALID_PARAMETER_1, got %x\n", ret); + ok(ret == STATUS_INVALID_PARAMETER_1 || + ret == STATUS_INVALID_PARAMETER, /* W2K */ + "expected STATUS_INVALID_PARAMETER_1 or STATUS_INVALID_PARAMETER, got %x\n", ret); } START_TEST(rtl)

1 0

Jacek Caban : ntoskrnl.exe: Forward ZwMakeTemporaryObject to ntdll.
by Alexandre Julliard Dec. 2, 2008

Dec. 2, 2008

Module: wine Branch: master Commit: 768012a51a2ee4b206a395c690a9bc9ddf7f2d91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=768012a51a2ee4b206a395c69… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 1 17:30:32 2008 +0100 ntoskrnl.exe: Forward ZwMakeTemporaryObject to ntdll. --- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 9303d03..c640ccf 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1316,7 +1316,7 @@ @ stub ZwIsProcessInJob @ stdcall ZwLoadDriver(ptr) ntdll.ZwLoadDriver @ stdcall ZwLoadKey(ptr ptr) ntdll.ZwLoadKey -@ stub ZwMakeTemporaryObject +@ stdcall ZwMakeTemporaryObject(long) ntdll.ZwMakeTemporaryObject @ stdcall ZwMapViewOfSection(long long ptr long long ptr ptr long long long) ntdll.ZwMapViewOfSection @ stdcall ZwNotifyChangeKey(long long ptr ptr ptr long long ptr long long) ntdll.ZwNotifyChangeKey @ stdcall ZwOpenDirectoryObject(long long long) ntdll.ZwOpenDirectoryObject

1 0

Michael Stefaniuc : oledlg: Remove some superfluous casts.
by Alexandre Julliard Dec. 2, 2008

Dec. 2, 2008

Module: wine Branch: master Commit: a4bf5c0d2c6cb482acfcc205772bd7a1f44c3918 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4bf5c0d2c6cb482acfcc2057… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 1 17:24:25 2008 +0100 oledlg: Remove some superfluous casts. --- dlls/oledlg/insobjdlg.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/oledlg/insobjdlg.c b/dlls/oledlg/insobjdlg.c index 07c8a81..5db79f6 100644 --- a/dlls/oledlg/insobjdlg.c +++ b/dlls/oledlg/insobjdlg.c @@ -124,7 +124,7 @@ UINT WINAPI OleUIInsertObjectA(LPOLEUIINSERTOBJECTA lpOleUIInsertObject) */ INT_PTR CALLBACK UIInsertObjectDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { - InsertObjectDlgInfo* pdlgInfo = (InsertObjectDlgInfo*) GetPropA(hwnd,OleUIInsertObjectInfoStr); + InsertObjectDlgInfo* pdlgInfo = GetPropA(hwnd,OleUIInsertObjectInfoStr); switch(uMsg) { @@ -134,7 +134,7 @@ INT_PTR CALLBACK UIInsertObjectDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPAR pdlgInfo->hwndSelf = hwnd; - SetPropA(hwnd, OleUIInsertObjectInfoStr, (HANDLE) pdlgInfo); + SetPropA(hwnd, OleUIInsertObjectInfoStr, pdlgInfo); UIINSERTOBJECTDLG_InitDialog(pdlgInfo); @@ -165,7 +165,7 @@ static LRESULT UIINSOBJDLG_OnWMCommand(HWND hwnd, WPARAM wParam, LPARAM lParam) { WORD wNotifyCode = HIWORD(wParam); WORD wID = LOWORD(wParam); - InsertObjectDlgInfo* pdlgInfo = (InsertObjectDlgInfo*) GetPropA(hwnd,OleUIInsertObjectInfoStr); + InsertObjectDlgInfo* pdlgInfo = GetPropA(hwnd,OleUIInsertObjectInfoStr); switch(wID) { @@ -399,12 +399,12 @@ static void UIINSERTOBJECTDLG_FreeObjectTypes(InsertObjectDlgInfo* pdlgInfo) { UINT i, count; - count = SendMessageA(pdlgInfo->hwndObjTypeLB, LB_GETCOUNT, (WPARAM)0, (LPARAM)0); + count = SendMessageA(pdlgInfo->hwndObjTypeLB, LB_GETCOUNT, 0, 0); for (i = 0; i < count; i++) { CLSID* lpclsid = (CLSID*) SendMessageA(pdlgInfo->hwndObjTypeLB, - LB_GETITEMDATA, (WPARAM)i, (LPARAM)0); + LB_GETITEMDATA, i, 0); HeapFree(GetProcessHeap(), 0, lpclsid); } } @@ -546,7 +546,7 @@ static void UIINSERTOBJECTDLG_BrowseFile(InsertObjectDlgInfo* pdlgInfo) fn.lpTemplateName = NULL; if (GetOpenFileNameA(&fn)) - SendMessageA(pdlgInfo->hwndFileTB, WM_SETTEXT, (WPARAM)0, (LPARAM)fn.lpstrFile); + SendMessageA(pdlgInfo->hwndFileTB, WM_SETTEXT, 0, (LPARAM)fn.lpstrFile); }

1 0

Michael Stefaniuc : itss: Remove unneeded casts of zero.
by Alexandre Julliard Dec. 2, 2008

Dec. 2, 2008

Module: wine Branch: master Commit: 6d27685be2786bb644c79ba0a0bcc63b5b51ee56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d27685be2786bb644c79ba0a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 1 17:24:59 2008 +0100 itss: Remove unneeded casts of zero. --- dlls/itss/chm_lib.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/itss/chm_lib.c b/dlls/itss/chm_lib.c index 3b98d5e..6b80ef2 100644 --- a/dlls/itss/chm_lib.c +++ b/dlls/itss/chm_lib.c @@ -723,7 +723,7 @@ struct chmFile *chm_openW(const WCHAR *filename) /* read and verify header */ sremain = _CHM_ITSF_V3_LEN; sbufpos = sbuffer; - if (_chm_fetch_bytes(newHandle, sbuffer, (UInt64)0, sremain) != sremain || + if (_chm_fetch_bytes(newHandle, sbuffer, 0, sremain) != sremain || !_unmarshal_itsf_header(&sbufpos, &sremain, &itsfHeader)) { chm_close(newHandle); @@ -1210,7 +1210,7 @@ static Int64 _chm_decompress_block(struct chmFile *h, fprintf(stderr, " (DECOMPRESS FAILED!)\n"); #endif HeapFree(GetProcessHeap(), 0, cbuffer); - return (Int64)0; + return 0; } h->lzx_last_block = (int)curBlockIdx; @@ -1250,7 +1250,7 @@ static Int64 _chm_decompress_block(struct chmFile *h, fprintf(stderr, " (DECOMPRESS FAILED!)\n"); #endif HeapFree(GetProcessHeap(), 0, cbuffer); - return (Int64)0; + return 0; } h->lzx_last_block = (int)block; @@ -1273,7 +1273,7 @@ static Int64 _chm_decompress_region(struct chmFile *h, UChar *ubuffer = NULL; if (len <= 0) - return (Int64)0; + return 0; /* figure out what we need to read */ nBlock = start / h->reset_table.block_len; @@ -1323,11 +1323,11 @@ LONGINT64 chm_retrieve_object(struct chmFile *h, { /* must be valid file handle */ if (h == NULL) - return (Int64)0; + return 0; /* starting address must be in correct range */ if (addr >= ui->length) - return (Int64)0; + return 0; /* clip length */ if (addr + len > ui->length)

1 0

Henri Verbeet : wined3d: Remove some unused code.
by Alexandre Julliard Dec. 2, 2008

Dec. 2, 2008

Module: wine Branch: master Commit: 92b93172df5255af90646d56c2ca0c82aef41e70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92b93172df5255af90646d56c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 1 15:32:15 2008 +0100 wined3d: Remove some unused code. --- dlls/wined3d/basetexture.c | 109 ---------------------------------------- dlls/wined3d/device.c | 6 -- dlls/wined3d/indexbuffer.c | 2 +- dlls/wined3d/resource.c | 56 +-------------------- dlls/wined3d/swapchain_gdi.c | 12 ---- dlls/wined3d/vertexbuffer.c | 4 -- dlls/wined3d/volume.c | 2 +- dlls/wined3d/wined3d_private.h | 40 ++------------- 8 files changed, 8 insertions(+), 223 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=92b93172df5255af90646…

1 0

Michael Stefaniuc : imm32: Remove some superfluous casts.
by Alexandre Julliard Dec. 2, 2008

Dec. 2, 2008

Module: wine Branch: master Commit: d5b1874b6cc68c9e0031fb6ca1db7964a81c9673 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5b1874b6cc68c9e0031fb6ca… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 1 17:24:40 2008 +0100 imm32: Remove some superfluous casts. --- dlls/imm32/imm.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 3ed6411..3b7f7a4 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -423,7 +423,7 @@ static HIMCC ImmCreateBlankCompStr(void) HIMCC rc; LPCOMPOSITIONSTRING ptr; rc = ImmCreateIMCC(sizeof(COMPOSITIONSTRING)); - ptr = (LPCOMPOSITIONSTRING)ImmLockIMCC(rc); + ptr = ImmLockIMCC(rc); memset(ptr,0,sizeof(COMPOSITIONSTRING)); ptr->dwSize = sizeof(COMPOSITIONSTRING); ImmUnlockIMCC(rc); @@ -451,7 +451,7 @@ HIMC WINAPI ImmAssociateContext(HWND hWnd, HIMC hIMC) if (hWnd) { - old = (HIMC)RemovePropW(hWnd,szwWineIMCProperty); + old = RemovePropW(hWnd,szwWineIMCProperty); if (old == NULL) old = IMM_GetThreadData()->defaultContext; @@ -463,7 +463,7 @@ HIMC WINAPI ImmAssociateContext(HWND hWnd, HIMC hIMC) if (hIMC == NULL) /* Meaning disable imm for that window*/ SetPropW(hWnd,szwWineIMCProperty,(HANDLE)-1); else - SetPropW(hWnd,szwWineIMCProperty,(HANDLE)hIMC); + SetPropW(hWnd,szwWineIMCProperty,hIMC); } if (old) @@ -626,7 +626,7 @@ HIMC WINAPI ImmCreateContext(void) new_context->immKbd->uSelected++; TRACE("Created context 0x%x\n",(UINT)new_context); - return (HIMC)new_context; + return new_context; } static BOOL IMM_DestroyContext(HIMC hIMC) @@ -1298,7 +1298,7 @@ HIMC WINAPI ImmGetContext(HWND hWnd) if (!IMM_GetThreadData()->defaultContext) IMM_GetThreadData()->defaultContext = ImmCreateContext(); - rc = (HIMC)GetPropW(hWnd,szwWineIMCProperty); + rc = GetPropW(hWnd,szwWineIMCProperty); if (rc == (HIMC)-1) rc = NULL; else if (rc == NULL) @@ -2531,7 +2531,7 @@ HIMCC WINAPI ImmCreateIMCC(DWORD size) return NULL; internal->dwSize = size; - return (HIMCC)internal; + return internal; } /*********************************************************************** @@ -2618,7 +2618,7 @@ BOOL WINAPI ImmGenerateMessage(HIMC hIMC) LPTRANSMSG lpTransMsg; DWORD i; - lpTransMsg = (LPTRANSMSG)ImmLockIMCC(data->IMC.hMsgBuf); + lpTransMsg = ImmLockIMCC(data->IMC.hMsgBuf); for (i = 0; i < data->IMC.dwNumMsgBuf; i++) ImmInternalPostIMEMessage(data, lpTransMsg[i].message, lpTransMsg[i].wParam, lpTransMsg[i].lParam);

1 0