June 2007 - Wine-commits - list.winehq.org

Lei Zhang : comctl32: Reduce duplicate code between PropertySheetA/W.
by Alexandre Julliard 26 Jun '07

26 Jun '07

Module: wine Branch: master Commit: 0cbee494b34354b533346eece60e03f6cdaf9cab URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cbee494b34354b533346eece… Author: Lei Zhang <thestig(a)google.com> Date: Mon Jun 25 23:56:24 2007 -0700 comctl32: Reduce duplicate code between PropertySheetA/W. --- dlls/comctl32/propsheet.c | 56 +++++++++++++++++++++----------------------- 1 files changed, 27 insertions(+), 29 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 04929c5..6a60e19 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -2780,6 +2780,31 @@ static INT do_loop(const PropSheetInfo *psInfo) } /****************************************************************************** + * PROPSHEET_PropertySheet + * + * Common code between PropertySheetA/W + */ +static INT_PTR PROPSHEET_PropertySheet(PropSheetInfo* psInfo, BOOL unicode) +{ + INT_PTR bRet = 0; + if (psInfo->active_page >= psInfo->nPages) psInfo->active_page = 0; + TRACE("startpage: %d of %d pages\n", psInfo->active_page, psInfo->nPages); + + psInfo->unicode = unicode; + psInfo->ended = FALSE; + + bRet = PROPSHEET_CreateDialog(psInfo); + if(!psInfo->isModeless) + { + HWND parent = GetParent(psInfo->hwnd); + if (parent) EnableWindow(parent, FALSE); + bRet = do_loop(psInfo); + if (parent) EnableWindow(parent, TRUE); + } + return bRet; +} + +/****************************************************************************** * PropertySheet (COMCTL32.@) * PropertySheetA (COMCTL32.@) * @@ -2794,7 +2819,6 @@ static INT do_loop(const PropSheetInfo *psInfo) */ INT_PTR WINAPI PropertySheetA(LPCPROPSHEETHEADERA lppsh) { - INT_PTR bRet = 0; PropSheetInfo* psInfo = (PropSheetInfo*) GlobalAlloc(GPTR, sizeof(PropSheetInfo)); UINT i, n; @@ -2828,22 +2852,7 @@ INT_PTR WINAPI PropertySheetA(LPCPROPSHEETHEADERA lppsh) } } - if (psInfo->active_page >= psInfo->nPages) psInfo->active_page = 0; - TRACE("startpage: %d of %d pages\n", psInfo->active_page, psInfo->nPages); - - psInfo->unicode = FALSE; - psInfo->ended = FALSE; - - bRet = PROPSHEET_CreateDialog(psInfo); - if(!psInfo->isModeless) - { - HWND parent = GetParent(psInfo->hwnd); - if (parent) EnableWindow(parent, FALSE); - bRet = do_loop(psInfo); - if (parent) EnableWindow(parent, TRUE); - } - - return bRet; + return PROPSHEET_PropertySheet(psInfo, FALSE); } /****************************************************************************** @@ -2853,7 +2862,6 @@ INT_PTR WINAPI PropertySheetA(LPCPROPSHEETHEADERA lppsh) */ INT_PTR WINAPI PropertySheetW(LPCPROPSHEETHEADERW lppsh) { - INT_PTR bRet = 0; PropSheetInfo* psInfo = (PropSheetInfo*) GlobalAlloc(GPTR, sizeof(PropSheetInfo)); UINT i, n; @@ -2887,17 +2895,7 @@ INT_PTR WINAPI PropertySheetW(LPCPROPSHEETHEADERW lppsh) } } - if (psInfo->active_page >= psInfo->nPages) psInfo->active_page = 0; - TRACE("startpage: %d of %d pages\n", psInfo->active_page, psInfo->nPages); - - psInfo->unicode = TRUE; - psInfo->ended = FALSE; - - bRet = PROPSHEET_CreateDialog(psInfo); - if(!psInfo->isModeless) - bRet = do_loop(psInfo); - - return bRet; + return PROPSHEET_PropertySheet(psInfo, TRUE); } static LPWSTR load_string( HINSTANCE instance, LPCWSTR str )

1 0

Dan Hipschman : rpcrt4: Allow enums as union switch types.
by Alexandre Julliard 26 Jun '07

26 Jun '07

Module: wine Branch: master Commit: ea7b1694de36742f0b3b356a6bebf5d181619583 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea7b1694de36742f0b3b356a6… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Mon Jun 25 18:26:42 2007 -0700 rpcrt4: Allow enums as union switch types. --- dlls/rpcrt4/ndr_marshall.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 2b89e50..d8395b8 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -4414,9 +4414,11 @@ static ULONG get_discriminant(unsigned char fc, unsigned char *pMemory) case RPC_FC_WCHAR: case RPC_FC_SHORT: case RPC_FC_USHORT: + case RPC_FC_ENUM16: return *(USHORT *)pMemory; case RPC_FC_LONG: case RPC_FC_ULONG: + case RPC_FC_ENUM32: return *(ULONG *)pMemory; default: FIXME("Unhandled base type: 0x%02x\n", fc);

1 0

Dan Hipschman : widl: Allow enums as union switch types.
by Alexandre Julliard 26 Jun '07

26 Jun '07

Module: wine Branch: master Commit: 46222aee6ea7577ba060d1907d29ca5a8651a524 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46222aee6ea7577ba060d1907… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Mon Jun 25 18:27:24 2007 -0700 widl: Allow enums as union switch types. --- dlls/rpcrt4/tests/server.c | 21 +++++++++++++++++++++ dlls/rpcrt4/tests/server.idl | 7 +++++++ tools/widl/typegen.c | 26 +++++++++++++++++++++----- 3 files changed, 49 insertions(+), 5 deletions(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index b1a5df2..95bd60b 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -286,6 +286,18 @@ s_enum_ord(e_t e) } } +double +s_square_encue(encue_t *eue) +{ + switch (eue->t) + { + case E1: return eue->tagged_union.i1 * eue->tagged_union.i1; + case E2: return eue->tagged_union.f2 * eue->tagged_union.f2; + default: + return 0.0; + } +} + void s_stop(void) { @@ -409,6 +421,7 @@ basic_tests(void) static void union_tests(void) { + encue_t eue; encu_t eu; sun_t su; int i; @@ -437,6 +450,14 @@ union_tests(void) eu.t = ENCU_F; eu.tagged_union.f = 3.0; ok(square_encu(&eu) == 9.0, "RPC square_encu\n"); + + eue.t = E1; + eue.tagged_union.i1 = 8; + ok(square_encue(&eue) == 64.0, "RPC square_encue\n"); + + eue.t = E2; + eue.tagged_union.f2 = 10.0; + ok(square_encue(&eue) == 100.0, "RPC square_encue\n"); } static test_list_t * diff --git a/dlls/rpcrt4/tests/server.idl b/dlls/rpcrt4/tests/server.idl index 935c4bb..c33f179 100644 --- a/dlls/rpcrt4/tests/server.idl +++ b/dlls/rpcrt4/tests/server.idl @@ -165,9 +165,16 @@ interface IServer E4 = 64 } e_t; + typedef union encue switch (e_t t) + { + case E1: int i1; + case E2: float f2; + } encue_t; + double square_encu(encu_t *eu); int sum_parr(int *a[3]); int sum_pcarr([size_is(n)] int *a[], int n); int enum_ord(e_t e); + double square_encue(encue_t *eue); void stop(void); } diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index f3958dd..e8f6d1f 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -626,6 +626,7 @@ static size_t write_conf_or_var_desc(FILE *file, const func_t *func, const type_ break; case RPC_FC_WCHAR: case RPC_FC_SHORT: + case RPC_FC_ENUM16: param_type = RPC_FC_SHORT; param_type_string = "FC_SHORT"; break; @@ -634,6 +635,7 @@ static size_t write_conf_or_var_desc(FILE *file, const func_t *func, const type_ param_type_string = "FC_USHORT"; break; case RPC_FC_LONG: + case RPC_FC_ENUM32: param_type = RPC_FC_LONG; param_type_string = "FC_LONG"; break; @@ -1734,12 +1736,26 @@ static size_t write_union_tfs(FILE *file, type_t *type, unsigned int *tfsoff) { const var_t *sv = LIST_ENTRY(list_head(type->fields), const var_t, entry); const type_t *st = sv->type; - size_t ss = type_memsize(st, &align); - print_file(file, 2, "0x%x,\t/* %s */\n", type->type, string_of_type(type->type)); - print_file(file, 2, "0x%x,\t/* Switch type= %s */\n", - (ss << 4) | st->type, string_of_type(st->type)); - *tfsoff += 2; + switch (st->type) + { + case RPC_FC_CHAR: + case RPC_FC_SMALL: + case RPC_FC_USMALL: + case RPC_FC_SHORT: + case RPC_FC_USHORT: + case RPC_FC_LONG: + case RPC_FC_ULONG: + case RPC_FC_ENUM16: + case RPC_FC_ENUM32: + print_file(file, 2, "0x%x,\t/* %s */\n", type->type, string_of_type(type->type)); + print_file(file, 2, "0x%x,\t/* Switch type= %s */\n", + 0x40 | st->type, string_of_type(st->type)); + *tfsoff += 2; + break; + default: + error("union switch type must be an integer, char, or enum\n"); + } } print_file(file, 2, "NdrFcShort(0x%x),\t/* %d */\n", size, size); print_file(file, 2, "NdrFcShort(0x%x),\t/* %d */\n", nbranch, nbranch);

1 0

James Hawkins : msi: Add a stub implementation of MsiQueryComponentStateA.
by Alexandre Julliard 26 Jun '07

26 Jun '07

Module: wine Branch: master Commit: ee89cfca534679d72b23a79165b6a74e5fc19b40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee89cfca534679d72b23a7916… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Jun 25 16:44:47 2007 -0700 msi: Add a stub implementation of MsiQueryComponentStateA. --- dlls/msi/msi.c | 11 +++++++++++ dlls/msi/msi.spec | 2 +- include/msi.h | 4 ++++ 3 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index b332f0e..2042695 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -732,6 +732,17 @@ UINT WINAPI MsiEnableLogW(DWORD dwLogMode, LPCWSTR szLogFile, DWORD attributes) return ERROR_SUCCESS; } +UINT WINAPI MsiQueryComponentStateA(LPSTR szProductCode, LPSTR szUserSid, MSIINSTALLCONTEXT dwContext, LPCSTR szComponent, INSTALLSTATE *pdwState) +{ + FIXME("(%s, %s, %d, %s, %p): stub!\n", debugstr_a(szProductCode), debugstr_a(szUserSid), dwContext, debugstr_a(szComponent), pdwState); + + if (!pdwState) + return ERROR_INVALID_PARAMETER; + + *pdwState = INSTALLSTATE_UNKNOWN; + return ERROR_UNKNOWN_PRODUCT; +} + INSTALLSTATE WINAPI MsiQueryProductStateA(LPCSTR szProduct) { LPWSTR szwProduct = NULL; diff --git a/dlls/msi/msi.spec b/dlls/msi/msi.spec index 2fe63b3..c419ee7 100644 --- a/dlls/msi/msi.spec +++ b/dlls/msi/msi.spec @@ -242,7 +242,7 @@ 246 stdcall MsiEnumProductsExW(wstr wstr long long ptr ptr ptr ptr) 247 stub MsiGetProductInfoExA 248 stub MsiGetProductInfoExW -249 stub MsiQueryComponentStateA +249 stdcall MsiQueryComponentStateA(str str long str ptr) 250 stub MsiQueryComponentStateW 251 stub MsiQueryFeatureStateExA 252 stub MsiQueryFeatureStateExW diff --git a/include/msi.h b/include/msi.h index 3fb214b..37f4b4b 100644 --- a/include/msi.h +++ b/include/msi.h @@ -425,6 +425,10 @@ UINT WINAPI MsiVerifyPackageA(LPCSTR); UINT WINAPI MsiVerifyPackageW(LPCWSTR); #define MsiVerifyPackage WINELIB_NAME_AW(MsiVerifyPackage) +UINT WINAPI MsiQueryComponentStateA(LPSTR,LPSTR,MSIINSTALLCONTEXT,LPCSTR,INSTALLSTATE*); +UINT WINAPI MsiQueryComponentStateW(LPWSTR,LPWSTR,MSIINSTALLCONTEXT,LPCWSTR,INSTALLSTATE*); +#define MsiQueryComponentState WINELIB_NAME_AW(MsiQueryComponentState) + INSTALLSTATE WINAPI MsiQueryProductStateA(LPCSTR); INSTALLSTATE WINAPI MsiQueryProductStateW(LPCWSTR); #define MsiQueryProductState WINELIB_NAME_AW(MsiQueryProductState)

1 0

Dan Hipschman : widl: Fix crash dealing with anonymous unions.
by Alexandre Julliard 26 Jun '07

26 Jun '07

Module: wine Branch: master Commit: 704f2868ed0c1350a08a2991b7db4cf086ef3389 URL: http://source.winehq.org/git/wine.git/?a=commit;h=704f2868ed0c1350a08a2991b… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Mon Jun 25 18:24:53 2007 -0700 widl: Fix crash dealing with anonymous unions. --- tools/widl/typegen.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 5fec7c7..f3958dd 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -574,7 +574,7 @@ static size_t write_conf_or_var_desc(FILE *file, const func_t *func, const type_ { unsigned int align = 0; /* FIXME: take alignment into account */ - if (!strcmp(var->name, subexpr->u.sval)) + if (var->name && !strcmp(var->name, subexpr->u.sval)) { correlation_variable = var->type; break;

1 0

Dan Hipschman : rpcrt4/tests: Wrap a try/except block around tests.
by Alexandre Julliard 26 Jun '07

26 Jun '07

Module: wine Branch: master Commit: 076a6206ff9598af97e940b62b8b629da4758e6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=076a6206ff9598af97e940b62… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Mon Jun 25 18:25:57 2007 -0700 rpcrt4/tests: Wrap a try/except block around tests. --- dlls/rpcrt4/tests/server.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index 538f2aa..b1a5df2 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -677,7 +677,17 @@ START_TEST(server) progname = argv[0]; if (argc == 3) - client(argv[2]); + { + RpcTryExcept + { + client(argv[2]); + } + RpcExcept(TRUE) + { + trace("Exception %d\n", RpcExceptionCode()); + } + RpcEndExcept + } else server(); }

1 0

Dan Hipschman : widl: Check for user types when calculating buffer size.
by Alexandre Julliard 26 Jun '07

26 Jun '07

Module: wine Branch: master Commit: ab22b4b3d45717831c4f5ce82de2e0705d0735d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab22b4b3d45717831c4f5ce82… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Mon Jun 25 18:23:33 2007 -0700 widl: Check for user types when calculating buffer size. --- tools/widl/typegen.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index bb998fc..8dedd8d 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -2101,7 +2101,13 @@ static unsigned int get_required_buffer_size_type( size_t size = 0; *alignment = 0; - if (!is_ptr(type)) + if (is_user_type(type)) + { + const char *uname; + const type_t *utype = get_user_type(type, &uname); + size = get_required_buffer_size_type(utype, uname, alignment); + } + else if (!is_ptr(type)) { switch (type->type) {

1 0

Dan Hipschman : widl: Get simple enums working.
by Alexandre Julliard 26 Jun '07

26 Jun '07

Module: wine Branch: master Commit: 512c36cae62fa0d45ac1997abf4eb0149ce264cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=512c36cae62fa0d45ac1997ab… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Mon Jun 25 18:24:11 2007 -0700 widl: Get simple enums working. --- dlls/rpcrt4/tests/server.c | 19 +++++++++++++++++++ dlls/rpcrt4/tests/server.idl | 9 +++++++++ tools/widl/typegen.c | 4 ++++ 3 files changed, 32 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index ceb083b..538f2aa 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -272,6 +272,20 @@ s_sum_pcarr(int *a[], int n) return s; } +int +s_enum_ord(e_t e) +{ + switch (e) + { + case E1: return 1; + case E2: return 2; + case E3: return 3; + case E4: return 4; + default: + return 0; + } +} + void s_stop(void) { @@ -385,6 +399,11 @@ basic_tests(void) ok(dot_copy_vectors(vec1, vec2) == -21, "RPC dot_copy_vectors\n"); ok(sum_fixed_array(f) == -2, "RPC sum_fixed_array\n"); ok(sum_sp(&sp) == 29, "RPC sum_sp\n"); + + ok(enum_ord(E1) == 1, "RPC enum_ord\n"); + ok(enum_ord(E2) == 2, "RPC enum_ord\n"); + ok(enum_ord(E3) == 3, "RPC enum_ord\n"); + ok(enum_ord(E4) == 4, "RPC enum_ord\n"); } static void diff --git a/dlls/rpcrt4/tests/server.idl b/dlls/rpcrt4/tests/server.idl index d409c53..935c4bb 100644 --- a/dlls/rpcrt4/tests/server.idl +++ b/dlls/rpcrt4/tests/server.idl @@ -157,8 +157,17 @@ interface IServer case ENCU_F: float f; } encu_t; + typedef enum + { + E1 = 23, + E2 = 4, + E3 = 0, + E4 = 64 + } e_t; + double square_encu(encu_t *eu); int sum_parr(int *a[3]); int sum_pcarr([size_is(n)] int *a[], int n); + int enum_ord(e_t e); void stop(void); } diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 8dedd8d..5fec7c7 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -2122,12 +2122,14 @@ static unsigned int get_required_buffer_size_type( case RPC_FC_WCHAR: case RPC_FC_USHORT: case RPC_FC_SHORT: + case RPC_FC_ENUM16: *alignment = 4; size = 2; break; case RPC_FC_ULONG: case RPC_FC_LONG: + case RPC_FC_ENUM32: case RPC_FC_FLOAT: case RPC_FC_ERROR_STATUS_T: *alignment = 4; @@ -2344,12 +2346,14 @@ void print_phase_basetype(FILE *file, int indent, enum remoting_phase phase, case RPC_FC_WCHAR: case RPC_FC_USHORT: case RPC_FC_SHORT: + case RPC_FC_ENUM16: size = 2; alignment = 2; break; case RPC_FC_ULONG: case RPC_FC_LONG: + case RPC_FC_ENUM32: case RPC_FC_FLOAT: case RPC_FC_ERROR_STATUS_T: size = 4;

1 0

Dan Hipschman : widl: Check for interface pointers in pointer handling.
by Alexandre Julliard 26 Jun '07

26 Jun '07

Module: wine Branch: master Commit: fcebe48cadcc1abfca71f1a78bba06bd0c858fca URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcebe48cadcc1abfca71f1a78… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Mon Jun 25 18:22:57 2007 -0700 widl: Check for interface pointers in pointer handling. --- tools/widl/typegen.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 8c76e6e..bb998fc 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1051,7 +1051,7 @@ static int write_pointer_description_offsets( int written = 0; unsigned int align; - if (is_ptr(type)) + if (is_ptr(type) && type->ref->type != RPC_FC_IP) { if (offset_in_memory && offset_in_buffer) {

1 0

Michael Stefaniuc : msacm32: Replace malloc/free with HeapAlloc/HeapFree.
by Alexandre Julliard 26 Jun '07

26 Jun '07

Module: wine Branch: master Commit: da1f67a30d0a263d1b9ce764b430d4f251b0ded2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da1f67a30d0a263d1b9ce764b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jun 26 01:05:19 2007 +0200 msacm32: Replace malloc/free with HeapAlloc/HeapFree. --- dlls/msacm32/tests/msacm.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/msacm32/tests/msacm.c b/dlls/msacm32/tests/msacm.c index c3b866c..6efcb84 100644 --- a/dlls/msacm32/tests/msacm.c +++ b/dlls/msacm32/tests/msacm.c @@ -301,9 +301,8 @@ static BOOL CALLBACK DriverEnumProc(HACMDRIVERID hadid, if (dwSize < sizeof(WAVEFORMATEX)) dwSize = sizeof(WAVEFORMATEX); - pwfx = (WAVEFORMATEX *) malloc(dwSize); + pwfx = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwSize); - ZeroMemory(pwfx, dwSize); pwfx->cbSize = LOWORD(dwSize) - sizeof(WAVEFORMATEX); pwfx->wFormatTag = WAVE_FORMAT_UNKNOWN; @@ -352,7 +351,7 @@ static BOOL CALLBACK DriverEnumProc(HACMDRIVERID hadid, "acmFormatTagEnum(): rc = %08x, should be %08x\n", rc, MMSYSERR_NOERROR); - free(pwfx); + HeapFree(GetProcessHeap(), 0, pwfx); /* try invalid handle */ rc = acmDriverClose((HACMDRIVER)1, 0);

1 0