May 2009 - Wine-Commits - list.winehq.org

Nikolay Sivov : comctl32/tests: A basic test for ListView WM_SETREDRAW.
by Alexandre Julliard May 21, 2009

May 21, 2009

Module: wine Branch: master Commit: d17afea70f318a43042f6168518a88ce4cbf4af6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d17afea70f318a43042f61685… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed May 20 22:34:48 2009 +0400 comctl32/tests: A basic test for ListView WM_SETREDRAW. --- dlls/comctl32/tests/listview.c | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 0c6b139..1c002d9 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -2215,6 +2215,32 @@ static void test_nosortheader(void) DestroyWindow(hwnd); } +static void test_setredraw(void) +{ + HWND hwnd; + DWORD_PTR style; + DWORD ret; + + hwnd = create_listview_control(0); + ok(hwnd != NULL, "failed to create a listview window\n"); + + /* Passing WM_SETREDRAW to DefWinProc removes WS_VISIBLE. + ListView seems to handle it internally without DefWinProc */ + + /* default value first */ + ret = SendMessage(hwnd, WM_SETREDRAW, TRUE, 0); + expect(0, ret); + /* disable */ + style = GetWindowLongPtr(hwnd, GWL_STYLE); + ok(style & WS_VISIBLE, "Expected WS_VISIBLE to be set\n"); + ret = SendMessage(hwnd, WM_SETREDRAW, FALSE, 0); + expect(0, ret); + style = GetWindowLongPtr(hwnd, GWL_STYLE); + ok(style & WS_VISIBLE, "Expected WS_VISIBLE to be set\n"); + + DestroyWindow(hwnd); +} + START_TEST(listview) { HMODULE hComctl32; @@ -2257,4 +2283,7 @@ START_TEST(listview) test_ownerdata(); test_norecompute(); test_nosortheader(); + test_setredraw(); + + DestroyWindow(hwndparent); }

1 0

Alexandre Julliard : oleaut32/tests: Fix some pointer sizes in typelib tests for 64-bit.
by Alexandre Julliard May 21, 2009

May 21, 2009

Module: wine Branch: master Commit: cdf8aeb0c8d2b308ebcd394c18b9360c1b8346c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdf8aeb0c8d2b308ebcd394c1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 20 20:19:59 2009 +0200 oleaut32/tests: Fix some pointer sizes in typelib tests for 64-bit. --- dlls/oleaut32/tests/typelib.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 314a43f..1c1cfef 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -33,8 +33,8 @@ #include "tmarshal.h" #define expect_eq(expr, value, type, format) { type _ret = (expr); ok((value) == _ret, #expr " expected " format " got " format "\n", value, _ret); } -#define expect_int(expr, value) expect_eq(expr, (int)value, int, "%d") -#define expect_hex(expr, value) expect_eq(expr, (int)value, int, "0x%x") +#define expect_int(expr, value) expect_eq(expr, (int)(value), int, "%d") +#define expect_hex(expr, value) expect_eq(expr, (int)(value), int, "0x%x") #define expect_null(expr) expect_eq(expr, NULL, const void *, "%p") #define expect_wstr_acpval(expr, value) \

1 0

Jacek Caban : urlmon: Fixed buffer size calculation.
by Alexandre Julliard May 21, 2009

May 21, 2009

Module: wine Branch: master Commit: 061b6a839aac98c09cd560a0f5b0a2c19e9294cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=061b6a839aac98c09cd560a0f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 20 16:47:32 2009 +0200 urlmon: Fixed buffer size calculation. --- dlls/urlmon/bindprot.c | 16 +++++++--------- 1 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index eceb7e3..f63824b 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -1002,20 +1002,18 @@ static HRESULT report_data(BindProtocol *This, DWORD bscf, ULONG progress, ULONG do { read = 0; - hres = IInternetProtocol_Read(This->protocol, This->buf+This->buf_size, BUFFER_SIZE-This->buf_size, &read); - if(hres != S_OK) - break; + hres = IInternetProtocol_Read(This->protocol, This->buf+This->buf_size, + BUFFER_SIZE-This->buf_size, &read); + if(FAILED(hres) && hres != E_PENDING) + return hres; This->buf_size += read; - }while(This->buf_size < MIME_TEST_SIZE); - if(FAILED(hres) && hres != E_PENDING) - return hres; + }while(This->buf_size < MIME_TEST_SIZE && hres == S_OK); - This->buf_size += read; if(This->buf_size < MIME_TEST_SIZE && hres != S_FALSE) return S_OK; - - hres = FindMimeFromData(NULL, This->url, This->buf, min(This->buf_size, MIME_TEST_SIZE), This->mime, 0, &mime, 0); + hres = FindMimeFromData(NULL, This->url, This->buf, min(This->buf_size, MIME_TEST_SIZE), + This->mime, 0, &mime, 0); if(FAILED(hres)) return hres;

1 0

Lionel Debroux : kernel32: Fix doc header for SetThreadIdealProcessor.
by Alexandre Julliard May 21, 2009

May 21, 2009

Module: wine Branch: master Commit: e85a0375168ae5d59e6e25bbb3b7400660245027 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e85a0375168ae5d59e6e25bbb… Author: Lionel Debroux <lionel_debroux(a)yahoo.fr> Date: Wed May 20 14:46:58 2009 +0200 kernel32: Fix doc header for SetThreadIdealProcessor. --- dlls/kernel32/thread.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/thread.c b/dlls/kernel32/thread.c index b084943..8cd2fb1 100644 --- a/dlls/kernel32/thread.c +++ b/dlls/kernel32/thread.c @@ -402,7 +402,7 @@ DWORD_PTR WINAPI SetThreadAffinityMask( HANDLE hThread, DWORD_PTR dwThreadAffini /********************************************************************** - * SetThreadIdealProcessor [KERNEL32.@] Obtains timing information. + * SetThreadIdealProcessor [KERNEL32.@] Sets preferred processor for thread. * * RETURNS * Success: Value of last call to SetThreadIdealProcessor

1 0

Alexandre Julliard : widl: Add support for writing 64-bit format typelibs.
by Alexandre Julliard May 21, 2009

May 21, 2009

Module: wine Branch: master Commit: b3a08339728acb19fb86d860c9368e8e3beedb09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3a08339728acb19fb86d860c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 21 11:10:22 2009 +0200 widl: Add support for writing 64-bit format typelibs. --- tools/widl/hash.c | 1 + tools/widl/hash.h | 6 ------ tools/widl/widl.c | 1 + tools/widl/widltypes.h | 8 ++++++++ tools/widl/write_msft.c | 10 ++++++---- 5 files changed, 16 insertions(+), 10 deletions(-) diff --git a/tools/widl/hash.c b/tools/widl/hash.c index e09848e..bd20995 100644 --- a/tools/widl/hash.c +++ b/tools/widl/hash.c @@ -25,6 +25,7 @@ #include "winbase.h" #include "winnls.h" +#include "widltypes.h" #include "hash.h" static const unsigned char Lookup_16[128 * 3] = { diff --git a/tools/widl/hash.h b/tools/widl/hash.h index d859eae..3c2fd29 100644 --- a/tools/widl/hash.h +++ b/tools/widl/hash.h @@ -22,12 +22,6 @@ #ifndef __WIDL_HASH_H #define __WIDL_HASH_H -typedef enum tag_syskind_t { - SYS_WIN16 = 0, - SYS_WIN32, - SYS_MAC -} syskind_t; - extern unsigned int lhash_val_of_name_sys( syskind_t skind, LCID lcid, LPCSTR lpStr); #endif diff --git a/tools/widl/widl.c b/tools/widl/widl.c index cbc35b7..6ae8bae 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -135,6 +135,7 @@ FILE *header; FILE *idfile; size_t pointer_size = 0; +syskind_t typelib_kind = sizeof(void*) == 8 ? SYS_WIN64 : SYS_WIN32; time_t now; diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 7a194f4..f5466bf 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -487,6 +487,14 @@ struct _statement_t { } u; }; +typedef enum { + SYS_WIN16, + SYS_WIN32, + SYS_MAC, + SYS_WIN64 +} syskind_t; + +extern syskind_t typelib_kind; extern user_type_list_t user_type_list; void check_for_additional_prototype_types(const var_list_t *list); diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 3506efe..bff61fd 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -45,7 +45,7 @@ #include "winbase.h" #include "winnls.h" -#include "widltypes.h" +#include "widl.h" #include "typelib.h" #include "typelib_struct.h" #include "utils.h" @@ -1543,7 +1543,7 @@ static HRESULT add_func_desc(msft_typeinfo_t* typeinfo, var_t *func, int index) /* adjust size of VTBL */ if(funckind != 0x3 /* FUNC_STATIC */) - typeinfo->typeinfo->cbSizeVft += 4; + typeinfo->typeinfo->cbSizeVft += pointer_size; /* Increment the number of function elements */ typeinfo->typeinfo->cElement += 1; @@ -2031,7 +2031,7 @@ static void add_interface_typeinfo(msft_typelib_t *typelib, type_t *interface) } } msft_typeinfo->typeinfo->datatype2 = num_funcs << 16 | num_parents; - msft_typeinfo->typeinfo->cbSizeVft = num_funcs * 4; + msft_typeinfo->typeinfo->cbSizeVft = num_funcs * pointer_size; STATEMENTS_FOR_EACH_FUNC( stmt_func, type_iface_get_stmts(interface) ) { var_t *func = stmt_func->u.var; @@ -2539,6 +2539,8 @@ int create_msft_typelib(typelib_t *typelib) GUID midl_time_guid = {0xde77ba63,0x517c,0x11d1,{0xa2,0xda,0x00,0x00,0xf8,0x77,0x3c,0xe9}}; GUID midl_version_guid = {0xde77ba64,0x517c,0x11d1,{0xa2,0xda,0x00,0x00,0xf8,0x77,0x3c,0xe9}}; + pointer_size = (typelib_kind == SYS_WIN64) ? 8 : 4; + msft = xmalloc(sizeof(*msft)); memset(msft, 0, sizeof(*msft)); msft->typelib = typelib; @@ -2546,7 +2548,7 @@ int create_msft_typelib(typelib_t *typelib) ctl2_init_header(msft); ctl2_init_segdir(msft); - msft->typelib_header.varflags |= SYS_WIN32; + msft->typelib_header.varflags |= typelib_kind; /* * The following two calls return an offset or -1 if out of memory. We

1 0

Alexandre Julliard : msacm32.drv: Fix some Win64 pointer truncations issues .
by Alexandre Julliard May 21, 2009

May 21, 2009

Module: wine Branch: master Commit: a47e2b9856fcb26d0dab4c7c6d5c00be66e40eb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a47e2b9856fcb26d0dab4c7c6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 20 17:52:49 2009 +0200 msacm32.drv: Fix some Win64 pointer truncations issues. --- dlls/msacm32.drv/wavemap.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msacm32.drv/wavemap.c b/dlls/msacm32.drv/wavemap.c index a9d84af..556b0c0 100644 --- a/dlls/msacm32.drv/wavemap.c +++ b/dlls/msacm32.drv/wavemap.c @@ -56,8 +56,8 @@ typedef struct tagWAVEMAPDATA { } u; HACMSTREAM hAcmStream; /* needed data to filter callbacks. Only needed when hAcmStream is not 0 */ - DWORD dwCallback; - DWORD dwClientInstance; + DWORD_PTR dwCallback; + DWORD_PTR dwClientInstance; DWORD dwFlags; /* ratio to compute position from a PCM playback to any format */ DWORD avgSpeedOuter; @@ -149,7 +149,7 @@ static DWORD wodOpenHelper(WAVEMAPDATA* wom, UINT idx, return ret; } -static DWORD wodOpen(LPDWORD lpdwUser, LPWAVEOPENDESC lpDesc, DWORD dwFlags) +static DWORD wodOpen(DWORD_PTR *lpdwUser, LPWAVEOPENDESC lpDesc, DWORD dwFlags) { UINT ndlo, ndhi; UINT i; @@ -627,7 +627,7 @@ DWORD WINAPI WAVEMAP_wodMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, case DRVM_DISABLE: /* FIXME: Pretend this is supported */ return 0; - case WODM_OPEN: return wodOpen ((LPDWORD)dwUser, (LPWAVEOPENDESC)dwParam1,dwParam2); + case WODM_OPEN: return wodOpen ((DWORD_PTR*)dwUser, (LPWAVEOPENDESC)dwParam1,dwParam2); case WODM_CLOSE: return wodClose ((WAVEMAPDATA*)dwUser); case WODM_WRITE: return wodWrite ((WAVEMAPDATA*)dwUser, (LPWAVEHDR)dwParam1, dwParam2); case WODM_PAUSE: return wodPause ((WAVEMAPDATA*)dwUser); @@ -738,7 +738,7 @@ static DWORD widOpenHelper(WAVEMAPDATA* wim, UINT idx, return ret; } -static DWORD widOpen(LPDWORD lpdwUser, LPWAVEOPENDESC lpDesc, DWORD dwFlags) +static DWORD widOpen(DWORD_PTR *lpdwUser, LPWAVEOPENDESC lpDesc, DWORD dwFlags) { UINT ndlo, ndhi; UINT i; @@ -1157,7 +1157,7 @@ DWORD WINAPI WAVEMAP_widMessage(WORD wDevID, WORD wMsg, DWORD_PTR dwUser, /* FIXME: Pretend this is supported */ return 0; - case WIDM_OPEN: return widOpen ((LPDWORD)dwUser, (LPWAVEOPENDESC)dwParam1, dwParam2); + case WIDM_OPEN: return widOpen ((DWORD_PTR*)dwUser, (LPWAVEOPENDESC)dwParam1, dwParam2); case WIDM_CLOSE: return widClose ((WAVEMAPDATA*)dwUser); case WIDM_ADDBUFFER: return widAddBuffer ((WAVEMAPDATA*)dwUser, (LPWAVEHDR)dwParam1, dwParam2);

1 0

Alexandre Julliard : oleaut32/tests: Fix some pointer sizes in typelib tests for 64-bit.
by Alexandre Julliard May 21, 2009

May 21, 2009

Module: wine Branch: master Commit: 538c706787f5bd55286e07c2ad88275d835b9804 URL: http://source.winehq.org/git/wine.git/?a=commit;h=538c706787f5bd55286e07c2a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 20 20:19:59 2009 +0200 oleaut32/tests: Fix some pointer sizes in typelib tests for 64-bit. --- dlls/oleaut32/tests/typelib.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 277e97d..314a43f 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -1090,7 +1090,7 @@ typedef struct _function_info CALLCONV callconv; short cParams; short cParamsOpt; - short oVft; + short vtbl_index; short cScodes; WORD wFuncFlags; element_info ret_type; @@ -1115,7 +1115,7 @@ static const interface_info info[] = { { "IDualIface", /*kind*/ TKIND_DISPATCH, /*flags*/ 0x1040, /*align*/ 4, /*size*/ 4, - /*#vtbl*/ 28, /*#func*/ 8, + /*#vtbl*/ 7, /*#func*/ 8, { { 0x60000000, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ 0x4, @@ -1135,7 +1135,7 @@ static const interface_info info[] = { }, { 0x60000001, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ 0x4, - /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 4, /*#scodes*/ 0, /*flags*/ 0x1, + /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 1, /*#scodes*/ 0, /*flags*/ 0x1, {19, 0}, /* ret */ { /* params */ {-1, -1} @@ -1147,7 +1147,7 @@ static const interface_info info[] = { }, { 0x60000002, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ 0x4, - /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 8, /*#scodes*/ 0, /*flags*/ 0x1, + /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 2, /*#scodes*/ 0, /*flags*/ 0x1, {19, 0}, /* ret */ { /* params */ {-1, -1} @@ -1159,7 +1159,7 @@ static const interface_info info[] = { }, { 0x60010000, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ 0x4, - /*#param*/ 1, /*#opt*/ 0, /*vtbl*/ 12, /*#scodes*/ 0, /*flags*/ 0x1, + /*#param*/ 1, /*#opt*/ 0, /*vtbl*/ 3, /*#scodes*/ 0, /*flags*/ 0x1, {24, 0}, /* ret */ { /* params */ {26, 2}, @@ -1173,7 +1173,7 @@ static const interface_info info[] = { }, { 0x60010001, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ 0x4, - /*#param*/ 3, /*#opt*/ 0, /*vtbl*/ 16, /*#scodes*/ 0, /*flags*/ 0x1, + /*#param*/ 3, /*#opt*/ 0, /*vtbl*/ 4, /*#scodes*/ 0, /*flags*/ 0x1, {24, 0}, /* ret */ { /* params */ {23, 1}, @@ -1191,7 +1191,7 @@ static const interface_info info[] = { }, { 0x60010002, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ 0x4, - /*#param*/ 5, /*#opt*/ 0, /*vtbl*/ 20, /*#scodes*/ 0, /*flags*/ 0x1, + /*#param*/ 5, /*#opt*/ 0, /*vtbl*/ 5, /*#scodes*/ 0, /*flags*/ 0x1, {24, 0}, /* ret */ { /* params */ {26, 1}, @@ -1213,7 +1213,7 @@ static const interface_info info[] = { }, { 0x60010003, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ 0x4, - /*#param*/ 8, /*#opt*/ 0, /*vtbl*/ 24, /*#scodes*/ 0, /*flags*/ 0x1, + /*#param*/ 8, /*#opt*/ 0, /*vtbl*/ 6, /*#scodes*/ 0, /*flags*/ 0x1, {24, 0}, /* ret */ { /* params */ {3, 1}, @@ -1241,7 +1241,7 @@ static const interface_info info[] = { }, { 0x60020000, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ 0x4, - /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 28, /*#scodes*/ 0, /*flags*/ 0x0, + /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 7, /*#scodes*/ 0, /*flags*/ 0x0, {24, 0}, /* ret */ { /* params */ {-1, -1} @@ -1256,11 +1256,11 @@ static const interface_info info[] = { { "ISimpleIface", /*kind*/ TKIND_INTERFACE, /*flags*/ 0x1000, /*align*/ 4, /*size*/ 4, - /*#vtbl*/ 32, /*#func*/ 1, + /*#vtbl*/ 8, /*#func*/ 1, { { 0x60020000, /*func*/ FUNC_PUREVIRTUAL, /*inv*/ INVOKE_FUNC, /*call*/ 0x4, - /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 28, /*#scodes*/ 0, /*flags*/ 0x0, + /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 7, /*#scodes*/ 0, /*flags*/ 0x0, {25, 0}, /* ret */ { /* params */ {-1, -1} @@ -1307,7 +1307,7 @@ static void test_dump_typelib(const char *name) expect_hex(typeattr->wTypeFlags, if_info->wTypeFlags); expect_int(typeattr->cbAlignment, if_info->cbAlignment); expect_int(typeattr->cbSizeInstance, if_info->cbSizeInstance); - expect_int(typeattr->cbSizeVft, if_info->cbSizeVft); + expect_int(typeattr->cbSizeVft, if_info->cbSizeVft * sizeof(void*)); expect_int(typeattr->cFuncs, if_info->cFuncs); for (func = 0; func < typeattr->cFuncs; func++) @@ -1326,7 +1326,7 @@ static void test_dump_typelib(const char *name) expect_int(desc->callconv, fn_info->callconv); expect_int(desc->cParams, fn_info->cParams); expect_int(desc->cParamsOpt, fn_info->cParamsOpt); - expect_int(desc->oVft, fn_info->oVft); + expect_int(desc->oVft, fn_info->vtbl_index * sizeof(void*)); expect_int(desc->cScodes, fn_info->cScodes); expect_int(desc->wFuncFlags, fn_info->wFuncFlags); ole_check(ITypeInfo_GetNames(typeinfo, desc->memid, namesTab, 256, &cNames));

1 0

Alexandre Julliard : winmm: Fix some Win64 pointer truncations issues.
by Alexandre Julliard May 21, 2009

May 21, 2009

Module: wine Branch: master Commit: 8f813fd4e4bdaa74a4257d218d790579db8a1af2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f813fd4e4bdaa74a4257d218… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 20 17:50:54 2009 +0200 winmm: Fix some Win64 pointer truncations issues. --- dlls/winmm/lolvldrv.c | 28 ++++++++++++++-------------- dlls/winmm/mci.c | 16 ++++++++-------- dlls/winmm/message16.c | 48 ++++++++++++++++++++++++------------------------ dlls/winmm/playsound.c | 10 +++++----- dlls/winmm/winemm.h | 11 +++++------ dlls/winmm/winmm.c | 20 ++++++++++---------- 6 files changed, 66 insertions(+), 67 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8f813fd4e4bdaa74a4257…

1 0

Alexandre Julliard : oleaut32: Add support for registering 64-bit typelibs.
by Alexandre Julliard May 21, 2009

May 21, 2009

Module: wine Branch: master Commit: 9955350ea1748370b1b6f841639f792cbc052474 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9955350ea1748370b1b6f8416… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 21 15:19:16 2009 +0200 oleaut32: Add support for registering 64-bit typelibs. --- dlls/oleaut32/tmarshal.c | 2 +- dlls/oleaut32/typelib.c | 18 +++++++++++++----- include/oaidl.idl | 3 ++- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index 9d24174..7235850 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -299,7 +299,7 @@ _get_typeinfo_for_iid(REFIID riid, ITypeInfo**ti) { return E_FAIL; } RegCloseKey(ikey); - sprintf(typelibkey,"Typelib\\%s\\%s\\0\\win32",tlguid,ver); + sprintf(typelibkey,"Typelib\\%s\\%s\\0\\win%u",tlguid,ver,(sizeof(void*) == 8) ? 64 : 32); tlfnlen = sizeof(tlfn); if (RegQueryValueA(HKEY_CLASSES_ROOT,typelibkey,tlfn,&tlfnlen)) { ERR("Could not get typelib fn?\n"); diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index a0af847..5ddbe1b 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -265,12 +265,14 @@ static WCHAR *get_lcid_subkey( LCID lcid, SYSKIND syskind, WCHAR *buffer ) static const WCHAR LcidFormatW[] = {'%','l','x','\\',0}; static const WCHAR win16W[] = {'w','i','n','1','6',0}; static const WCHAR win32W[] = {'w','i','n','3','2',0}; + static const WCHAR win64W[] = {'w','i','n','6','4',0}; sprintfW( buffer, LcidFormatW, lcid ); switch(syskind) { case SYS_WIN16: strcatW( buffer, win16W ); break; case SYS_WIN32: strcatW( buffer, win32W ); break; + case SYS_WIN64: strcatW( buffer, win64W ); break; default: TRACE("Typelib is for unsupported syskind %i\n", syskind); return NULL; @@ -535,6 +537,12 @@ HRESULT WINAPI RegisterTypeLib( if (FAILED(ITypeLib_GetLibAttr(ptlib, &attr))) return E_FAIL; +#ifdef _WIN64 + if (attr->syskind != SYS_WIN64) return TYPE_E_BADMODULEKIND; +#else + if (attr->syskind != SYS_WIN32 && attr->syskind != SYS_WIN16) return TYPE_E_BADMODULEKIND; +#endif + get_typelib_key( &attr->guid, attr->wMajorVerNum, attr->wMinorVerNum, keyName ); res = S_OK; @@ -780,7 +788,7 @@ HRESULT WINAPI UnRegisterTypeLib( /* Create the path to the key */ get_typelib_key( libid, wVerMajor, wVerMinor, keyName ); - if (syskind != SYS_WIN16 && syskind != SYS_WIN32) + if (syskind != SYS_WIN16 && syskind != SYS_WIN32 && syskind != SYS_WIN64) { TRACE("Unsupported syskind %i\n", syskind); result = E_INVALIDARG; @@ -1926,7 +1934,7 @@ MSFT_DoFuncs(TLBContext* pcx, (*pptfd)->funcdesc.callconv = (pFuncRec->FKCCIC) >> 8 & 0xF; (*pptfd)->funcdesc.cParams = pFuncRec->nrargs ; (*pptfd)->funcdesc.cParamsOpt = pFuncRec->nroargs ; - (*pptfd)->funcdesc.oVft = (pFuncRec->VtableOffset * sizeof(void *))/4; + (*pptfd)->funcdesc.oVft = pFuncRec->VtableOffset; (*pptfd)->funcdesc.wFuncFlags = LOWORD(pFuncRec->Flags) ; MSFT_GetTdesc(pcx, @@ -2185,7 +2193,7 @@ static ITypeInfoImpl * MSFT_DoTypeInfo( ptiRet->TypeAttr.wMajorVerNum=LOWORD(tiBase.version); ptiRet->TypeAttr.wMinorVerNum=HIWORD(tiBase.version); ptiRet->TypeAttr.cImplTypes=tiBase.cImplTypes; - ptiRet->TypeAttr.cbSizeVft=(tiBase.cbSizeVft * sizeof(void *))/4; /* FIXME: this is only the non inherited part */ + ptiRet->TypeAttr.cbSizeVft=tiBase.cbSizeVft; /* FIXME: this is only the non inherited part */ if(ptiRet->TypeAttr.typekind == TKIND_ALIAS) MSFT_GetTdesc(pcx, tiBase.datatype1, &ptiRet->TypeAttr.tdescAlias, ptiRet); @@ -3947,7 +3955,7 @@ static ITypeLib2* ITypeLib2_Constructor_SLTG(LPVOID pLib, DWORD dwTLBLength) (*ppTypeInfoImpl)->TypeAttr.cbAlignment = pTITail->cbAlignment; (*ppTypeInfoImpl)->TypeAttr.cbSizeInstance = pTITail->cbSizeInstance; - (*ppTypeInfoImpl)->TypeAttr.cbSizeVft = (pTITail->cbSizeVft * sizeof(void *))/4; + (*ppTypeInfoImpl)->TypeAttr.cbSizeVft = pTITail->cbSizeVft; switch(pTIHeader->typekind) { case TKIND_ENUM: @@ -7528,7 +7536,7 @@ HRESULT WINAPI CreateDispTypeInfo( (*ppFuncDesc)->funcdesc.callconv = md->cc; (*ppFuncDesc)->funcdesc.cParams = md->cArgs; (*ppFuncDesc)->funcdesc.cParamsOpt = 0; - (*ppFuncDesc)->funcdesc.oVft = md->iMeth << 2; + (*ppFuncDesc)->funcdesc.oVft = md->iMeth * sizeof(void *); (*ppFuncDesc)->funcdesc.cScodes = 0; (*ppFuncDesc)->funcdesc.wFuncFlags = 0; (*ppFuncDesc)->funcdesc.elemdescFunc.tdesc.vt = md->vtReturn; diff --git a/include/oaidl.idl b/include/oaidl.idl index 1cc166a..833d31b 100644 --- a/include/oaidl.idl +++ b/include/oaidl.idl @@ -989,7 +989,8 @@ interface ITypeLib : IUnknown typedef [v1_enum] enum tagSYSKIND { SYS_WIN16 = 0, SYS_WIN32, - SYS_MAC + SYS_MAC, + SYS_WIN64 } SYSKIND; typedef [v1_enum] enum tagLIBFLAGS {

1 0

Alexandre Julliard : msvcrt/tests: Use the _winver etc. variables instead of the __p_ functions that don't exist on 64-bit.
by Alexandre Julliard May 21, 2009

May 21, 2009

Module: wine Branch: master Commit: 1c66fab80ae22f0a045ab0537d8cee0bf79eeb8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c66fab80ae22f0a045ab0537… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 20 17:47:43 2009 +0200 msvcrt/tests: Use the _winver etc. variables instead of the __p_ functions that don't exist on 64-bit. --- dlls/msvcrt/tests/data.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/msvcrt/tests/data.c b/dlls/msvcrt/tests/data.c index db29cd4..01704ac 100644 --- a/dlls/msvcrt/tests/data.c +++ b/dlls/msvcrt/tests/data.c @@ -70,19 +70,19 @@ static void test_initterm(void) static void test_initvar( HMODULE hmsvcrt ) { OSVERSIONINFO osvi = { sizeof(OSVERSIONINFO) }; - int* (*pp_winver)() = (int*(*)())GetProcAddress(hmsvcrt, "__p__winver"); - int* (*pp_winmajor)() = (int*(*)())GetProcAddress(hmsvcrt, "__p__winmajor"); - int* (*pp_winminor)() = (int*(*)())GetProcAddress(hmsvcrt, "__p__winminor"); - int* (*pp_osver)() = (int*(*)())GetProcAddress(hmsvcrt, "__p__osver"); + int *pp_winver = (int*)GetProcAddress(hmsvcrt, "_winver"); + int *pp_winmajor = (int*)GetProcAddress(hmsvcrt, "_winmajor"); + int *pp_winminor = (int*)GetProcAddress(hmsvcrt, "_winminor"); + int *pp_osver = (int*)GetProcAddress(hmsvcrt, "_osver"); unsigned int winver, winmajor, winminor, osver; if( !( pp_winmajor && pp_winminor && pp_winver)) { win_skip("_winver variables are not available\n"); return; } - winver = *pp_winver(); - winminor = *pp_winminor(); - winmajor = *pp_winmajor(); + winver = *pp_winver; + winminor = *pp_winminor; + winmajor = *pp_winmajor; GetVersionEx( &osvi); ok( winminor == osvi.dwMinorVersion, "Wrong value for _winminor %02x expected %02x\n", winminor, osvi.dwMinorVersion); @@ -95,7 +95,7 @@ static void test_initvar( HMODULE hmsvcrt ) win_skip("_osver variables are not available\n"); return; } - osver = *pp_osver(); + osver = *pp_osver; ok( osver == (osvi.dwBuildNumber & 0xffff) || ((osvi.dwBuildNumber >> 24) == osvi.dwMajorVersion && ((osvi.dwBuildNumber >> 16) & 0xff) == osvi.dwMinorVersion), /* 95/98/ME */

1 0