August 2006 - Wine-commits - list.winehq.org

Hans Leidekker : wldap32: Support setting server controls.
by Alexandre Julliard 16 Aug '06

16 Aug '06

Module: wine Branch: master Commit: 1219fa5806291a04f413cbfe5307428103ad6583 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1219fa5806291a04f413cbf… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Wed Aug 16 12:53:21 2006 +0200 wldap32: Support setting server controls. --- dlls/wldap32/option.c | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/wldap32/option.c b/dlls/wldap32/option.c index d5206f5..d6cc36d 100644 --- a/dlls/wldap32/option.c +++ b/dlls/wldap32/option.c @@ -150,6 +150,7 @@ #ifdef HAVE_LDAP case LDAP_OPT_SECURITY_CONTEXT: case LDAP_OPT_SEND_TIMEOUT: case LDAP_OPT_SERVER_CERTIFICATE: + case LDAP_OPT_SERVER_CONTROLS: case LDAP_OPT_SERVER_ERROR: case LDAP_OPT_SERVER_EXT_ERROR: case LDAP_OPT_SIGN: @@ -288,6 +289,7 @@ #ifdef HAVE_LDAP case LDAP_OPT_SECURITY_CONTEXT: case LDAP_OPT_SEND_TIMEOUT: case LDAP_OPT_SERVER_CERTIFICATE: + case LDAP_OPT_SERVER_CONTROLS: case LDAP_OPT_SERVER_ERROR: case LDAP_OPT_SERVER_EXT_ERROR: case LDAP_OPT_SIGN: @@ -323,6 +325,17 @@ #ifdef HAVE_LDAP switch (option) { + case LDAP_OPT_SERVER_CONTROLS: + { + LDAPControlW **ctrlsW; + + ctrlsW = controlarrayAtoW( (LDAPControlA **)value ); + if (!ctrlsW) return WLDAP32_LDAP_NO_MEMORY; + + ret = ldap_set_optionW( ld, option, ctrlsW ); + controlarrayfreeW( ctrlsW ); + return ret; + } case LDAP_OPT_DEREF: case LDAP_OPT_DESC: case LDAP_OPT_ERROR_NUMBER: @@ -415,6 +428,17 @@ #ifdef HAVE_LDAP switch (option) { + case LDAP_OPT_SERVER_CONTROLS: + { + LDAPControl **ctrlsU; + + ctrlsU = controlarrayWtoU( (LDAPControlW **)value ); + if (!ctrlsU) return WLDAP32_LDAP_NO_MEMORY; + + ret = ldap_set_option( ld, option, ctrlsU ); + controlarrayfreeU( ctrlsU ); + return ret; + } case LDAP_OPT_DEREF: case LDAP_OPT_DESC: case LDAP_OPT_ERROR_NUMBER:

1 0

Mike McCormack : shlwapi: Ordinal 394 should load and call shell32. SHNotifyChange.
by Alexandre Julliard 16 Aug '06

16 Aug '06

Module: wine Branch: master Commit: 106e65e0f8d5bae71a1f17d4eed447b25d73b953 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=106e65e0f8d5bae71a1f17d… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Aug 16 11:57:51 2006 +0900 shlwapi: Ordinal 394 should load and call shell32.SHNotifyChange. Makes builtin shlwapi behave better during reboot after IE6 install. --- dlls/shlwapi/ordinal.c | 16 ++++++++++++++++ dlls/shlwapi/shlwapi.spec | 2 +- 2 files changed, 17 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index b19e27b..ec52385 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -4431,3 +4431,19 @@ UINT WINAPI ZoneComputePaneSize(HWND hwn FIXME("\n"); return 0x95; } + +typedef void (WINAPI *fnSHChangeNotify)(LONG, UINT, LPCVOID, LPCVOID); + +void WINAPI SHChangeNotify(LONG wEventId, UINT uFlags, LPCVOID dwItem1, LPCVOID dwItem2) +{ + static fnSHChangeNotify fn; + HMODULE hshell32; + + if (!fn) + { + hshell32 = LoadLibraryA("shell32"); + if (hshell32) + fn = (fnSHChangeNotify) GetProcAddress(hshell32, "SHChangeNotify"); + } + fn(wEventId, uFlags, dwItem1, dwItem2); +} diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index 36c6b70..0843ad9 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -391,7 +391,7 @@ 391 stdcall -noname WNetGetLastErrorWrapW(ptr ptr long ptr long) 392 stdcall -noname EndDialogWrap(ptr ptr) user32.EndDialog 393 stdcall @(long ptr long ptr long) user32.CreateDialogIndirectParamW -394 stdcall @(long ptr long ptr long) user32.CreateDialogIndirectParamA +394 stdcall -noname SHChangeNotify(long long ptr ptr) 395 stub -noname MLWinHelpA 396 stub -noname MLHtmlHelpA 397 stub -noname MLWinHelpW

1 0

Mike McCormack : shlwapi: Add a stub implementation for ZoneComputePaneSize .
by Alexandre Julliard 16 Aug '06

16 Aug '06

Module: wine Branch: master Commit: ba3d4b2243772cb143f3f1b51ac0053e7c936c22 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ba3d4b2243772cb143f3f1b… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Aug 16 12:52:18 2006 +0900 shlwapi: Add a stub implementation for ZoneComputePaneSize. Allows IE6 to show its main window with builtin shlwapi. --- dlls/shlwapi/ordinal.c | 9 +++++++++ dlls/shlwapi/shlwapi.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index e198fba..b19e27b 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -4422,3 +4422,12 @@ HRESULT WINAPI IUnknown_ProfferService(I FIXME("%p %p %p %p\n", unk, x0, x1, x2); return E_NOTIMPL; } + +/*********************************************************************** + * ZoneComputePaneSize [SHLWAPI.382] + */ +UINT WINAPI ZoneComputePaneSize(HWND hwnd) +{ + FIXME("\n"); + return 0x95; +} diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index 0295e1b..36c6b70 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -379,7 +379,7 @@ 379 stub -noname Shell_GetCachedImageIndexWrapW 380 stub -noname Shell_GetCachedImageIndexWrapA 381 stub -noname AssocCopyVerbs -382 stub -noname ZoneComputePaneSize +382 stdcall -noname ZoneComputePaneSize(ptr) 383 stub -noname ZoneConfigureW 384 stub -noname SHRestrictedMessageBox 385 stub -noname SHLoadRawAccelerators

1 0

Frank Richter : winecfg: appdefaults: Use more strings from resources, unicode.
by Alexandre Julliard 16 Aug '06

16 Aug '06

Module: wine Branch: master Commit: 36dd205fff584dfada7792e4faf0699a97e01d30 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=36dd205fff584dfada7792e… Author: Frank Richter <frank.richter(a)gmail.com> Date: Wed Aug 16 06:23:52 2006 +0200 winecfg: appdefaults: Use more strings from resources, unicode. --- programs/winecfg/appdefaults.c | 84 +++++++++++++++++++++++++++------------- programs/winecfg/resource.h | 4 ++ programs/winecfg/winecfg.h | 6 +++ 3 files changed, 66 insertions(+), 28 deletions(-) diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index e880cfe..8725757 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -109,7 +109,12 @@ init_comboboxes (HWND dialog) /* add the default entries (automatic) which correspond to no setting */ if (current_app) - SendDlgItemMessage(dialog, IDC_WINVER, CB_ADDSTRING, 0, (LPARAM) "Use global settings"); + { + WCHAR str[256]; + LoadStringW (GetModuleHandle (NULL), IDS_USE_GLOBAL_SETTINGS, str, + sizeof(str)/sizeof(str[0])); + SendDlgItemMessageW (dialog, IDC_WINVER, CB_ADDSTRING, 0, (LPARAM)str); + } for (i = 0; i < NB_VERSIONS; i++) { @@ -118,19 +123,19 @@ init_comboboxes (HWND dialog) } } -static void add_listview_item(HWND listview, const char *text, void *association) +static void add_listview_item(HWND listview, const WCHAR *text, void *association) { - LVITEM item; + LVITEMW item; ZeroMemory(&item, sizeof(LVITEM)); item.mask = LVIF_TEXT | LVIF_PARAM; - item.pszText = (char*) text; - item.cchTextMax = strlen(text); + item.pszText = (WCHAR*) text; + item.cchTextMax = lstrlenW(text); item.lParam = (LPARAM) association; item.iItem = ListView_GetItemCount(listview); - SendMessage(listview, LVM_INSERTITEM, 0, (LPARAM) &item); + SendMessage(listview, LVM_INSERTITEMW, 0, (LPARAM) &item); } /* Called when the application is initialized (cannot reinit!) */ @@ -140,7 +145,7 @@ static void init_appsheet(HWND dialog) HKEY key; int i; DWORD size; - char appname[1024]; + WCHAR appname[1024]; WINE_TRACE("()\n"); @@ -148,19 +153,19 @@ static void init_appsheet(HWND dialog) /* we use the lparam field of the item so we can alter the presentation later and not change code * for instance, to use the tile view or to display the EXEs embedded 'display name' */ - add_listview_item(listview, "Default Settings", NULL); + add_listview_item(listview, load_string (IDS_DEFAULT_SETTINGS), NULL); /* because this list is only populated once, it's safe to bypass the settings list here */ if (RegOpenKey(config_key, "AppDefaults", &key) == ERROR_SUCCESS) { i = 0; - size = sizeof(appname); - while (RegEnumKeyEx(key, i, appname, &size, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) + size = sizeof(appname)/sizeof(appname[0]); + while (RegEnumKeyExW (key, i, appname, &size, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) { - add_listview_item(listview, appname, strdupA(appname)); + add_listview_item(listview, appname, strdupW(appname)); i++; - size = sizeof(appname); + size = sizeof(appname)/sizeof(appname[0]); } RegCloseKey(key); @@ -240,47 +245,63 @@ static void on_selection_change(HWND dia set_window_title(dialog); } -static BOOL list_contains_file(HWND listview, char *filename) +static BOOL list_contains_file(HWND listview, WCHAR *filename) { - LVFINDINFO find_info = { LVFI_STRING, filename, 0, {0, 0}, 0 }; + LVFINDINFOW find_info = { LVFI_STRING, filename, 0, {0, 0}, 0 }; int index; - index = ListView_FindItem(listview, -1, &find_info); + index = ListView_FindItemW(listview, -1, &find_info); return (index != -1); } static void on_add_app_click(HWND dialog) { - char filetitle[MAX_PATH]; - char file[MAX_PATH]; - - OPENFILENAME ofn = { sizeof(OPENFILENAME), - 0, /*hInst*/0, "Wine Programs (*.exe,*.exe.so)\0*.exe;*.exe.so\0", NULL, 0, 0, NULL, - 0, NULL, 0, "c:\\", "Select a Windows executable file", + WCHAR filetitle[MAX_PATH]; + WCHAR file[MAX_PATH]; + WCHAR programsFilter[100]; + WCHAR selectExecutableStr[100]; + static const WCHAR pathC[] = { 'c',':','\\',0 }; + + OPENFILENAMEW ofn = { sizeof(OPENFILENAMEW), + 0, /*hInst*/0, 0, NULL, 0, 0, NULL, + 0, NULL, 0, pathC, 0, OFN_SHOWHELP | OFN_HIDEREADONLY, 0, 0, NULL, 0, NULL }; + LoadStringW (GetModuleHandle (NULL), IDS_SELECT_EXECUTABLE, selectExecutableStr, + sizeof(selectExecutableStr)/sizeof(selectExecutableStr[0])); + LoadStringW (GetModuleHandle (NULL), IDS_EXECUTABLE_FILTER, programsFilter, + sizeof(programsFilter)/sizeof(programsFilter[0])); + + ofn.lpstrTitle = selectExecutableStr; + ofn.lpstrFilter = programsFilter; ofn.lpstrFileTitle = filetitle; ofn.lpstrFileTitle[0] = '\0'; - ofn.nMaxFileTitle = sizeof(filetitle); + ofn.nMaxFileTitle = sizeof(filetitle)/sizeof(filetitle[0]); ofn.lpstrFile = file; ofn.lpstrFile[0] = '\0'; - ofn.nMaxFile = sizeof(file); + ofn.nMaxFile = sizeof(file)/sizeof(file[0]); - if (GetOpenFileName(&ofn)) + if (GetOpenFileNameW (&ofn)) { HWND listview = GetDlgItem(dialog, IDC_APP_LISTVIEW); int count = ListView_GetItemCount(listview); - char* new_app; + WCHAR* new_app; + char* new_appA; + DWORD new_appA_len; - new_app = strdupA(filetitle); + new_app = strdupW(filetitle); if (list_contains_file(listview, new_app)) return; - WINE_TRACE("adding %s\n", new_app); + WINE_TRACE("adding %s\n", wine_dbgstr_w (new_app)); + + new_appA_len = WideCharToMultiByte (CP_ACP, 0, new_app, -1, NULL, 0, NULL, NULL); + new_appA = HeapAlloc (GetProcessHeap(), 0, new_appA_len); + WideCharToMultiByte (CP_ACP, 0, new_app, -1, new_appA, new_appA_len, NULL, NULL); - add_listview_item(listview, new_app, new_app); + add_listview_item(listview, new_app, new_appA); ListView_SetItemState(listview, count, LVIS_SELECTED | LVIS_FOCUSED, LVIS_SELECTED | LVIS_FOCUSED); @@ -294,6 +315,10 @@ static void on_remove_app_click(HWND dia HWND listview = GetDlgItem(dialog, IDC_APP_LISTVIEW); int selection = get_listview_selection(listview); char *section = keypath(""); /* AppDefaults\\whatever.exe\\ */ + LVITEMW item; + + item.iItem = selection; + item.mask = LVIF_PARAM | LVIF_TEXT; WINE_TRACE("selection=%d, section=%s\n", selection, section); @@ -301,6 +326,9 @@ static void on_remove_app_click(HWND dia section[strlen(section)] = '\0'; /* remove last backslash */ set_reg_key(config_key, section, NULL, NULL); /* delete the section */ + SendMessage(listview, LVM_GETITEMW, 0, (LPARAM) &item); + HeapFree (GetProcessHeap(), 0, item.pszText); + HeapFree (GetProcessHeap(), 0, (void*)item.lParam); SendMessage(listview, LVM_DELETEITEM, selection, 0); ListView_SetItemState(listview, selection - 1, LVIS_SELECTED | LVIS_FOCUSED, LVIS_SELECTED | LVIS_FOCUSED); diff --git a/programs/winecfg/resource.h b/programs/winecfg/resource.h index 99c10ed..67013c1 100644 --- a/programs/winecfg/resource.h +++ b/programs/winecfg/resource.h @@ -86,6 +86,10 @@ #define IDS_DLL_BUILTIN #define IDS_DLL_NATIVE_BUILTIN 8014 #define IDS_DLL_BUILTIN_NATIVE 8015 #define IDS_DLL_DISABLED 8016 +#define IDS_DEFAULT_SETTINGS 8017 +#define IDS_EXECUTABLE_FILTER 8018 +#define IDS_USE_GLOBAL_SETTINGS 8019 +#define IDS_SELECT_EXECUTABLE 8020 /* drive editing */ #define IDC_LIST_DRIVES 1042 diff --git a/programs/winecfg/winecfg.h b/programs/winecfg/winecfg.h index 5332abe..3cd3d45 100644 --- a/programs/winecfg/winecfg.h +++ b/programs/winecfg/winecfg.h @@ -121,6 +121,12 @@ static inline char *strdupA(const char * return strcpy(r, s); } +static inline WCHAR *strdupW(const WCHAR *s) +{ + WCHAR *r = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(s)+1)*sizeof(WCHAR)); + return lstrcpyW(r, s); +} + static inline char *get_text(HWND dialog, WORD id) { HWND item = GetDlgItem(dialog, id);

1 0

Mike McCormack : msi: Fix a couple of memory leaks in the test code.
by Alexandre Julliard 16 Aug '06

16 Aug '06

Module: wine Branch: master Commit: b42f9df9139458954d5b1dceec7e82ba4e9e0741 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b42f9df9139458954d5b1dc… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Aug 16 11:58:09 2006 +0900 msi: Fix a couple of memory leaks in the test code. --- dlls/msi/tests/db.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 6c6ddfc..6da7666 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -1196,6 +1196,7 @@ static void test_markers(void) query = "CREATE TABLE `Table` ( `One` SHORT NOT NULL, `Two` CHAR(255) PRIMARY KEY `One`)"; r = run_query(hdb, 0, query); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + MsiCloseHandle(rec); /* try table name as marker */ rec = MsiCreateRecord(1); @@ -1351,6 +1352,7 @@ static void test_markers(void) query = "INSERT INTO `Table` ( `One`, `Two` ) VALUES ( ?, ? )"; r = run_query(hdb, rec, query); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + MsiCloseHandle(rec); MsiCloseHandle(hdb); DeleteFileA(msifile);

1 0

Frank Richter : winecfg: Make load_string public.
by Alexandre Julliard 16 Aug '06

16 Aug '06

Module: wine Branch: master Commit: 722ee099c151a3881a5816b158973196e9f3a39b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=722ee099c151a3881a5816b… Author: Frank Richter <frank.richter(a)gmail.com> Date: Wed Aug 16 06:22:54 2006 +0200 winecfg: Make load_string public. --- programs/winecfg/main.c | 15 --------------- programs/winecfg/winecfg.c | 15 +++++++++++++++ programs/winecfg/winecfg.h | 3 +++ 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/programs/winecfg/main.c b/programs/winecfg/main.c index d2b3100..6fc77f7 100644 --- a/programs/winecfg/main.c +++ b/programs/winecfg/main.c @@ -78,21 +78,6 @@ AboutDlgProc (HWND hDlg, UINT uMsg, WPAR return FALSE; } -static WCHAR* load_string (UINT id) -{ - WCHAR buf[100]; - int len; - WCHAR* newStr; - - LoadStringW (GetModuleHandle (NULL), id, buf, sizeof(buf)/sizeof(buf[0])); - - len = lstrlenW (buf); - newStr = HeapAlloc (GetProcessHeap(), 0, (len + 1) * sizeof (WCHAR)); - memcpy (newStr, buf, len * sizeof (WCHAR)); - newStr[len] = 0; - return newStr; -} - #define NUM_PROPERTY_PAGES 7 static INT_PTR diff --git a/programs/winecfg/winecfg.c b/programs/winecfg/winecfg.c index 2d70fca..dfa5aeb 100644 --- a/programs/winecfg/winecfg.c +++ b/programs/winecfg/winecfg.c @@ -72,6 +72,21 @@ void set_window_title(HWND dialog) } +WCHAR* load_string (UINT id) +{ + WCHAR buf[100]; + int len; + WCHAR* newStr; + + LoadStringW (GetModuleHandle (NULL), id, buf, sizeof(buf)/sizeof(buf[0])); + + len = lstrlenW (buf); + newStr = HeapAlloc (GetProcessHeap(), 0, (len + 1) * sizeof (WCHAR)); + memcpy (newStr, buf, len * sizeof (WCHAR)); + newStr[len] = 0; + return newStr; +} + /** * get_config_key: Retrieves a configuration value from the registry * diff --git a/programs/winecfg/winecfg.h b/programs/winecfg/winecfg.h index 53fe9ee..5332abe 100644 --- a/programs/winecfg/winecfg.h +++ b/programs/winecfg/winecfg.h @@ -58,6 +58,9 @@ BOOL reg_key_exists(HKEY root, const cha void apply(void); char **enumerate_values(HKEY root, char *path); +/* Load a string from the resources. Allocated with HeapAlloc (GetProcessHeap()) */ +WCHAR* load_string (UINT id); + /* returns a string of the form "AppDefaults\\appname.exe\\section", or just "section" if the user is editing the global settings.

1 0

Frank Richter : winecfg: Tweak and update German resources.
by Alexandre Julliard 16 Aug '06

16 Aug '06

Module: wine Branch: master Commit: acdae1536020871f53f4db5accbf02952b697283 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=acdae1536020871f53f4db5… Author: Frank Richter <frank.richter(a)gmail.com> Date: Wed Aug 16 04:37:03 2006 +0200 winecfg: Tweak and update German resources. --- programs/winecfg/De.rc | 69 ++++++++++++++++++++++++------------------------ 1 files changed, 34 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=acdae1536020871f53f…

1 0

Dan Hipschman : widl: Generate proxy code for user marshalled types.
by Alexandre Julliard 16 Aug '06

16 Aug '06

Module: wine Branch: master Commit: a5ff173cc3dccbe63185420158fcc8a620a6cc1d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a5ff173cc3dccbe63185420… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Tue Aug 15 18:35:01 2006 -0700 widl: Generate proxy code for user marshalled types. --- tools/widl/proxy.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 49 insertions(+), 0 deletions(-) diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index f060a23..1943b22 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -232,6 +232,34 @@ int cant_be_null(var_t *v) return 1; /* Default is RPC_FC_RP. */ } +static int is_user_derived(var_t *v) +{ + const attr_t *attrs = v->attrs; + const type_t *type = v->type; + + if (! attrs && type) + { + attrs = type->attrs; + type = type->ref; + } + + while (attrs) + { + if (is_attr(attrs, ATTR_WIREMARSHAL)) + return 1; + + if (type) + { + attrs = type->attrs; + type = type->ref; + } + else + attrs = NULL; + } + + return 0; +} + static void proxy_check_pointers( var_t *arg ) { END_OF_LIST(arg); @@ -263,6 +291,13 @@ static void marshall_size_arg( var_t *ar return; } + if (is_user_derived(arg)) + { + print_proxy("NdrUserMarshalBufferSize( &_StubMsg, (unsigned char*)%s, ", arg->name); + fprintf(proxy, "&__MIDL_TypeFormatString.Format[%d] );\n", index); + return; + } + switch( type->type ) { case RPC_FC_BYTE: @@ -355,6 +390,13 @@ static void marshall_copy_arg( var_t *ar return; } + if (is_user_derived(arg)) + { + print_proxy("NdrUserMarshalMarshall( &_StubMsg, (unsigned char*)%s, ", arg->name); + fprintf(proxy, "&__MIDL_TypeFormatString.Format[%d] );\n", index); + return; + } + switch( type->type ) { case RPC_FC_BYTE: @@ -454,6 +496,13 @@ static void unmarshall_copy_arg( var_t * return; } + if (is_user_derived(arg)) + { + print_proxy("NdrUserMarshalUnmarshall( &_StubMsg, (unsigned char**)&%s, ", arg->name); + fprintf(proxy, "&__MIDL_TypeFormatString.Format[%d], 0 );\n", index); + return; + } + switch( type->type ) { case RPC_FC_BYTE:

1 0

Dan Hipschman : widl: Fix out-only temporary variable generation.
by Alexandre Julliard 16 Aug '06

16 Aug '06

Module: wine Branch: master Commit: c526c980d7ac68e0918c278bfccc50e118fe3ea9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c526c980d7ac68e0918c278… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Tue Aug 15 18:33:58 2006 -0700 widl: Fix out-only temporary variable generation. --- tools/widl/proxy.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 4a4e080..f060a23 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -685,8 +685,10 @@ static void gen_proxy(type_t *iface, fun static void stub_write_locals( var_t *arg ) { int n = 0; + END_OF_LIST(arg); while (arg) { - int outptr = is_attr(arg->attrs, ATTR_OUT); + int outptr = is_attr(arg->attrs, ATTR_OUT) + && ! is_attr(arg->attrs, ATTR_IN); /* create a temporary variable to store the output */ if (outptr) { @@ -702,7 +704,7 @@ static void stub_write_locals( var_t *ar fprintf(proxy, " "); write_name(proxy, arg); fprintf(proxy, ";\n"); - arg = NEXT_LINK(arg); + arg = PREV_LINK(arg); } } @@ -731,7 +733,8 @@ static void stub_unmarshall( var_t *arg print_proxy(""); write_name(proxy, arg); fprintf(proxy," = &_M%d;\n", n); - print_proxy("_M%d = 0;\n", n++); + print_proxy("MIDL_memset(&_M%d, 0, sizeof _M%d);\n", n, n); + ++n; break; } }

1 0

Dan Hipschman : widl: Fix NdrComplexStructUnmarshall calls in generated code.
by Alexandre Julliard 16 Aug '06

16 Aug '06

Module: wine Branch: master Commit: e77a079b279ba168ab9d2d66390d2f2247edfafd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e77a079b279ba168ab9d2d6… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Tue Aug 15 18:32:09 2006 -0700 widl: Fix NdrComplexStructUnmarshall calls in generated code. --- tools/widl/proxy.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 642afbe..4a4e080 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -486,7 +486,7 @@ static void unmarshall_copy_arg( var_t * break; case RPC_FC_BOGUS_STRUCT: - print_proxy( "NdrComplexStructUnmarshall(&_StubMsg, (unsigned char*)%s, ", arg->name ); + print_proxy( "NdrComplexStructUnmarshall(&_StubMsg, (unsigned char**)&%s, ", arg->name ); fprintf(proxy, "&__MIDL_TypeFormatString.Format[%d], 0 );\n", index ); break;

1 0